Merge pull request #2 from frappe/develop

Merge official erpnext
diff --git a/cypress/integration/opportunity/lost_reason_detail.js b/cypress/integration/opportunity/lost_reason_detail.js
index 31569a9..9cf2048 100644
--- a/cypress/integration/opportunity/lost_reason_detail.js
+++ b/cypress/integration/opportunity/lost_reason_detail.js
@@ -7,8 +7,8 @@
 	it('create a new opportunity', () => {
 		cy.visit('/desk#Form/Opportunity/New Opportunity 1');
 		cy.get('.page-title').should('contain', 'Not Saved');
-		cy.fill_field('enquiry_from', 'Customer', 'Select');
-		cy.fill_field('customer', 'Test Customer', 'Link').blur();
+		cy.fill_field('opportunity_from', 'Customer', 'Select');
+		cy.fill_field('party_name', 'Test Customer', 'Link').blur();
 		cy.get('.primary-action').click();
 		cy.get('.page-title').should('contain', 'Open');
 		cy.get('.form-inner-toolbar button:contains("Lost")').click({ force: true });
@@ -29,4 +29,3 @@
 		cy.get('.page-title').should('contain', 'Lost');
 	});
 });
-
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index b67d2bd..cb88a11 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__ = '11.1.20'
+__version__ = '11.1.39'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
index e29ad82..7fa6708 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
@@ -1,6 +1,6 @@
 {
     "country_code": "de", 
-    "name": "Germany - Kontenplan SKR04", 
+    "name": "SKR04 ohne Kontonummern", 
     "tree": {
         "Bilanz - Aktiva": {
             "Anlageverm\u00f6gen": {
@@ -1383,8 +1383,7 @@
                     "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 1": {
                         "Diskontertr\u00e4ge": {}, 
                         "Diskontertr\u00e4ge aus verbundenen Unternehmen": {}, 
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {}, 
-                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {}, 
+                        "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei": {},
                         "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 2": {}, 
                         "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {}, 
                         "Sonstige Zinsertr\u00e4ge": {}, 
@@ -1703,4 +1702,4 @@
             "root_type": "Asset"
         }
     }
-}
\ No newline at end of file
+}
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
new file mode 100644
index 0000000..b042bcc
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04_with_account_number.json
@@ -0,0 +1,3626 @@
+{
+    "country_code": "de",
+    "name": "SKR04 mit Kontonummern",
+    "tree": {
+        "Aktiva": {
+            "root_type": "Asset",
+            "A - Anlageverm\u00f6gen": {
+                "account_type": "Fixed Asset",
+                "is_group": 1,
+                "I - Immaterielle VG": {
+                    "is_group": 1,
+                    "1 - Selbst geschaffene gewerbliche Schutzrechte und \u00e4hnliche Rechte und Werte": {
+                        "is_group": 1
+                    },
+                    "2 - entgeltlich erworbene Konzessionen, gewerbl. Schutzrechte und \u00e4hnl. Rechte und Werte sowie Lizenzen an solchen": {
+                        "is_group": 1,
+                        "Entgeltlich erworbene Konzessionen, gewerbl. Schutzrechte und \u00e4hnl. Rechte und Werte sowie Lizenzen an solchen": {
+                            "account_number": "0100"
+                        },
+                        "Konzessionen ": {
+                            "account_number": "0110"
+                        },
+                        "Gewerbliche Schutzrechte ": {
+                            "account_number": "0120"
+                        },
+                        "\u00c4hnliche Rechte und Werte": {
+                            "account_number": "0130"
+                        },
+                        "EDV-Software": {
+                            "account_number": "0135"
+                        },
+                        "Lizenzen an gewerblichen Schutzrechten und \u00e4hnl. Rechten und Werten": {
+                            "account_number": "0140"
+                        },
+                        "Selbst geschaffene immaterielle VG": {
+                            "account_number": "0143",
+                            "account_type": "Fixed Asset"
+                        },
+                        "Lizenzen und Franchisevertr\u00e4ge": {
+                            "account_number": "0145"
+                        },
+                        "Konzessionen und gewerbliche Schutzrechte": {
+                            "account_number": "0146"
+                        },
+                        "Rezepte, Verfahren, Prototypen": {
+                            "account_number": "0147"
+                        },
+                        "Immaterielle VG in Entwicklung": {
+                            "account_number": "0148"
+                        },
+                        "Geleistete Anz. auf immaterielle VG": {
+                            "account_number": "0170"
+                        }
+                    },
+                    "3 - Gesch\u00e4fts- oder Firmenwert": {
+                        "is_group": 1,
+                        "Gesch\u00e4fts- oder Firmenwert ": {
+                            "account_number": "0150"
+                        },
+                        "Anz. auf Gesch\u00e4fts- oder Firmenwert": {
+                            "account_number": "0179"
+                        }
+                    },
+                    "4 - geleistete Anz.": {
+                        "is_group": 1,
+                        "Geleistete Anz. auf Vorr\u00e4te": {
+                            "account_number": "1180"
+                        },
+                        "Geleistete Anz., 7 % Vorsteuer": {
+                            "account_number": "1181"
+                        },
+                        "Geleistete Anz., 16 % Vorsteuer": {
+                            "account_number": "1184"
+                        },
+                        "Geleistete Anz., 15 % Vorsteuer": {
+                            "account_number": "1185"
+                        },
+                        "Geleistete Anz., 19 % Vorsteuer": {
+                            "account_number": "1186"
+                        }
+                    }
+                },
+                "II - Sachanlagen": {
+                    "1 - Grundst\u00fccke, grundst\u00fccksgleiche Rechte und Bauten einschl. der Bauten auf fremden Grundst\u00fccken": {
+                        "is_group": 1,
+                        "Grundst\u00fccke, grundst\u00fccksgleiche Rechte und Bauten einschl. der Bauten auf fremden Grundst\u00fccken": {
+                            "account_number": "0200",
+                            "account_type": "Fixed Asset"
+                        },
+                        "Grundst\u00fccksgleiche Rechte ohne Bauten": {
+                            "account_number": "0210"
+                        },
+                        "Unbebaute Grundst\u00fccke": {
+                            "account_number": "0215"
+                        },
+                        "Grundst\u00fccksgleiche Rechte (Erbbaurecht, Dauerwohnrecht)": {
+                            "account_number": "0220"
+                        },
+                        "Grundst\u00fccke mit Substanzverzehr": {
+                            "account_number": "0225"
+                        },
+                        "Grundst\u00fccksanteil h\u00e4usliches Arbeitszimmer": {
+                            "account_number": "0229"
+                        },
+                        "Bauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten": {
+                            "account_number": "0230"
+                        },
+                        "Grundst\u00fcckswerte eigener bebauter Grundst\u00fccke": {
+                            "account_number": "0235"
+                        },
+                        "Gesch\u00e4ftsbauten": {
+                            "account_number": "0240"
+                        },
+                        "Fabrikbauten ": {
+                            "account_number": "0250"
+                        },
+                        "Andere Bauten": {
+                            "account_number": "0260"
+                        },
+                        "Garagen": {
+                            "account_number": "0270"
+                        },
+                        "Au\u00dfenanlagen f. Gesch\u00e4fts-, Fabrik- und andere Bauten": {
+                            "account_number": "0280"
+                        },
+                        "Hof- und Wegebefestigungen": {
+                            "account_number": "0285"
+                        },
+                        "Einrichtungen f. Gesch\u00e4fts-, Fabrik- und andere Bauten": {
+                            "account_number": "0290"
+                        },
+                        "Wohnbauten ": {
+                            "account_number": "0300"
+                        },
+                        "Au\u00dfenanlagen ": {
+                            "account_number": "0310"
+                        },
+                        "Einrichtungen f. Wohnbauten ": {
+                            "account_number": "0320"
+                        },
+                        "Geb\u00e4udeanteil h\u00e4usliches Arbeitszimmer": {
+                            "account_number": "0329"
+                        },
+                        "Bauten auf fremden Grundst\u00fccken": {
+                            "account_number": "0330"
+                        },
+                        "Einrichtungen f. Gesch\u00e4fts-, Fabrik-, Wohn- und andere Bauten": {
+                            "account_number": "0398"
+                        }
+                    },
+                    "2 - technische Anlagen und Maschinen": {
+                        "is_group": 1,
+                        "Technische Anlagen und Maschinen": {
+                            "account_number": "0400",
+                            "account_type": "Fixed Asset"
+                        },
+                        "Technische Anlagen": {
+                            "account_number": "0420"
+                        },
+                        "Maschinen": {
+                            "account_number": "0440"
+                        },
+                        "Transportanlagen und \u00c4hnliches ": {
+                            "account_number": "0450"
+                        },
+                        "Betriebsvorrichtungen": {
+                            "account_number": "0470"
+                        },
+                        "Wertberichtigung Technische Anlagen und Maschinen": {
+                            "account_number": "0409",
+                            "account_type": "Accumulated Depreciation"
+                        }
+                    },
+                    "3 - andere Anlagen, Betriebs- und Gesch\u00e4ftsausstattung": {
+                        "is_group": 1,
+                        "Andere Anlagen, Betriebs- und Gesch\u00e4ftsausstattung": {
+                            "account_number": "0500",
+                            "account_type": "Fixed Asset"
+                        },
+                        "Andere Anlagen": {
+                            "account_number": "0510"
+                        },
+                        "Pkw": {
+                            "account_number": "0520"
+                        },
+                        "Lkw": {
+                            "account_number": "0540"
+                        },
+                        "Sonstige Transportmittel": {
+                            "account_number": "0560"
+                        },
+                        "Werkzeuge": {
+                            "account_number": "0620"
+                        },
+                        "Betriebsausstattung": {
+                            "account_number": "0630"
+                        },
+                        "Gesch\u00e4ftsausstattung": {
+                            "account_number": "0635"
+                        },
+                        "Ladeneinrichtung": {
+                            "account_number": "0640"
+                        },
+                        "B\u00fcroeinrichtung": {
+                            "account_number": "0650"
+                        },
+                        "Ger\u00fcst- und Schalungsmaterial": {
+                            "account_number": "0660"
+                        },
+                        "Geringwertige Wirtschaftsg\u00fcter": {
+                            "account_number": "0670"
+                        },
+                        "Wirtschaftsg\u00fcter gr\u00f6\u00dfer 150  bis 1000 Euro (Sammelposten)": {
+                            "account_number": "0675"
+                        },
+                        "Einbauten in fremde Grundst\u00fccke": {
+                            "account_number": "0680"
+                        },
+                        "Sonstige Betriebs- und Gesch\u00e4ftsausstattung": {
+                            "account_number": "0690"
+                        }
+                    },
+                    "4 - geleistete Anz. und Anlagen im Bau": {
+                        "is_group": 1,
+                        "Geleistete Anz. und Anlagen im Bau": {
+                            "account_number": "0700",
+                            "account_type": "Capital Work in Progress"
+                        },
+                        "Anz. auf Grundst\u00fcckeund grundst\u00fccksgleiche Rechte ohne Bauten ": {
+                            "account_number": "0705"
+                        },
+                        "Gesch\u00e4fts-, Fabrik- und andere Bauten im Bau auf eigenen Grundst\u00fccken": {
+                            "account_number": "0710"
+                        },
+                        "Anz. auf Gesch\u00e4fts-, Fabrik- und andere Bauten auf eigenen Grundst. und grundst\u00fccksgleichen Rechten ": {
+                            "account_number": "0720"
+                        },
+                        "Wohnbauten im Bau": {
+                            "account_number": "0725"
+                        },
+                        "Anz. auf Wohnbauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten": {
+                            "account_number": "0735"
+                        },
+                        "Gesch\u00e4fts-, Fabrik- und andere Bauten im Bau auf fremden Grundst\u00fccken": {
+                            "account_number": "0740"
+                        },
+                        "Anz. auf Gesch\u00e4fts-, Fabrik- und andere Bauten auf fremden Grundst\u00fccken ": {
+                            "account_number": "0750"
+                        },
+                        "Anz. auf Wohnbauten auf fremden Grundst\u00fccken": {
+                            "account_number": "0765"
+                        },
+                        "Technische Anlagen und Maschinen im Bau": {
+                            "account_number": "0770"
+                        },
+                        "Anz. auf technische Anlagen und Maschinen": {
+                            "account_number": "0780"
+                        },
+                        "Andere Anlagen, Betriebs- und Gesch\u00e4ftsausstattung im Bau": {
+                            "account_number": "0785"
+                        },
+                        "Andere Anlagen, Betriebs- und Gesch\u00e4ftsausstattung": {
+                            "account_number": "0795"
+                        }
+                    },
+                    "is_group": 1
+                },
+                "III - Finanzanlagen": {
+                    "1 - Anteile an verbundenen Unternehmen": {
+                        "is_group": 1,
+                        "Anteile an verbundenen Unternehmen": {
+                            "account_number": "0800"
+                        },
+                        "Anteile an verbundenen Unternehmen, Personengesellschaften": {
+                            "account_number": "0803"
+                        },
+                        "Anteile an verbundenen Unternehmen, Kapitalgesellschaften": {
+                            "account_number": "0804"
+                        },
+                        "Anteile an herrschender oder mehrheitlich beteiligter Gesellschaft, Personengesellschaft": {
+                            "account_number": "0805"
+                        },
+                        "Anteile an herrschender oder mehrheitlich beteiligter Gesellschaft, Kapitalgesellschaften": {
+                            "account_number": "0808"
+                        },
+                        "Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft": {
+                            "account_number": "0809"
+                        }
+                    },
+                    "2 - Ausleihungen an verb. Unternehmen": {
+                        "is_group": 1,
+                        "Ausleihungen an verb. Unternehmen": {
+                            "account_number": "0880"
+                        },
+                        "Ausleihungen an Unternehmen, mit denen ein Beteiligungsverh. besteht, Personengesellschaften": {
+                            "account_number": "0883"
+                        },
+                        "Ausleihungen an Unternehmen, mit denen ein Beteiligungsverh. besteht, Kapitalgesellschaften": {
+                            "account_number": "0885"
+                        }
+                    },
+                    "3 - Beteiligungen": {
+                        "is_group": 1,
+                        "Beteiligungen": {
+                            "account_number": "0820"
+                        },
+                        "Typisch stille Beteiligungen": {
+                            "account_number": "0830"
+                        },
+                        "Atypisch stille Beteiligungen": {
+                            "account_number": "0840"
+                        },
+                        "Beteiligungen an Kapitalgesellschaften": {
+                            "account_number": "0850"
+                        },
+                        "Beteiligungen an Personengesellschaften": {
+                            "account_number": "0860"
+                        }
+                    },
+                    "4 - Ausleihungen an Unternehmen, mit denen ein Beteiligungsverh. besteht": {
+                        "is_group": 1
+                    },
+                    "5 - Wertpapiere des Anlageverm\u00f6gens": {
+                        "is_group": 1,
+                        "Wertpapiere des Anlageverm\u00f6gens": {
+                            "account_number": "0900"
+                        },
+                        "Wertpapiere mit Gewinnbeteiligungsanspr\u00fcchen, die dem Teileink\u00fcnfteverfahren unterliegen": {
+                            "account_number": "0910"
+                        },
+                        "Festverzinsliche Wertpapiere": {
+                            "account_number": "0920"
+                        },
+                        "Genossenschaftsanteile zum langfristigen Verbleib": {
+                            "account_number": "0980"
+                        },
+                        "R\u00fcckdeckungsanspr\u00fcche aus Lebensversicherungen zum langfristigen Verbleib": {
+                            "account_number": "0990"
+                        }
+                    },
+                    "6 - sonstige Ausleihungen": {
+                        "is_group": 1,
+                        "Sonstige Ausleihungen": {
+                            "account_number": "0930"
+                        },
+                        "Darlehen": {
+                            "account_number": "0940"
+                        },
+                        "Ausleihungen an stille Gesellschafter": {
+                            "account_number": "0964"
+                        }
+                    },
+                    "is_group": 1
+                }
+            },
+            "B - Umlaufverm\u00f6gen": {
+                "I - Vorr\u00e4te": {
+                    "1 - Roh-, Hilfs- und Betriebsstoffe": {
+                        "is_group": 1,
+                        "Roh-, Hilfs- und Betriebsstoffe (Bestand)": {
+                            "account_number": "1000",
+                            "account_type": "Stock"
+                        }
+                    },
+                    "2 - unfertige Erzeugnisse, unfertige Leistungen": {
+                        "is_group": 1,
+                        "Unfertige Erzeugnisse, unfertige Leistungen (Bestand)": {
+                            "account_number": "1040",
+                            "account_type": "Stock"
+                        },
+                        "Unfertige Erzeugnisse (Bestand)": {
+                            "account_number": "1050"
+                        },
+                        "Unfertige Leistungen": {
+                            "account_number": "1080"
+                        },
+                        "In Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {
+                            "account_number": "1090"
+                        },
+                        "In Arbeit befindliche Auftr\u00e4ge": {
+                            "account_number": "1095"
+                        }
+                    },
+                    "3 - fertige Erzeugnisse und Waren": {
+                        "is_group": 1,
+                        "Fertige Erzeugnisse und Waren (Bestand)": {
+                            "account_number": "1100",
+                            "account_type": "Stock"
+                        },
+                        "Fertige Erzeugnisse (Bestand)": {
+                            "account_number": "1110"
+                        },
+                        "Waren (Bestand)": {
+                            "account_number": "1140"
+                        },
+                        "Erhaltene Anz. auf Bestellungen (von Vorr\u00e4ten offen abgesetzt)": {
+                            "account_number": "1190"
+                        }
+                    },
+                    "is_group": 1
+                },
+                "II - Forderungen und sonstige VG": {
+                    "account_type": "Receivable",
+                    "1 - Forderungen aus Lieferungen und Leistungen": {
+                        "account_type": "Receivable",
+                        "is_group": 1,
+                        "Bewertungskorrektur zu Forderungen aus Lieferungen und Leistungen": {
+                            "account_number": "9960"
+                        },
+                        "Forderungen aus Lieferungen und Leistungen": {
+                            "account_number": "1200",
+                            "account_type": "Receivable"
+                        },
+                        "Forderungen aus Lieferungen und Leistungen ohne Kontokorrent": {
+                            "account_number": "1210"
+                        },
+                        "Forderungen aus Lieferungen und Leistungen ohne Kontokorrent(b. 1 J.)": {
+                            "account_number": "1221"
+                        },
+                        "Forderungen aus Lieferungen und Leistungen ohne Kontokorrent (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1225"
+                        },
+                        "Wechsel aus Lieferungen und Leistungen, bundesbankf\u00e4hig": {
+                            "account_number": "1235"
+                        },
+                        "Zweifelhafte Forderungen (Gruppe)": {
+                            "is_group": 1,
+                            "Zweifelhafte Forderungen": {
+                                "account_number": "1240"
+                            },
+                            "Zweifelhafte Forderungen (b. 1 J.)": {
+                                "account_number": "1241"
+                            },
+                            "Zweifelhafte Forderungen (gr\u00f6\u00dfer 1 J.)": {
+                                "account_number": "1245"
+                            },
+                            "Einzelwertberichtigungen auf Forderungen mit einer (b. 1 J.)": {
+                                "account_number": "1248"
+                            },
+                            "Einzelwertberichtigung auf Forderungen mit einer (mehr als 1 J.)": {
+                                "account_number": "1247"
+                            },
+                            "Pauschalwertberichtigung auf Forderungen mit einer (mehr als 1 J.)": {
+                                "account_number": "1249"
+                            }
+                        },
+                        "Gegenkonto zu sonstigen VGn bei Buchung \u00fcber Debitorenkonto": {
+                            "account_number": "1258"
+                        },
+                        "Gegenkonto 1221-1229,1240-1245,1250-1257, 1270-1279, 1290-1297 bei Aufteilung Debitorenkonto": {
+                            "account_number": "1259"
+                        }
+                    },
+                    "2 - Forderungen gg. verb. Unternehmen": {
+                        "account_type": "Receivable",
+                        "is_group": 1,
+                        "Forderungen gg. verb. Unternehmen": {
+                            "account_number": "1260"
+                        },
+                        "Forderungen gg. verb. Unternehmen (b. 1 J.)": {
+                            "account_number": "1261"
+                        },
+                        "Forderungen gg. verb. Unternehmen (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1265"
+                        },
+                        "Besitzwechsel gg. verb. Unternehmen": {
+                            "account_number": "1266"
+                        },
+                        "Besitzwechsel gg. verb. Unternehmen (b. 1 J.)": {
+                            "account_number": "1267"
+                        },
+                        "Besitzwechsel gg. verb. Unternehmen (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1268"
+                        },
+                        "Besitzwechsel gg. verb. Unternehmen, bundesbankf\u00e4hig": {
+                            "account_number": "1269"
+                        },
+                        "Forderungen aus Lieferungen und Leistungen gg. verb. Unternehmen (Gruppe)": {
+                            "is_group": 1,
+                            "Forderungen aus Lieferungen und Leistungen gg. verb. Unternehmen": {
+                                "account_number": "1270"
+                            },
+                            "Forderungen aus Lieferungen und Leistungen gg. verb. Unternehmen (b. 1 J.)": {
+                                "account_number": "1271"
+                            },
+                            "Forderungen aus Lieferungen und Leistungen gg. verb. Unternehmen (gr\u00f6\u00dfer 1 J.)": {
+                                "account_number": "1275"
+                            },
+                            "Wertberichtigungen auf Forderungen mit einer (b. 1 J.) gg. verb. Unternehmen": {
+                                "account_number": "1276"
+                            },
+                            "Wertberichtigungen auf Forderungen mit einer (mehr als 1 J.) gg. verbundene  Unternehmen": {
+                                "account_number": "1277"
+                            }
+                        }
+                    },
+                    "3 - Forderungen gg. Unt., mit denen ein Beteiligungsverh. besteht": {
+                        "account_type": "Receivable",
+                        "is_group": 1,
+                        "Forderungen gg. Unt., mit denen ein Beteiligungsverh. besteht": {
+                            "account_number": "1280"
+                        },
+                        "Forderungen gg. Unt., mit denen ein Beteiligungsverh. besteht (b. 1 J.)": {
+                            "account_number": "1281"
+                        },
+                        "Forderungen gg. Unt., mit denen ein Beteiligungsverh. besteht (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1285"
+                        },
+                        "Besitzwechsel gg. Unt., mit denen ein Beteiligungsverh. besteht": {
+                            "account_number": "1286"
+                        },
+                        "Besitzwechsel gg. Unt., mit denen ein Beteiligungsverh. besteht (b. 1 J.)": {
+                            "account_number": "1287"
+                        },
+                        "Besitzwechsel gg. Unt., mit denen ein Beteiligungsverh. besteht (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1288"
+                        },
+                        "Besitzwechsel gg. Unt., mit denen ein Beteiligungsverh. besteht, bundesbankf\u00e4hig": {
+                            "account_number": "1289"
+                        },
+                        "Forderungen aus LuL gg. Unt., mit denen ein Beteiligungsverh. besteht": {
+                            "account_number": "1290"
+                        },
+                        "Forderungen aus LuL gg. Unt., mit denen ein Beteiligungsverh. besteht (b. 1 J.)": {
+                            "account_number": "1291"
+                        },
+                        "Forderungen aus LuL gg. Unt., mit denen ein Beteiligungsverh. besteht (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1295"
+                        },
+                        "Wertberichtigungen auf Ford. (b. 1 J.) gg. Unt., mit denen ein Beteiligungsverh. besteht": {
+                            "account_number": "1296"
+                        },
+                        "Wertberichtigungen auf Ford. (mehr als 1 J.) gg. Unt., mit denen ein Beteiligungsverh. besteht": {
+                            "account_number": "1297"
+                        }
+                    },
+                    "4 - sonstige VG": {
+                        "account_type": "Receivable",
+                        "is_group": 1,
+                        "Bewertungskorrektur zu sonstigen VGn": {
+                            "account_number": "9965"
+                        },
+                        "Verrechnungskonto geleistete Anz. bei Buchung \u00fcber Kreditorenkonto": {
+                            "account_number": "3695"
+                        },
+                        "Sonstige VG": {
+                            "account_number": "1300"
+                        },
+                        "Sonstige VG (b. 1 J.)": {
+                            "account_number": "1301"
+                        },
+                        "Sonstige VG (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1305"
+                        },
+                        "Forderungen gg. typisch stille Gesellschafter": {
+                            "account_number": "1337"
+                        },
+                        "Forderungen gg. typisch stille Gesellschafter - Restlaufzeit bis1 Jahr": {
+                            "account_number": "1338"
+                        },
+                        "Forderungen gg. typisch stille Gesellschafter (gr\u00f6\u00dfer 1 J.)": {
+                            "account_number": "1339"
+                        },
+                        "Forderungen gg. Personal aus Lohn- und Gehaltsabrechnung (Gruppe)": {
+                            "is_group": 1,
+                            "Forderungen gg. Personal aus Lohn- und Gehaltsabrechnung": {
+                                "account_number": "1340"
+                            },
+                            "Forderungen gg. Personal aus Lohn- und Gehaltsabrechnung (b. 1 J.)": {
+                                "account_number": "1341"
+                            },
+                            "Forderungen gg. Personal aus Lohn- und Gehaltsabrechnung (gr\u00f6\u00dfer 1 J.)": {
+                                "account_number": "1345"
+                            }
+                        },
+                        "Kautionen (Gruppe)": {
+                            "is_group": 1,
+                            "Kautionen": {
+                                "account_number": "1350"
+                            },
+                            "Kautionen (b. 1 J.)": {
+                                "account_number": "1351"
+                            },
+                            "Kautionen (gr\u00f6\u00dfer 1 J.)": {
+                                "account_number": "1355"
+                            }
+                        },
+                        "Darlehen (Gruppe)": {
+                            "Darlehen": {
+                                "account_number": "1360"
+                            },
+                            "Darlehen (b. 1 J.)": {
+                                "account_number": "1361"
+                            },
+                            "Darlehen (gr\u00f6\u00dfer 1 J.)": {
+                                "account_number": "1365"
+                            }
+                        },
+                        "Forderungen gg. Krankenkassen aus Aufwendungsausgleichsgesetz": {
+                            "account_number": "1369"
+                        },
+                        "Durchlaufende Posten": {
+                            "account_number": "1370"
+                        },
+                        "Fremdgeld": {
+                            "account_number": "1374"
+                        },
+                        "Agenturwarenabrechnung": {
+                            "account_number": "1375"
+                        },
+                        "Nachtr\u00e4glich abziehbare Vorsteuer, \u00a7 15a Abs. 2 UStG": {
+                            "account_number": "1376"
+                        },
+                        "Zur\u00fcckzuzahlende Vorsteuer, \u00a7 15a Abs. 2 UStG": {
+                            "account_number": "1377"
+                        },
+                        "Anspr\u00fcche aus R\u00fcckdeckungsversicherungen": {
+                            "account_number": "1378"
+                        },
+                        "Verm\u00f6gensgegenst. zur Saldierung mit Pensionsr\u00fcckst. und \u00e4hnl. Verplicht. zum langfristigen Verbleib": {
+                            "account_number": "1381"
+                        },
+                        "Verm\u00f6gensgegenst. zur Erf\u00fcllung von mit der Altersvers. vergleichb. langfristigen Verplicht.": {
+                            "account_number": "1382"
+                        },
+                        "Verm\u00f6gensgegenst. zur Saldierung mit der Altersvers. vergleichb. langfristigen Verplicht.": {
+                            "account_number": "1383"
+                        },
+                        "GmbH-Anteile zum kurzfr. Verbleib": {
+                            "account_number": "1390"
+                        },
+                        "Forderungen gg. Arbeitsgemeinschaften": {
+                            "account_number": "1391"
+                        },
+                        "Genussrechte": {
+                            "account_number": "1393"
+                        },
+                        "Einzahlungsanspr\u00fcche zu Nebenleistungen oder Zuzahlungen": {
+                            "account_number": "1394"
+                        },
+                        "Genossenschaftsanteile zum kurzfr. Verbleib": {
+                            "account_number": "1395"
+                        },
+                        "Nachtr\u00e4glich abziehbare Vorsteuer, \u00a7 15a Abs. 1 UStG, bewegliche Wirtschaftsg\u00fcter": {
+                            "account_number": "1396"
+                        },
+                        "Zur\u00fcckzuzahlende Vorsteuer, \u00a7 15a Abs. 1 UStG, bewegliche Wirtschaftsg\u00fcter": {
+                            "account_number": "1397"
+                        },
+                        "Nachtr\u00e4glich abziehbare Vorsteuer gem. \u00a7 15a Abs. 1 UStG, unbewegliche Wirtschaftsg\u00fcter": {
+                            "account_number": "1398"
+                        },
+                        "Zur\u00fcckzuzahlende Vorsteuer gem. \u00a7 15a Abs. 1 UStG, unbewegliche Wirtschaftsg\u00fcter": {
+                            "account_number": "1399"
+                        },
+                        "Abziehbare Vorsteuer (Gruppe)": {
+                            "is_group": 1,
+                            "Abziehbare Vorsteuer": {
+                                "account_number": "1400"
+                            },
+                            "Abziehbare Vorsteuer 7 %": {
+                                "account_number": "1401"
+                            },
+                            "Abziehbare Vorsteuer aus innergem. Erwerb": {
+                                "account_number": "1402"
+                            },
+                            "Abziehbare Vorsteuer aus innergem. Erwerb 19%": {
+                                "account_number": "1404"
+                            },
+                            "Abziehbare Vorsteuer 19 %": {
+                                "account_number": "1406"
+                            },
+                            "Abziehbare Vorsteuer nach \u00a7 13b UStG 19 %": {
+                                "account_number": "1407"
+                            },
+                            "Abziehbare Vorsteuer nach \u00a7 13b UStG": {
+                                "account_number": "1408"
+                            },
+                            "Abziehbare Vorsteuer aus der Auslagerung von Gegenst\u00e4nden aus dem Umsatzsteuerlager": {
+                                "account_number": "1431"
+                            },
+                            "Abziehbare Vorsteuer aus innergem. Erwerb von Neufahrzeugen von Lieferanten ohne Ust-ID": {
+                                "account_number": "1432"
+                            }
+                        },
+                        "Aufzuteilende Vorsteuer (Gruppe)": {
+                            "is_group": 1,
+                            "Aufzuteilende Vorsteuer": {
+                                "account_number": "1410"
+                            },
+                            "Aufzuteilende Vorsteuer 7 %": {
+                                "account_number": "1411"
+                            },
+                            "Aufzuteilende Vorsteuer aus innergem. Erwerb": {
+                                "account_number": "1412"
+                            },
+                            "Aufzuteilende Vorsteuer aus innergem. Erwerb 19 %": {
+                                "account_number": "1413"
+                            },
+                            "Aufzuteilende Vorsteuer 19 %": {
+                                "account_number": "1416"
+                            },
+                            "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG": {
+                                "account_number": "1417"
+                            },
+                            "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG 19 %": {
+                                "account_number": "1419"
+                            }
+                        },
+                        "Umsatzsteuerforderungen (Gruppe)": {
+                            "is_group": 1,
+                            "Umsatzsteuerforderungen": {
+                                "account_number": "1420"
+                            },
+                            "Umsatzsteuerforderungen laufendes Jahr": {
+                                "account_number": "1421"
+                            },
+                            "Umsatzsteuerforderungen Vorjahr": {
+                                "account_number": "1422"
+                            },
+                            "Umsatzsteuerforderungen fr\u00fchere Jahre": {
+                                "account_number": "1425"
+                            },
+                            "Forderungen aus entrichteten Verbrauchsteuern": {
+                                "account_number": "1427"
+                            }
+                        },
+                        "Bezahlte Einfuhrumsatzsteuer": {
+                            "account_number": "1433"
+                        },
+                        "Vorsteuer im Folgejahr abziehbar": {
+                            "account_number": "1434"
+                        },
+                        "Forderungen aus Gewerbesteuer\u00fcberzahlungen": {
+                            "account_number": "1435"
+                        },
+                        "Vorsteuer aus Erwerb als letzter Abnehmer innerh. eines Dreiecksgesch.s": {
+                            "account_number": "1436"
+                        },
+                        "Steuererstattungsanspr\u00fcche gg. anderen L\u00e4ndern": {
+                            "account_number": "1440"
+                        },
+                        "Forderungen an das Finanzamt aus abgef\u00fchrtem Bauabzugsbetrag": {
+                            "account_number": "1456"
+                        },
+                        "Forderungen gg. Bundesagentur f. Arbeit": {
+                            "account_number": "1457"
+                        },
+                        "Geldtransit": {
+                            "account_number": "1460"
+                        },
+                        "Vorsteuer nach allgemeinen Durchschnittss\u00e4tzen UStVA Kz. 63": {
+                            "account_number": "1484"
+                        },
+                        "Verrechnungskonto Ist-Versteuerung": {
+                            "account_number": "1490"
+                        },
+                        "Verrechnungskonto erhaltene Anz. bei Buchung \u00fcber Debitorenkonto": {
+                            "account_number": "1495"
+                        },
+                        "\u00dcberleitungskonto Kostenstellen": {
+                            "account_number": "1498"
+                        }
+                    },
+                    "is_group": 1
+                },
+                "III - Wertpapiere": {
+                    "is_group": 1,
+                    "2 - sonstige Wertpapiere": {
+                        "is_group": 1,
+                        "Sonstige Wertpapiere": {
+                            "account_number": "1510"
+                        }
+                    },
+                    "Finanzwechsel": {
+                        "account_number": "1520"
+                    },
+                    "Andere Wertpapiere mit unwesentlichen Wertschwankungen im Sinne Textziffer 18 DRS 2": {
+                        "account_number": "1525"
+                    },
+                    "Wertpapieranlagen i. R. d. kurzfr. Finanzdisposition": {
+                        "account_number": "1530"
+                    },
+                    "Schecks": {
+                        "account_number": "1550"
+                    },
+                    "Anteile an verbundenen Unternehmen (Umlaufverm\u00f6gen)": {
+                        "account_number": "1500"
+                    }
+                },
+                "IV - Kassenbestand, Bundesbankguthaben, Guthaben bei Kreditinstituten und Schecks": {
+                    "is_group": 1,
+                    "Bewertungskorrektur zu Guthaben bei Kreditinstituten": {
+                        "account_number": "9962"
+                    },
+                    "Kasse (Gruppe)": {
+                        "is_group": 1,
+                        "account_type": "Cash",
+                        "Kasse": {
+                            "account_number": "1600",
+                            "account_type": "Cash"
+                        },
+                        "Nebenkasse 1": {
+                            "account_number": "1610",
+                            "account_type": "Cash"
+                        },
+                        "Nebenkasse 2": {
+                            "account_number": "1620",
+                            "account_type": "Cash"
+                        }
+                    },
+                    "Postbank (Gruppe)": {
+                        "is_group": 1,
+                        "Postbank": {
+                            "account_number": "1700"
+                        },
+                        "Postbank 1 (Gruppe)": {
+                            "is_group": 1,
+                            "Postbank 1": {
+                                "account_number": "1710"
+                            }
+                        },
+                        "Postbank 2 (Gruppe)": {
+                            "is_group": 1,
+                            "Postbank 2": {
+                                "account_number": "1720"
+                            }
+                        },
+                        "Postbank 3 (Gruppe)": {
+                            "is_group": 1,
+                            "Postbank 3": {
+                                "account_number": "1730"
+                            }
+                        }
+                    },
+                    "LZB-Guthaben": {
+                        "account_number": "1780"
+                    },
+                    "Bundesbankguthaben": {
+                        "account_number": "1790"
+                    },
+                    "Bank (Gruppe)": {
+                        "is_group": 1,
+                        "account_type": "Bank",
+                        "Bank": {
+                            "account_number": "1800",
+                            "account_type": "Bank"
+                        },
+                        "Bank 1": {
+                            "account_number": "1810",
+                            "account_type": "Bank"
+                        },
+                        "Bank 2": {
+                            "account_number": "1820",
+                            "account_type": "Bank"
+                        },
+                        "Bank 3": {
+                            "account_number": "1830"
+                        },
+                        "Bank 4": {
+                            "account_number": "1840"
+                        },
+                        "Bank 5": {
+                            "account_number": "1850"
+                        },
+                        "Finanzmittelanlagen i. R. d. kurzfr. Finanzdisposition (nicht im Finanzmittelfonds enthalten)": {
+                            "account_number": "1890"
+                        },
+                        "Verb. gg. Kreditinstituten (nicht im Finanzmittelfonds enthalten)": {
+                            "account_number": "1895"
+                        }
+                    }
+                },
+                "is_group": 1
+            },
+            "C - Rechnungsabgrenzungsposten": {
+                "is_group": 1,
+                "Aktive Rechnungsabgrenzung": {
+                    "account_number": "1900"
+                },
+                "Als Aufwand ber\u00fccksichtigte Z\u00f6lle und Verbrauchsteuern auf Vorr\u00e4te": {
+                    "account_number": "1920"
+                },
+                "Als Aufwand ber\u00fccksichtigte Umsatzsteuer auf Anz.": {
+                    "account_number": "1930"
+                },
+                "Damnum/Disagio": {
+                    "account_number": "1940"
+                }
+            },
+            "D - Aktive latente Steuern": {
+                "is_group": 1,
+                "Aktive latente Steuern": {
+                    "account_type": "Tax",
+                    "account_number": "1950"
+                }
+            },
+            "E - Aktiver Unterschiedsbetrag aus der Verm\u00f6gensverrechnung": {
+                "is_group": 1
+            },
+            "is_group": 1
+        },
+        "Passiva": {
+            "root_type": "Liability",
+            "A - Eigenkapital": {
+                "account_type": "Equity",
+                "is_group": 1,
+                "I - Gezeichnetes Kapital": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "II - Kapitalr\u00fccklage": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "III - Gewinnr\u00fccklagen": {
+                    "account_type": "Equity",
+                    "1 - gesetzliche R\u00fccklage": {
+                        "account_type": "Equity",
+                        "is_group": 1
+                    },
+                    "2 - R\u00fccklage f. Anteile an einem herrschenden oder mehrheitlich beteiligten Unternehmen": {
+                        "account_type": "Equity",
+                        "is_group": 1
+                    },
+                    "3 - satzungsm\u00e4\u00dfige R\u00fccklagen": {
+                        "account_type": "Equity",
+                        "is_group": 1
+                    },
+                    "4 - andere Gewinnr\u00fccklagen": {
+                        "account_type": "Equity",
+                        "is_group": 1,
+                        "Gewinnr\u00fccklagen aus den \u00dcbergangsvorschriften BilMoG": {
+                            "is_group": 1,
+                            "Gewinnr\u00fccklagen (BilMoG)": {
+                                "account_number": "2963"
+                            },
+                            "Gewinnr\u00fccklagen aus Zuschreibung Sachanlageverm\u00f6gen (BilMoG)": {
+                                "account_number": "2964"
+                            },
+                            "Gewinnr\u00fccklagen aus Zuschreibung Finanzanlageverm\u00f6gen (BilMoG)": {
+                                "account_number": "2965"
+                            },
+                            "Gewinnr\u00fccklagen aus Aufl\u00f6sung der Sonderposten mit R\u00fccklageanteil (BilMoG)": {
+                                "account_number": "2966"
+                            }
+                        },
+                        "Latente Steuern (Gewinnr\u00fccklage Haben) aus erfolgsneutralen Verrechnungen": {
+                            "account_number": "2967"
+                        },
+                        "Latente Steuern (Gewinnr\u00fccklage Soll) aus erfolgsneutralen Verrechnungen": {
+                            "account_number": "2968"
+                        },
+                        "Rechnungsabgrenzungsposten (Gewinnr\u00fccklage Soll) aus erfolgsneutralen Verrechnungen": {
+                            "account_number": "2969"
+                        }
+                    },
+                    "is_group": 1
+                },
+                "IV - Gewinnvortrag/Verlustvortrag": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "V - Jahres\u00fcberschu\u00df/Jahresfehlbetrag": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "Einlagen stiller Gesellschafter": {
+                    "account_number": "9295"
+                }
+            },
+            "B - R\u00fcckstellungen": {
+                "is_group": 1,
+                "1 - R\u00fcckstellungen f. Pensionen und \u00e4hnliche Verplicht.": {
+                    "is_group": 1,
+                    "R\u00fcckstellungen f. Pensionen und \u00e4hnliche Verplicht.": {
+                        "account_number": "3000"
+                    },
+                    "R\u00fcckstellungen f. Pensionen und \u00e4hnliche Verplicht. (Saldierung mit langfristigen VG)": {
+                        "account_number": "3009"
+                    },
+                    "R\u00fcckstellungen f. Direktzusagen": {
+                        "account_number": "3010"
+                    },
+                    "R\u00fcckstellungen f. ZuschussVerplicht. f. Pensionskassen und Lebensversicherungen": {
+                        "account_number": "3011"
+                    }
+                },
+                "2 - Steuerr\u00fcckstellungen": {
+                    "is_group": 1,
+                    "Steuerr\u00fcckstellungen": {
+                        "account_number": "3020"
+                    },
+                    "Gewerbesteuerr\u00fcckstellung": {
+                        "account_number": "3030"
+                    },
+                    "Gewerbesteuerr\u00fcckstellung, \u00a7 4 Abs. 5b EStG": {
+                        "account_number": "3035"
+                    },
+                    "R\u00fcckstellung f. latente Steuern": {
+                        "account_number": "3060"
+                    },
+                    "Sonstige R\u00fcckstellungen": {
+                        "account_number": "3070"
+                    },
+                    "R\u00fcckstellungen f. Personalkosten": {
+                        "account_number": "3074"
+                    },
+                    "R\u00fcckstellungen f. unterlassene Aufwendungen f. Instandhaltung, Nachholung in den ersten drei Monaten": {
+                        "account_number": "3075"
+                    },
+                    "R\u00fcckstellungen f. mit der Altersvers. vergleichb. langfr. Verplicht. zum langfr. Verbleib": {
+                        "account_number": "3076"
+                    },
+                    "R\u00fcckst. f. mit der Altersvers. vergleichb. langfr. Verplicht. (Saldierung mit langfristigen VG)": {
+                        "account_number": "3077"
+                    }
+                },
+                "3 - sonstige R\u00fcckstellungen": {
+                    "is_group": 1,
+                    "Sonderposten mit R\u00fccklageanteil, steuerfreie R\u00fccklagen (Gruppe)": {
+                        "is_group": 1,
+                        "Sonderposten mit R\u00fccklageanteil, steuerfreie R\u00fccklagen": {
+                            "account_number": "2980"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil nach \u00a7 6b EStG": {
+                            "account_number": "2981"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil nach EStR R 6.6": {
+                            "account_number": "2982"
+                        },
+                        "R\u00fccklage f. Zusch\u00fcsse": {
+                            "account_number": "2988"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil nach \u00a7 52 Abs.16 EStG": {
+                            "account_number": "2989"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil, Sonderabschreibungen": {
+                            "account_number": "2990"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 2 EStG n. F.": {
+                            "account_number": "2993"
+                        },
+                        "Ausgleichsposten bei Entnahmen \u00a7 4g EStG": {
+                            "account_number": "2995"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 1 EStG a. F. / \u00a7 7g Abs. 5 EStG n. F.": {
+                            "account_number": "2997"
+                        },
+                        "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 3 und 7 EStG a. F.": {
+                            "account_number": "2998"
+                        },
+                        "Sonderposten f. Zusch\u00fcsse und Zulagen": {
+                            "account_number": "2999"
+                        },
+                        "R\u00fcckstellungen f. Abraum- und Abfallbeseitigung": {
+                            "account_number": "3085"
+                        },
+                        "R\u00fcckstellungen f. Gew\u00e4hrleistungen": {
+                            "account_number": "3090"
+                        },
+                        "R\u00fcckstellungen f. drohende Verluste aus schwebenden Gesch\u00e4ften": {
+                            "account_number": "3092"
+                        },
+                        "R\u00fcckstellungen f. Abschluss- und Pr\u00fcfungskosten": {
+                            "account_number": "3095"
+                        },
+                        "R\u00fcckstellungen zur Erf\u00fcllung der Aufbewahrungspflichten": {
+                            "account_number": "3096"
+                        },
+                        "Aufwandsr\u00fcckstellungen gem\u00e4\u00df \u00a7 249 Abs. 2 HGB a. F.": {
+                            "account_number": "3098"
+                        },
+                        "R\u00fcckstellungen f. Umweltschutz": {
+                            "account_number": "3099"
+                        }
+                    }
+                }
+            },
+            "C - Verb.": {
+                "account_type": "Payable",
+                "1 - Anleihen": {
+                    "is_group": 1,
+                    "account_type": "Payable",
+                    "davon konvertibel": {
+                        "account_type": "Payable",
+                        "is_group": 1,
+                        "Anleihen, konvertibel": {
+                            "account_number": "3120"
+                        },
+                        "Anleihen, konvertibel (b. 1 J.)": {
+                            "account_number": "3121"
+                        },
+                        "Anleihen, konvertibel (1-5 J.)": {
+                            "account_number": "3125"
+                        },
+                        "Anleihen, konvertibel (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3130"
+                        }
+                    },
+                    "Anleihen, nicht konvertibel": {
+                        "account_number": "3100"
+                    },
+                    "Anleihen, nicht konvertibel (b. 1 J.)": {
+                        "account_number": "3101"
+                    },
+                    "Anleihen, nicht konvertibel (1-5 J.)": {
+                        "account_number": "3105"
+                    },
+                    "Anleihen, nicht konvertibel (gr\u00f6\u00dfer 5 J.) (Gruppe)": {
+                        "is_group": 1,
+                        "Anleihen, nicht konvertibel (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3110"
+                        }
+                    }
+                },
+                "2 - Verb. gg. Kreditinstituten": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "Bewertungskorrektur zu Verb. gg. Kreditinstituten": {
+                        "account_number": "9963"
+                    },
+                    "Verb. gg. Kreditinstituten (Gruppe)": {
+                        "is_group": 1,
+                        "Verb. gg. Kreditinstituten": {
+                            "account_number": "3150"
+                        },
+                        "Verb. gg. Kreditinstituten (b. 1 J.)": {
+                            "account_number": "3151"
+                        },
+                        "Verb. gg. Kreditinstituten (1-5 J.)": {
+                            "account_number": "3160"
+                        },
+                        "Verb. gg. Kreditinstituten (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3170"
+                        }
+                    },
+                    "Verb. gg. Kreditinstituten aus Teilzahlungsvertr\u00e4gen (Gruppe)": {
+                        "is_group": 1,
+                        "Verb. gg. Kreditinstituten aus Teilzahlungsvertr\u00e4gen": {
+                            "account_number": "3180"
+                        },
+                        "Verb. gg. Kreditinstituten aus Teilzahlungsvertr\u00e4gen (b. 1 J.)": {
+                            "account_number": "3181"
+                        },
+                        "Verb. gg. Kreditinstituten aus Teilzahlungsvertr\u00e4gen (1-5 J.)": {
+                            "account_number": "3190"
+                        },
+                        "Verb. gg. Kreditinstituten aus Teilzahlungsvertr\u00e4gen (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3200"
+                        }
+                    }
+                },
+                "3 - erhaltene Anz. auf Bestellungen": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "Erhaltene, versteuerte Anz. 7 % USt (Verb.)": {
+                        "account_number": "3260",
+                        "account_type": "Receivable"
+                    },
+                    "Erhaltene, versteuerte Anz. 16 % USt (Verb.)": {
+                        "account_number": "3270"
+                    },
+                    "Erhaltene, versteuerte Anz. 15 % USt (Verb.)": {
+                        "account_number": "3271"
+                    },
+                    "Erhaltene, versteuerte Anz. 19 % USt (Verb.)": {
+                        "account_number": "3272",
+                        "account_type": "Receivable"
+                    },
+                    "Erhaltene Anz. (Gruppe)": {
+                        "is_group": 1,
+                        "Erhaltene Anz. (b. 1 J.)": {
+                            "account_number": "3280",
+                            "account_type": "Receivable"
+                        },
+                        "Erhaltene Anz. (1-5 J.)": {
+                            "account_number": "3284",
+                            "account_type": "Receivable"
+                        },
+                        "Erhaltene Anz. (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3285",
+                            "account_type": "Receivable"
+                        }
+                    },
+                    "Erhaltene Anz. auf Bestellungen (Verb.)": {
+                        "account_number": "3250",
+                        "account_type": "Receivable"
+                    }
+                },
+                "4 - Verb. aus Lieferungen und Leistungen": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "Bewertungskorrektur zu Verb. aus Lieferungen und Leistungen": {
+                        "account_number": "9964"
+                    },
+                    "Verb. aus Lieferungen und Leistungen": {
+                        "account_number": "3300",
+                        "account_type": "Payable"
+                    },
+                    "Verb. aus Lieferungen und Leistungen ohne Kontokorrent": {
+                        "account_number": "3310"
+                    },
+                    "Verb. aus Lieferungen und Leistungen ohne Kontokorrent (b. 1 J.)": {
+                        "account_number": "3335"
+                    },
+                    "Verb. aus Lieferungen und Leistungen ohne Kontokorrent (1-5 J.)": {
+                        "account_number": "3337"
+                    },
+                    "Verb. aus Lieferungen und Leistungen ohne Kontokorrent (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3338"
+                    }
+                },
+                "5 - Verb. aus der Annahme gezogener Wechsel und der Ausstellung eigener Wechsel": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "Verb. aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel": {
+                        "account_number": "3350"
+                    },
+                    "Verb. aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel (b. 1 J.)": {
+                        "account_number": "3351"
+                    },
+                    "Verb. aus der Annahme gezogener Wechsel und aus der Ausstellung eigner Wechsel (1-5 J.)": {
+                        "account_number": "3380"
+                    },
+                    "Verb. aus der Annahme gezogener Wechsel und der Ausstellung eigener Wechsel (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3390"
+                    }
+                },
+                "6 - Verb. gg. verbundenen Unternehmen": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "Verb. gg. verbundenen Unternehmen": {
+                        "account_number": "3400"
+                    },
+                    "Verb. gg. verbundenen Unternehmen (b. 1 J.)": {
+                        "account_number": "3401"
+                    },
+                    "Verb. gg. verbundenen Unternehmen (1-5 J.)": {
+                        "account_number": "3405"
+                    },
+                    "Verb. gg. verbundenen Unternehmen (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3410"
+                    },
+                    "Verb. aus LuL gg. verbundenen Unternehmen": {
+                        "account_number": "3420"
+                    },
+                    "Verb. aus LuL gg. verbundenen Unternehmen (b. 1 J.)": {
+                        "account_number": "3421"
+                    },
+                    "Verb. aus LuL gg. verbundenen Unternehmen (1-5 J.)": {
+                        "account_number": "3425"
+                    },
+                    "Verb. aus LuL gg. verbundenen Unternehmen (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3430"
+                    }
+                },
+                "7 - Verb. gg. Unternehmen, mit denen ein Beteiligungsverh. besteht": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "Verb. gg. Unternehmen, mit denen ein Beteiligungsverh. besteht": {
+                        "account_number": "3450"
+                    },
+                    "Verb. gg. Unternehmen, mit denen ein Beteiligungsverh. besteht (b. 1 J.)": {
+                        "account_number": "3451"
+                    },
+                    "Verb. gg. Unternehmen, mit denen ein Beteiligungsverh. besteht (1-5 J.)": {
+                        "account_number": "3455"
+                    },
+                    "Verb. gg. Unternehmen, mit denen ein Beteiligungsverh. besteht (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3460"
+                    },
+                    "Verb. aus LuL gg. Unternehmen, mit denen ein Beteiligungsverh. besteht": {
+                        "account_number": "3470"
+                    },
+                    "Verb. aus LuL gg. Unternehmen, mit denen ein Beteiligungsverh. besteht (b. 1 J.)": {
+                        "account_number": "3471"
+                    },
+                    "Verb. aus LuL gg. Unternehmen, mit denen ein Beteiligungsverh. besteht (1-5 J.)": {
+                        "account_number": "3475"
+                    },
+                    "Verb. aus LuL gg. Unternehmen, mit denen ein Beteiligungsverh. besteht (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3480"
+                    }
+                },
+                "8 - sonstige Verb.": {
+                    "account_type": "Payable",
+                    "is_group": 1,
+                    "davon aus Steuern": {
+                        "account_type": "Payable",
+                        "is_group": 1,
+                        "Verb. aus Steuern und Abgaben": {
+                            "account_number": "3700",
+                            "account_type": "Payable"
+                        },
+                        "Verb. aus Steuern und Abgaben (b. 1 J.)": {
+                            "account_number": "3701"
+                        },
+                        "Verb. aus Steuern und Abgaben (1-5 J.)": {
+                            "account_number": "3710"
+                        },
+                        "Verb. aus Steuern und Abgaben (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3715"
+                        },
+                        "Verb. aus Lohn- und Kirchensteuer": {
+                            "account_number": "3730"
+                        },
+                        "Verb. aus Einbehaltungen (KapESt und Solz auf KapESt) f. offene Aussch\u00fcttungen": {
+                            "account_number": "3760"
+                        },
+                        "Verb. f. Verbrauchsteuern": {
+                            "account_number": "3761"
+                        }
+                    },
+                    "Gewinnverf\u00fcgungskonto stille Gesellschafter": {
+                        "account_number": "3620"
+                    },
+                    "Sonstige Verrechnungskonten (Interimskonten)": {
+                        "account_number": "3630"
+                    },
+                    "Kreditkartenabrechnung": {
+                        "account_number": "3610"
+                    },
+                    "Verb. gg. Arbeitsgemeinschaften": {
+                        "account_number": "3611"
+                    },
+                    "Bewertungskorrektur zu sonstigen Verb.": {
+                        "account_number": "9961"
+                    },
+                    "Verb. gg. stillen Gesellschaftern": {
+                        "account_number": "3655"
+                    },
+                    "Verb. gg. stillen Gesellschaftern (b. 1 J.)": {
+                        "account_number": "3656"
+                    },
+                    "Verb. gg. stillen Gesellschaftern (1-5 J.)": {
+                        "account_number": "3657"
+                    },
+                    "Verb. gg. stillen Gesellschaftern (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3658"
+                    },
+                    "davon i. R. d. sozialen Sicherheit": {
+                        "account_type": "Payable",
+                        "is_group": 1,
+                        "Verb. i. R. d. sozialen Sicherheit": {
+                            "account_number": "3740"
+                        },
+                        "Verb. i. R. d. sozialen Sicherheit (b. 1 J.)": {
+                            "account_number": "3741"
+                        },
+                        "Verb. i. R. d. sozialen Sicherheit (1-5 J.)": {
+                            "account_number": "3750"
+                        },
+                        "Verb. i. R. d. sozialen Sicherheit (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3755"
+                        },
+                        "Voraussichtliche Beitragsschuld gg. den Sozialversicherungstr\u00e4gern": {
+                            "account_number": "3759"
+                        }
+                    },
+                    "Verb. aus Lohn und Gehalt (Gruppe)": {
+                        "is_group": 1,
+                        "Verb. aus Lohn und Gehalt": {
+                            "account_number": "3720"
+                        },
+                        "Verb. f. Einbehaltungen von Arbeitnehmern": {
+                            "account_number": "3725"
+                        },
+                        "Verb. an das Finanzamt aus abzuf\u00fchrendem Bauabzugsbetrag": {
+                            "account_number": "3726"
+                        }
+                    },
+                    "Verb. aus Verm\u00f6gensbildung": {
+                        "account_number": "3770"
+                    },
+                    "Verb. aus Verm\u00f6gensbildung (b. 1 J.)": {
+                        "account_number": "3771"
+                    },
+                    "Verb. aus Verm\u00f6gensbildung (1-5 J.)": {
+                        "account_number": "3780"
+                    },
+                    "Verb. aus Verm\u00f6gensbildung (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3785"
+                    },
+                    "Ausgegebene Geschenkgutscheine": {
+                        "account_number": "3786"
+                    },
+                    "Sonstige Verb.": {
+                        "account_number": "3500",
+                        "account_type": "Payable"
+                    },
+                    "Sonstige Verb. (b. 1 J.)": {
+                        "account_number": "3501"
+                    },
+                    "Sonstige Verb. (1-5 J.)": {
+                        "account_number": "3504"
+                    },
+                    "Sonstige Verb. (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3507"
+                    },
+                    "Darlehen typisch stiller Gesellschafter (Gruppe)": {
+                        "is_group": 1,
+                        "Darlehen typisch stiller Gesellschafter": {
+                            "account_number": "3520"
+                        },
+                        "Darlehen typisch stiller Gesellschafter (b. 1 J.)": {
+                            "account_number": "3521"
+                        },
+                        "Darlehen typisch stiller Gesellschafter (1-5 J.)": {
+                            "account_number": "3524"
+                        },
+                        "Darlehen typisch stiller Gesellschafter (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3527"
+                        }
+                    },
+                    "Darlehen atypisch stiller Gesellschafter (Gruppe)": {
+                        "is_group": 1,
+                        "Darlehen atypisch stiller Gesellschafter": {
+                            "account_number": "3530"
+                        },
+                        "Darlehen atypisch stiller Gesellschafter (b. 1 J.)": {
+                            "account_number": "3531"
+                        },
+                        "Darlehen atypisch stiller Gesellschafter (1-5 J.)": {
+                            "account_number": "3534"
+                        },
+                        "Darlehen atypisch stiller Gesellschafter (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3537"
+                        }
+                    },
+                    "Partiarische Darlehen (Gruppe)": {
+                        "is_group": 1,
+                        "Partiarische Darlehen": {
+                            "account_number": "3540"
+                        },
+                        "Partiarische Darlehen (b. 1 J.)": {
+                            "account_number": "3541"
+                        },
+                        "Partiarische Darlehen (1-5 J.)": {
+                            "account_number": "3544"
+                        },
+                        "Partiarische Darlehen (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3547"
+                        }
+                    },
+                    "Erhaltene Kautionen (Gruppe)": {
+                        "is_group": 1,
+                        "Erhaltene Kautionen": {
+                            "account_number": "3550"
+                        },
+                        "Erhaltene Kautionen (b. 1 J.)": {
+                            "account_number": "3551"
+                        },
+                        "Erhaltene Kautionen (1-5 J.)": {
+                            "account_number": "3554"
+                        },
+                        "Erhaltene Kautionen (gr\u00f6\u00dfer 5 J.)": {
+                            "account_number": "3557"
+                        }
+                    },
+                    "Darlehen (1-5 J.)": {
+                        "account_number": "3564"
+                    },
+                    "Darlehen (gr\u00f6\u00dfer 5 J.)": {
+                        "account_number": "3567"
+                    },
+                    "Lohn- und Gehaltsverrechnungskonto": {
+                        "account_number": "3790"
+                    },
+                    "Umsatzsteuer (Gruppe)": {
+                        "account_type": "Tax",
+                        "is_group": 1,
+                        "Umsatzsteuer": {
+                            "account_number": "3800",
+                            "account_type": "Tax"
+                        },
+                        "Umsatzsteuer 7 %": {
+                            "account_number": "3801",
+                            "account_type": "Tax"
+                        },
+                        "Umsatzsteuer aus innergem. Erwerb": {
+                            "account_number": "3802"
+                        },
+                        "Umsatzsteuer aus innergem. Erwerb 19 %": {
+                            "account_number": "3804"
+                        },
+                        "Umsatzsteuer 19 %": {
+                            "account_number": "3806",
+                            "account_type": "Tax"
+                        },
+                        "Umsatzsteuer aus im Inland steuerpfl. EU-Lieferungen": {
+                            "account_number": "3807"
+                        },
+                        "Umsatzsteuer aus im Inland steuerpfl. EU-Lieferungen 19 %": {
+                            "account_number": "3808"
+                        },
+                        "Umsatzsteuer aus innergem. Erwerb ohne Vorsteuerabzug": {
+                            "account_number": "3809"
+                        },
+                        "Umsatzsteuer nicht f\u00e4llig (Gruppe)": {
+                            "is_group": 1,
+                            "Umsatzsteuer nicht f\u00e4llig": {
+                                "account_number": "3810"
+                            },
+                            "Umsatzsteuer nicht f\u00e4llig 7 %": {
+                                "account_number": "3811"
+                            },
+                            "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpfl. EU-Lieferungen": {
+                                "account_number": "3812"
+                            },
+                            "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpfl. EU-Lieferungen 19 %": {
+                                "account_number": "3814"
+                            },
+                            "Umsatzsteuer nicht f\u00e4llig 19 %": {
+                                "account_number": "3816"
+                            },
+                            "Umsatzsteuer aus im anderen EU-Land steuerpfl. Lieferungen": {
+                                "account_number": "3817"
+                            },
+                            "Umsatzsteuer aus im anderen EU-Land steuerpfl. sonstigen Leistungen/Werklieferungen": {
+                                "account_number": "3818"
+                            },
+                            "Umsatzsteuer aus Erwerb als letzter Abnehmer innerh. eines Dreiecksgesch.s": {
+                                "account_number": "3819"
+                            }
+                        },
+                        "Umsatzsteuer-Vorauszahlungen": {
+                            "account_number": "3820",
+                            "account_type": "Tax"
+                        },
+                        "Umsatzsteuer-Vorauszahlung 1/11": {
+                            "account_number": "3830"
+                        },
+                        "Nachsteuer, UStVA Kz. 65": {
+                            "account_number": "3832"
+                        },
+                        "Umsatzsteuer aus innergem. Erwerb von Neufahrzeugen von Lieferanten ohne Ust-ID": {
+                            "account_number": "3834"
+                        },
+                        "Umsatzsteuer nach \u00a7 13b UStG": {
+                            "account_number": "3835"
+                        },
+                        "Umsatzsteuer nach \u00a7 13b UStG 19 %": {
+                            "account_number": "3837"
+                        },
+                        "Umsatzsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Umsatzsteuerlager": {
+                            "account_number": "3839"
+                        },
+                        "Einfuhrumsatzsteuer aufgeschoben bis": {
+                            "account_number": "3850"
+                        },
+                        "In Rechnung unrichtig oder unberechtigtausgewiesene Steuerbetr\u00e4ge, UStVA Kz. 69": {
+                            "account_number": "3852"
+                        },
+                        "Steuerzahlungen an andere L\u00e4nder": {
+                            "account_number": "3854"
+                        }
+                    }
+                },
+                "is_group": 1
+            },
+            "E - Passive latente Steuern": {
+                "is_group": 1,
+                "Passive latente Steuern": {
+                    "account_number": "3065"
+                }
+            },
+            "D - Rechnungsabgrenzungsposten": {
+                "is_group": 1,
+                "Passive Rechnungsabgrenzung": {
+                    "account_number": "3900"
+                }
+            },
+            "is_group": 1
+        },
+        "1 - Umsatzerl\u00f6se": {
+            "root_type": "Income",
+            "is_group": 1,
+            "Steuerfreie Ums\u00e4tze \u00a7 4 Nr. 8 ff UStG (Gruppe)": {
+                "is_group": 1,
+                "Steuerfreie Ums\u00e4tze \u00a7 4 Nr. 8 ff UStG": {
+                    "account_number": "4100"
+                },
+                "Steuerfreie Ums\u00e4tze nach \u00a7 4 Nr. 12 UStG (Vermietung und Verpachtung)": {
+                    "account_number": "4105"
+                },
+                "Sonstige steuerfreie Ums\u00e4tze Inland": {
+                    "account_number": "4110"
+                },
+                "Steuerfreie Ums\u00e4tze \u00a7 4 Nr. 1a UStG (Gruppe)": {
+                    "is_group": 1,
+                    "Steuerfreie Ums\u00e4tze \u00a7 4 Nr. 1a UStG": {
+                        "account_number": "4120"
+                    },
+                    "Steuerfreie Innergemeinschaftliche Lieferungen \u00a7 4 Nr. 1b UStG": {
+                        "account_number": "4125"
+                    }
+                },
+                "Lieferungen des ersten Abnehmers bei innergem. Dreiecksgesch.en \u00a7 25b Abs. 2 UStG (Gruppe)": {
+                    "is_group": 1,
+                    "Lieferungen des ersten Abnehmers bei innergem. Dreiecksgesch.en \u00a7 25b Abs. 2 UStG": {
+                        "account_number": "4130"
+                    },
+                    "Steuerfreie innergem. Lieferungen von Neufahrzeugen an Abnehmer ohne Ust-ID": {
+                        "account_number": "4135"
+                    },
+                    "Umsatzerl\u00f6se nach \u00a7\u00a7 25 und 25a UStG 19% USt": {
+                        "account_number": "4136"
+                    },
+                    "Umsatzerl\u00f6se nach \u00a7\u00a7 25 und 25a UStG ohne USt": {
+                        "account_number": "4138"
+                    },
+                    "Umsatzerl\u00f6se aus Reiseleistungen \u00a7 25 Abs. 2 UStG, steuerfrei": {
+                        "account_number": "4139"
+                    }
+                },
+                "Steuerfreie Ums\u00e4tze Offshore usw.": {
+                    "account_number": "4140"
+                },
+                "Sonstige steuerfreie Ums\u00e4tze (z. B. \u00a7 4 Nr. 2-7 UStG)": {
+                    "account_number": "4150"
+                },
+                "Steuerfreie Ums\u00e4tze ohne Vorsteuerabzug zum Gesamtumsatz geh\u00f6rend": {
+                    "account_number": "4160"
+                },
+                "Erl\u00f6se, die mit den Durchschnittss\u00e4tzen des \u00a7 24 UStG versteuert werden": {
+                    "account_number": "4180"
+                },
+                "Erl\u00f6se aus Kleinunternehmer i. S. d. \u00a7 19 Abs. 1 UStG": {
+                    "account_number": "4185",
+                    "account_type": "Income Account"
+                },
+                "Erl\u00f6se aus Geldspielautomaten 19 % USt": {
+                    "account_number": "4186"
+                }
+            },
+            "Erl\u00f6se": {
+                "account_number": "4200",
+                "account_type": "Income Account"
+            },
+            "Erl\u00f6se 7 % USt": {
+                "account_number": "4300",
+                "account_type": "Income Account"
+            },
+            "Erl\u00f6se aus im Inland steuerpfl. EU-Lieferungen 7 % USt": {
+                "account_number": "4310"
+            },
+            "Erl\u00f6se aus im Inland steuerpfl. EU-Lieferungen 19 % USt": {
+                "account_number": "4315"
+            },
+            "Erl\u00f6se aus im anderen EU-Land steuerpfl. Lieferungen": {
+                "account_number": "4320"
+            },
+            "Erl\u00f6se aus im Inland steuerpfl. EU-Lieferungen 16 % USt": {
+                "account_number": "4330"
+            },
+            "Erl\u00f6se aus Lieferungen von Mobilfunkger./Schaltkr., f. die der Leistungsempf. die Ust. schuldet": {
+                "account_number": "4335"
+            },
+            "Erl\u00f6se aus im anderen EU-Land steuerpfl. sonst. Leistungen, f. die der Leistungsempf. die Ust. schuldet": {
+                "account_number": "4336"
+            },
+            "Erl\u00f6se aus Leistungen, f. die der Leistungsempf. die Ust. nach \u00a7 13b UStG schuldet": {
+                "account_number": "4337"
+            },
+            "Erl\u00f6se aus im Drittland steuerbaren Leistungen, im Inland nicht steuerbare Ums\u00e4tze": {
+                "account_number": "4338"
+            },
+            "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"
+                }
+            },
+            "Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
+                "is_group": 1,
+                "Erl\u00f6sschm\u00e4lerungen": {
+                    "account_number": "4700"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus steuerfreien Ums\u00e4tzen \u00a7 4 Nr. 1a UStG": {
+                    "account_number": "4705"
+                },
+                "Erl\u00f6sschm\u00e4lerungen 7 % USt": {
+                    "account_number": "4710"
+                },
+                "Erl\u00f6sschm\u00e4lerungen 19 % USt": {
+                    "account_number": "4720"
+                },
+                "Erl\u00f6sschm\u00e4lerungen 16 % USt": {
+                    "account_number": "4723"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus steuerfreien innergem. Lieferungen": {
+                    "account_number": "4724"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 7 % USt": {
+                    "account_number": "4725"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 19 % USt": {
+                    "account_number": "4726"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im anderen EU-Land steuerpfl. Lieferungen": {
+                    "account_number": "4727"
+                },
+                "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. 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 7 % USt": {
+                    "account_number": "4750"
+                },
+                "Gew\u00e4hrte Boni 19 % USt": {
+                    "account_number": "4760"
+                },
+                "Gew\u00e4hrte Boni": {
+                    "account_number": "4769"
+                },
+                "Gew\u00e4hrte Rabatte": {
+                    "account_number": "4770"
+                },
+                "Gew\u00e4hrte Rabatte 7 % USt": {
+                    "account_number": "4780"
+                },
+                "Gew\u00e4hrte Rabatte 19 % USt": {
+                    "account_number": "4790"
+                }
+            },
+            "Grundst\u00fccksertr\u00e4ge (Gruppe)": {
+                "is_group": 1,
+                "Grundst\u00fccksertr\u00e4ge": {
+                    "account_number": "4860"
+                },
+                "Erl\u00f6se aus Vermietung und Verpachtung, umsatzsteuerfrei \u00a7 4 Nr. 12 UStG": {
+                    "account_number": "4861"
+                },
+                "Erl\u00f6se aus Vermietung und Verpachtung 19% USt": {
+                    "account_number": "4862"
+                }
+            },
+            "Sonstige Ertr\u00e4ge aus Provisionen, Lizenzen und Patenten (Gruppe)": {
+                "is_group": 1,
+                "Sonstige Ertr\u00e4ge aus Provisionen, Lizenzen und Patenten": {
+                    "account_number": "4570"
+                },
+                "Sonstige Ertr\u00e4ge aus Provisionen, Lizenzen und Patenten, steuerfrei \u00a7 4 Nr. 8ff UStG": {
+                    "account_number": "4574"
+                },
+                "Sonstige Ertr\u00e4ge aus Provisionen, Lizenzen und Patenten, steuerfrei \u00a7 4 Nr. 5 UStG": {
+                    "account_number": "4575"
+                },
+                "Sonstige Ertr\u00e4ge aus Provisionen, Lizenzen und Patenten 7% USt": {
+                    "account_number": "4576"
+                },
+                "Sonstige Ertr\u00e4ge aus Provisionen, Lizenzen und Patenten 19% USt": {
+                    "account_number": "4579"
+                }
+            },
+            "Provisionsums\u00e4tze (Gruppe)": {
+                "is_group": 1,
+                "Provisionsums\u00e4tze": {
+                    "account_number": "4560"
+                },
+                "Provisionsums\u00e4tze, steuerfrei \u00a7 4Nr. 8ff UStG": {
+                    "account_number": "4564"
+                },
+                "Provisionsums\u00e4tze, steuerfrei \u00a7 4 Nr. 5 UStG": {
+                    "account_number": "4565"
+                },
+                "Provisionsums\u00e4tze 7% USt": {
+                    "account_number": "4566"
+                },
+                "Provisionsums\u00e4tze 19 % Ust": {
+                    "account_number": "4569"
+                }
+            },
+            "Erl\u00f6se Abfallverwertung": {
+                "account_number": "4510"
+            },
+            "Erl\u00f6se Leergut": {
+                "account_number": "4520"
+            }
+        },
+        "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"
+                }
+            },
+            "Aufwendungen f. Roh-, Hilfs- und Betriebsstoffe und f. bezogene Waren": {
+                "account_number": "5000",
+                "account_type": "Expense Account"
+            },
+            "Einkauf Roh-, Hilfs- und Betriebsstoffe (Gruppe)": {
+                "is_group": 1,
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                    "account_number": "5100",
+                    "account_type": "Expense Account"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                    "account_number": "5110"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                    "account_number": "5130"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5160"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5162"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb ohne Vorsteuer und 7% Umsatzsteuer": {
+                    "account_number": "5166"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb ohne Vorsteuer und 19% Umsatzsteuer": {
+                    "account_number": "5167"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe 5,5% Vorsteuer": {
+                    "account_number": "5170"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe 10,7% Vorsteuer": {
+                    "account_number": "5171"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe aus einem USt-Lager \u00a7 13a UStG 7% Vorst. und 7% Ust.": {
+                    "account_number": "5175"
+                },
+                "Einkauf Roh-, Hilfs- und Betriebsstoffe aus einem USt-Lager \u00a7 13a UStG 19% Vorst. und 19% Ust.": {
+                    "account_number": "5176"
+                },
+                "Erwerb Roh-, Hilfs- und Betriebsstoffe als letzter Abnehmer innerh. Dreiecksgesch. 19% Vorst. und 19% Ust.": {
+                    "account_number": "5189"
+                },
+                "Energiestoffe (Fertigung) (Gruppe)": {
+                    "is_group": 1,
+                    "Energiestoffe (Fertigung)": {
+                        "account_number": "5190"
+                    },
+                    "Energiestoffe (Fertigung)7% Vorsteuer": {
+                        "account_number": "5191"
+                    },
+                    "Energiestoffe (Fertigung)19% Vorsteuer": {
+                        "account_number": "5192"
+                    }
+                }
+            },
+            "Wareneingang (Gruppe)": {
+                "is_group": 1,
+                "Wareneingang": {
+                    "account_number": "5200"
+                },
+                "Wareneingang 7 % Vorsteuer": {
+                    "account_number": "5300"
+                },
+                "Wareneingang 19 % Vorsteuer": {
+                    "account_number": "5400"
+                },
+                "Wareneingang 5,5 % Vorsteuer": {
+                    "account_number": "5505"
+                },
+                "Wareneingang 10,7 % Vorsteuer": {
+                    "account_number": "5540"
+                },
+                "Steuerfreier innergem. Erwerb": {
+                    "account_number": "5550"
+                },
+                "Wareneingang im Drittland steuerbar": {
+                    "account_number": "5551"
+                },
+                "Erwerb 1. Abnehmer innerh. eines Dreieckgesch\u00e4ftes": {
+                    "account_number": "5552"
+                },
+                "Erwerb Waren als letzter Abnehmer innerh. Dreiecksgesch. 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5553"
+                },
+                "Wareneingang im anderen EU-Land steuerbar": {
+                    "account_number": "5558"
+                },
+                "Steuerfreie Einfuhren": {
+                    "account_number": "5559"
+                },
+                "Waren aus einem Umsatzsteuerlager, \u00a7 13a UStG 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5560"
+                },
+                "Waren aus einem Umsatzsteuerlager, \u00a7 13a UStG 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5565"
+                }
+            },
+            "innergem. Erwerb 7% Vorst. u. 7% Ust.": {
+                "account_number": "5420"
+            },
+            "innergem. Erwerb 19 % Vorsteuer 19 % Umsatzsteuer": {
+                "account_number": "5425"
+            },
+            "innergem. Erwerb ohne Vorst. und 7% Ust.": {
+                "account_number": "5430"
+            },
+            "innergem. Erwerb ohne Vorsteuer und 19 % Umsatzsteuer": {
+                "account_number": "5435"
+            },
+            "innergem. Erwerb von Neufahrzeugen von Lieferanten ohne Ust-ID 19 % Vorst. und 19 % Ust.": {
+                "account_number": "5440"
+            },
+            "Nicht abziehbare Vorsteuer (Gruppe)": {
+                "is_group": 1,
+                "Nicht abziehbare Vorsteuer": {
+                    "account_number": "5600"
+                },
+                "Nicht abziehbare Vorsteuer 7 % (Gruppe)": {
+                    "is_group": 1,
+                    "Nicht abziehbare Vorsteuer 7 %": {
+                        "account_number": "5610"
+                    }
+                },
+                "Nicht abziehbare Vorsteuer 19 % (Gruppe)": {
+                    "is_group": 1,
+                    "Nicht abziehbare Vorsteuer 19 %": {
+                        "account_number": "5660"
+                    }
+                }
+            },
+            "Nachl\u00e4sse (Gruppe)": {
+                "is_group": 1,
+                "Nachl\u00e4sse": {
+                    "account_number": "5700"
+                },
+                "Nachl\u00e4sse aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                    "account_number": "5701"
+                },
+                "Nachl\u00e4sse 7 % Vorsteuer": {
+                    "account_number": "5710"
+                },
+                "Nachl\u00e4sse aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                    "account_number": "5714"
+                },
+                "Nachl\u00e4sse aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                    "account_number": "5715"
+                },
+                "Nachl\u00e4sse aus Einkauf Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5717"
+                },
+                "Nachl\u00e4sse aus Einkauf Roh-, Hilfs- und Betriebsstoffe, innergem. Erwerb 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5718"
+                },
+                "Nachl\u00e4sse 19 % Vorsteuer": {
+                    "account_number": "5720"
+                },
+                "Nachl\u00e4sse 16 % Vorsteuer": {
+                    "account_number": "5722"
+                },
+                "Nachl\u00e4sse 15 % Vorsteuer": {
+                    "account_number": "5723"
+                },
+                "Nachl\u00e4sse aus innergem. Erwerb 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5724"
+                },
+                "Nachl\u00e4sse aus innergem. Erwerb 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5725"
+                },
+                "Nachl\u00e4sse aus innergem. Erwerb 16 % Vorsteuer und 16 % Umsatzsteuer": {
+                    "account_number": "5726"
+                },
+                "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 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"
+                    }
+                }
+            },
+            "Bezugsnebenkosten (Gruppe)": {
+                "is_group": 1,
+                "Bezugsnebenkosten": {
+                    "account_number": "5800"
+                },
+                "Leergut": {
+                    "account_number": "5820"
+                },
+                "Z\u00f6lle und Einfuhrabgaben": {
+                    "account_number": "5840"
+                },
+                "Verrechnete Stoffkosten (Gegenkonto 5000-99) oder (4000-99)": {
+                    "account_number": "5860"
+                }
+            },
+            "Fremdleistungen (Gruppe)": {
+                "is_group": 1,
+                "Fremdleistungen": {
+                    "account_number": "5900",
+                    "account_type": "Expense Account"
+                },
+                "Fremdleistungen 19% Vorsteuer": {
+                    "account_number": "5906"
+                },
+                "Fremdleistungen ohne Vorsteuer": {
+                    "account_number": "5909"
+                },
+                "Bauleistungen eines im Inland ans\u00e4ssigen Unternehmers 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5910"
+                },
+                "Sonstige Leistungen eines im anderen EU-Land ans\u00e4ssigen Unternehmers 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5913"
+                },
+                "Leistungen eines im Ausland ans\u00e4ssigen Unternehmers 7% Vorst. u. 7% Ust.": {
+                    "account_number": "5915"
+                },
+                "Bauleistungen eines im Inland ans\u00e4ssigen Unternehmers 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5920"
+                },
+                "Sonstige Leistungen eines im anderen EU-Land ans\u00e4ssigen Unternehmers 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5923"
+                },
+                "Leistungen eines im Ausland ans\u00e4ssigen Unternehmers 19% Vorst. u. 19% Ust.": {
+                    "account_number": "5925"
+                },
+                "Bauleistungen eines im Inland ans\u00e4ssigen Unternehmers ohne Vorst. und 7% Ust.": {
+                    "account_number": "5930"
+                },
+                "Sonstige Leistungen eines im anderen EU-Land ans\u00e4ssigen Unternehmers ohne Vorst. und 7% Ust.": {
+                    "account_number": "5933"
+                },
+                "Leistungen eines im Ausland ans\u00e4ssigen Unternehmers ohne Vorst. und 7% Ust.": {
+                    "account_number": "5935"
+                },
+                "Bauleistungen eines im Inland ans\u00e4ssigen Unternehmers ohne Vorsteuer und 19 % Umsatzsteuer": {
+                    "account_number": "5940"
+                },
+                "Sonstige Leistungen eines im anderen EU-Land ans\u00e4ssigen Unternehmers ohne Vorsteuer und 19 % Umsatzsteuer": {
+                    "account_number": "5943"
+                },
+                "Leistungen eines im Ausland ans\u00e4ssigen Unternehmers ohne Vorsteuer und 19 % Umsatzsteuer": {
+                    "account_number": "5945"
+                },
+                "Erhaltene Skonti aus Leistungen, f. die als Leistungsempf. die Steuer geschuldet wird (Gruppe)": {
+                    "is_group": 1,
+                    "Erh. Skonti aus Leistungen, f. die als Leistungsempf. die Steuer nach \u00a7 13b UStG geschuldet wird": {
+                        "account_number": "5950"
+                    },
+                    "Erh. Skonti aus Leistungen,f. die als Leistungsempf. die Steuer geschuldet wird 19 % Vorst. und 19 % Ust.": {
+                        "account_number": "5951"
+                    },
+                    "Erh. Skonti aus Leistungen, f. die als Leistungsempf. die Steuer geschuldet wird ohne Vorst. aber mit Uts.": {
+                        "account_number": "5953"
+                    },
+                    "Erh. Skonti aus Leistungen, f. die als Leistungsempf. die Steuer geschuldet wird ohne Vorst., mit 19 % Ust.": {
+                        "account_number": "5954"
+                    }
+                },
+                "Leistungen nach \u00a7 13b UStG mit Vorsteuerabzug": {
+                    "account_number": "5960"
+                },
+                "Leistungen nach \u00a7 13b UStG ohne Vorsteuerabzug": {
+                    "account_number": "5965"
+                }
+            },
+            "L\u00f6hne und Geh\u00e4lter (Gruppe)": {
+                "is_group": 1,
+                "L\u00f6hne und Geh\u00e4lter": {
+                    "account_number": "6000",
+                    "account_type": "Expense Account"
+                },
+                "L\u00f6hne": {
+                    "account_number": "6010"
+                },
+                "Geh\u00e4lter": {
+                    "account_number": "6020"
+                },
+                "Tantiemen": {
+                    "account_number": "6026"
+                },
+                "Aushilfsl\u00f6hne": {
+                    "account_number": "6030"
+                },
+                "L\u00f6hne f. Minijobs": {
+                    "account_number": "6035"
+                },
+                "Pauschale Steuern und Abgaben f. Sachzuwendungen und Dienstleistungen an Arbeitnehmer": {
+                    "account_number": "6039"
+                },
+                "Pauschale Steuer f. Aushilfen": {
+                    "account_number": "6040"
+                },
+                "Bedienungsgelder": {
+                    "account_number": "6045"
+                },
+                "Ehegattengehalt": {
+                    "account_number": "6050"
+                },
+                "Freiwillige soziale Aufwendungen lohnsteuerpflichtig": {
+                    "account_number": "6060"
+                },
+                "Pauschale Steuer auf sonstige Bez\u00fcge (z. B. Fahrtkostenzusch\u00fcsse)": {
+                    "account_number": "6069"
+                },
+                "Krankengeldzusch\u00fcsse": {
+                    "account_number": "6070"
+                },
+                "Sachzuwendungen und Dienstleistungen an Arbeitnehmer": {
+                    "account_number": "6072"
+                },
+                "Zusch\u00fcsse der Agenturen f. Arbeit (Haben)": {
+                    "account_number": "6075"
+                },
+                "Verm\u00f6genswirksame Leistungen": {
+                    "account_number": "6080"
+                },
+                "Fahrtkostenerstattung - Wohnung/Arbeitsst\u00e4tte": {
+                    "account_number": "6090"
+                }
+            },
+            "Soziale Abgaben und Aufwendungen f.  Altersvers. und f. Unterst\u00fctzung (Gruppe)": {
+                "is_group": 1,
+                "Soziale Abgaben und Aufwendungen f.  Altersvers. und f. Unterst\u00fctzung": {
+                    "account_number": "6100",
+                    "account_type": "Expense Account"
+                },
+                "Gesetzliche soziale Aufwendungen": {
+                    "account_number": "6110",
+                    "account_type": "Expense Account"
+                },
+                "Beitr\u00e4ge zur Berufsgenossenschaft": {
+                    "account_number": "6120",
+                    "account_type": "Expense Account"
+                },
+                "Freiwillige soziale Aufwendungen lohnsteuerfrei": {
+                    "account_number": "6130"
+                },
+                "Aufwendungen f. Altersvers.": {
+                    "account_number": "6150"
+                },
+                "Aufwendungen f. Unterst\u00fctzung": {
+                    "account_number": "6160"
+                },
+                "Sonstige soziale Abgaben": {
+                    "account_number": "6170"
+                }
+            },
+            "Abschreibungen auf Sachanlagen (Gruppe)": {
+                "is_group": 1,
+                "Abschreibungen auf Sachanlagen (ohne AfA auf Kfz und Geb\u00e4ude)": {
+                    "account_number": "6220",
+                    "account_type": "Depreciation"
+                },
+                "Abschreibungen auf Geb\u00e4ude": {
+                    "account_number": "6221",
+                    "account_type": "Depreciation"
+                },
+                "Abschreibungen auf Kfz": {
+                    "account_number": "6222",
+                    "account_type": "Depreciation"
+                },
+                "Abschreibungen auf Geb\u00e4udeanteil des h\u00e4uslichen Arbeitszimmers": {
+                    "account_number": "6223"
+                }
+            },
+            "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf Sachanlagen (Gruppe)": {
+                "is_group": 1,
+                "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf Sachanlagen": {
+                    "account_number": "6230"
+                },
+                "Absetzung f. au\u00dfergew\u00f6hnliche technische und wirtschaftliche Abnutzung der Geb\u00e4ude": {
+                    "account_number": "6231"
+                },
+                "Absetzung f. au\u00dfergew\u00f6hnliche technische und wirtschaftliche Abnutzung des Kfz": {
+                    "account_number": "6232"
+                },
+                "Absetzung f. au\u00dfergew\u00f6hnliche technische und wirtschaftliche Abnutzung sonstiger Wirtschaftsg\u00fcter": {
+                    "account_number": "6233"
+                }
+            },
+            "Abschreibungen auf Sachanlagen auf Grund steuerlicher Sondervorschriften (Gruppe)": {
+                "is_group": 1,
+                "Abschreibungen auf Sachanlagen auf Grund steuerlicher Sondervorschriften": {
+                    "account_number": "6240"
+                },
+                "Sonderabschreibungen nach \u00a7 7g Abs. 1 und 2 EStG a. F./\u00a7 7g Abs. 5 EStG n. F.(ohne Kfz)": {
+                    "account_number": "6241"
+                },
+                "Sonderabschreibungen nach \u00a7 7g Abs. 1 und 2 EStG a. F./\u00a7 7g Abs. 5 EStG n. F.(f. Kfz)": {
+                    "account_number": "6242"
+                },
+                "K\u00fcrzung der Anschaffungs- oder Herstellungskosten gem\u00e4\u00df \u00a7 7g Abs. 2 EStG n.F. (ohne Kfz)": {
+                    "account_number": "6243"
+                },
+                "K\u00fcrzung der Anschaffungs- oder Herstellungskosten gem\u00e4\u00df \u00a7 7g Abs. 2 EStG n.F. (f. Kfz)": {
+                    "account_number": "6244"
+                }
+            },
+            "Kaufleasing": {
+                "account_number": "6250"
+            },
+            "Sofortabschreibung geringwertiger Wirtschaftsg\u00fcter": {
+                "account_number": "6260",
+                "account_type": "Depreciation"
+            },
+            "Abschreibungen auf aktivierte, geringwertige Wirtschaftsg\u00fcter": {
+                "account_number": "6262"
+            },
+            "Abschreibungen auf den Sammelposten Wirtschaftsg\u00fcter": {
+                "account_number": "6264"
+            },
+            "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf aktivierte, geringwertige Wirtschaftsg\u00fcter": {
+                "account_number": "6266"
+            },
+            "Abschreibungen auf Aufwendungen f. die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {
+                "account_number": "6268"
+            },
+            "Abschreibungen auf immaterielle VG (Gruppe)": {
+                "is_group": 1,
+                "Abschreibungen auf immaterielle VG": {
+                    "account_number": "6200",
+                    "account_type": "Depreciation"
+                },
+                "Abschreibungen auf selbst geschaffene immaterielle VG": {
+                    "account_number": "6201"
+                },
+                "Abschreibungen auf den Gesch\u00e4fts- oder Firmenwert": {
+                    "account_number": "6205"
+                },
+                "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf den Gesch\u00e4fts- oder Firmenwert": {
+                    "account_number": "6209"
+                },
+                "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf immaterielle VG": {
+                    "account_number": "6210"
+                },
+                "Au\u00dferplanm\u00e4\u00dfige Abschreibungen auf selbst geschaffene immaterielle VG": {
+                    "account_number": "6211"
+                },
+                "Abschreibungen auf Forderungen gg. Kapitalges., an denen eine Beteiligung besteht (soweit un\u00fcblich hoch)": {
+                    "account_number": "6290"
+                }
+            },
+            "Abschreibungen auf sonstige VG des Umlaufverm. (soweit un\u00fcbliche H\u00f6he) (Gruppe)": {
+                "is_group": 1,
+                "Abschreibungen auf sonstige VG des Umlaufverm. (soweit un\u00fcbliche H\u00f6he)": {
+                    "account_number": "6270"
+                },
+                "Abschreibungen auf Umlaufverm\u00f6gen, steuerrechtlich bedingt (soweit un\u00fcbliche H\u00f6he)": {
+                    "account_number": "6272"
+                },
+                "Abschreibungen auf Roh-, Hilfs- und Betriebsstoffe/Waren (soweit un\u00fcblich hoch)": {
+                    "account_number": "6278"
+                },
+                "Abschreibungen auf fertige und unfertige Erzeugnisse (soweit un\u00fcblich hoch)": {
+                    "account_number": "6279"
+                },
+                "Forderungsverluste, un\u00fcblich hoch (Gruppe)": {
+                    "is_group": 1,
+                    "Forderungsverluste, un\u00fcblich hoch": {
+                        "account_number": "6280"
+                    },
+                    "Forderungsverluste 7% USt (soweit un\u00fcblich hoch)": {
+                        "account_number": "6281"
+                    },
+                    "Forderungsverluste 16% USt (soweit un\u00fcblich hoch)": {
+                        "account_number": "6285"
+                    },
+                    "Forderungsverluste 19% USt (soweit un\u00fcblich hoch)": {
+                        "account_number": "6286"
+                    },
+                    "Forderungsverluste 15% USt (soweit un\u00fcblich hoch)": {
+                        "account_number": "6287"
+                    }
+                }
+            }
+        },
+        "4 - Vertriebskosten": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "Personalaufwand (Vertrieb)": {
+                "is_group": 1
+            }
+        },
+        "5 - allgemeine Verwaltungskosten": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "Verwaltungskosten": {
+                "account_number": "6992",
+                "account_type": "Expenses Included In Valuation"
+            },
+            "Personalaufwand (Verwaltung)": {
+                "is_group": 1
+            }
+        },
+        "6 - sonstige betriebliche Ertr\u00e4ge": {
+            "root_type": "Income",
+            "is_group": 1,
+            "Andere aktivierte Eigenleistungen": {
+                "account_number": "4820"
+            },
+            "Aktivierte Eigenleistungen zur Erstellung von selbst geschaffenen immateriellen VGn": {
+                "account_number": "4825"
+            },
+            "Sonstige betriebliche Ertr\u00e4ge": {
+                "account_number": "4830"
+            },
+            "Sonstige betriebliche Ertr\u00e4ge von verbundenen Unternehmen": {
+                "account_number": "4832"
+            },
+            "Andere Nebenerl\u00f6se": {
+                "account_number": "4833"
+            },
+            "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig 16 % USt": {
+                "account_number": "4834"
+            },
+            "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig": {
+                "account_number": "4835"
+            },
+            "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig 19 % USt": {
+                "account_number": "4836"
+            },
+            "Sonstige Ertr\u00e4ge betriebsfremd und regelm\u00e4\u00dfig": {
+                "account_number": "4837"
+            },
+            "Erstattete Vorsteuer anderer L\u00e4nder": {
+                "account_number": "4838"
+            },
+            "Sonstige Ertr\u00e4ge unregelm\u00e4\u00dfig": {
+                "account_number": "4839"
+            },
+            "Ertr\u00e4ge aus Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {
+                "account_number": "4900"
+            },
+            "Ertr\u00e4ge aus der Ver\u00e4u\u00dferung von Anteilen an Kap.Ges. (Finanzanlageverm., inl\u00e4nd. Kap.Ges.)": {
+                "account_number": "4901"
+            },
+            "Ertr\u00e4ge aus Abgang von Gegenst\u00e4nden des Umlaufverm. (au\u00dfer Vorr\u00e4te)": {
+                "account_number": "4905"
+            },
+            "Ertr\u00e4ge aus Abgang von Gegenst\u00e4nden des Umlaufverm. (au\u00dfer Vorr\u00e4te, inl\u00e4nd. Kap.Ges.)": {
+                "account_number": "4906"
+            },
+            "Ertr\u00e4ge aus der W\u00e4hrungsumrechnung": {
+                "account_number": "4840"
+            },
+            "Sonstige Erl\u00f6se betrieblich und regelm\u00e4\u00dfig, steuerfrei \u00a7 4 Nr. 8 ff UStG": {
+                "account_number": "4841"
+            },
+            "Sonstige Erl\u00f6se betrieblich und regelm\u00e4\u00dfig, steuerfrei z. B. \u00a7 4 Nr. 2-7 UStG": {
+                "account_number": "4842"
+            },
+            "Ertr\u00e4ge aus Bewertung Finanzmittelfonds": {
+                "account_number": "4843"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchgewinn)": {
+                "account_number": "4844"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19 % USt (bei Buchgewinn)": {
+                "account_number": "4845"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchgewinn)": {
+                "account_number": "4848"
+            },
+            "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"
+                }
+            },
+            "Ertr\u00e4ge aus Zuschreibungen des Sachanlageverm\u00f6gens": {
+                "account_number": "4910",
+                "account_type": "Round Off"
+            },
+            "Ertr\u00e4ge aus Zuschreibungen des immateriellen Anlageverm\u00f6gens": {
+                "account_number": "4911"
+            },
+            "Ertr\u00e4ge aus Zuschreibungen des Finanzanlageverm\u00f6gens": {
+                "account_number": "4912"
+            },
+            "Ertr\u00e4ge aus Zuschreibungen des Finanzanlageverm\u00f6gens (inl\u00e4ndische Kap.Ges.)": {
+                "account_number": "4913"
+            },
+            "Ertr\u00e4ge aus Zuschreibungen \u00a7 3 Nr. 40 EStG/\u00a7 8b Abs. 2 KStG (inl\u00e4ndische Kap.Ges.)": {
+                "account_number": "4914"
+            },
+            "Ertr\u00e4ge aus Zuschreibungen des Umlaufverm. au\u00dfer Vorr\u00e4te": {
+                "account_number": "4915"
+            },
+            "Ertr\u00e4ge aus Zuschreibungen des Umlaufverm. (inl\u00e4ndische Kap.Ges.)": {
+                "account_number": "4916"
+            },
+            "Ertr\u00e4ge aus Herabsetzung der Pauschalwertberichtigung auf Forderungen": {
+                "account_number": "4920"
+            },
+            "Ertr\u00e4ge aus Herabsetzung der Einzelwertberichtigung auf Forderungen": {
+                "account_number": "4923"
+            },
+            "Ertr\u00e4ge aus abgeschriebenen Forderungen": {
+                "account_number": "4925"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung einer steuerlichen R\u00fccklage nach \u00a7 6b Abs. 3 EStG": {
+                "account_number": "4927"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung einer steuerlichen R\u00fccklage nach \u00a7 6b Abs. 10 EStG": {
+                "account_number": "4928"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung der R\u00fccklage f. Ersatzbeschaffung R 6.6 EStR": {
+                "account_number": "4929"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {
+                "account_number": "4930"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung einer steuerlichen R\u00fccklage (Existenzgr\u00fcnderr\u00fccklage)": {
+                "account_number": "4934"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung einer steuerlichen R\u00fccklage": {
+                "account_number": "4935"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung von steuerlichen R\u00fccklagen (Ansparabschreibungen)": {
+                "account_number": "4936"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung steuerrechtlicher Sonderabschreibungen": {
+                "account_number": "4937"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung einer steuerlichen R\u00fccklage nach \u00a7 4g EStG": {
+                "account_number": "4938"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung von steuerlichen R\u00fccklagen nach \u00a7 52 Abs. 16 EStG": {
+                "account_number": "4939"
+            },
+            "Verrechnete sonstige Sachbez\u00fcge (Gruppe)": {
+                "is_group": 1,
+                "Verrechnete sonstige Sachbez\u00fcge (keine Waren)": {
+                    "account_number": "4940"
+                },
+                "Sachbez\u00fcge 7 % USt (Waren)": {
+                    "account_number": "4941"
+                },
+                "Sachbez\u00fcge 19 % USt (Waren)": {
+                    "account_number": "4945"
+                },
+                "Verrechnete sonstige Sachbez\u00fcge": {
+                    "account_number": "4946"
+                },
+                "Verrechnete sonstige Sachbez\u00fcge aus Kfz-Gestellung 19% USt": {
+                    "account_number": "4947"
+                },
+                "Verrechnete sonstige Sachbez\u00fcge 19% USt": {
+                    "account_number": "4948"
+                },
+                "Verrechnete sonstige Sachbez\u00fcge ohne Umsatzsteuer": {
+                    "account_number": "4949"
+                }
+            },
+            "Periodenfremde Ertr\u00e4ge (soweit nicht au\u00dferordentlich)": {
+                "account_number": "4960"
+            },
+            "Versicherungsentsch\u00e4digungen und Schadenersatzleistungen": {
+                "account_number": "4970"
+            },
+            "Erstattungen Aufwendungsausgleichsgesetz": {
+                "account_number": "4972"
+            },
+            "Investitionszusch\u00fcsse (steuerpflichtig)": {
+                "account_number": "4975"
+            },
+            "Investitionszulagen (steuerfrei)": {
+                "account_number": "4980"
+            },
+            "Steuerfreie Ertr\u00e4ge aus der Aufl\u00f6sung von steuerlichen R\u00fccklagen": {
+                "account_number": "4981"
+            },
+            "Sonstige steuerfreie Betriebseinnahmen": {
+                "account_number": "4982"
+            },
+            "Ertr\u00e4ge aus der Aktivierung unentgeltlich erworbener VG": {
+                "account_number": "4987"
+            },
+            "Kostenerstattungen, R\u00fcckverg\u00fctungen und Gutschriften f. fr\u00fchere Jahre": {
+                "account_number": "4989"
+            },
+            "Ertr\u00e4ge aus Verwaltungskostenumlagen": {
+                "account_number": "4992"
+            },
+            "Unentgeltliche Wertabgaben": {
+                "account_number": "4600"
+            },
+            "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 19 % USt (Gruppe)": {
+                "is_group": 1,
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 19 % USt": {
+                    "account_number": "4640"
+                },
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 19 % USt (Kfz-Nutzung)": {
+                    "account_number": "4645"
+                },
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 19 % USt (Telefon-Nutzung)": {
+                    "account_number": "4646"
+                }
+            },
+            "Unentgeltliche Erbringung einer sonstigen Leistung 7 % USt": {
+                "account_number": "4650"
+            },
+            "Unentgeltliche Erbringung einer sonstigen Leistung ohne USt": {
+                "account_number": "4659"
+            },
+            "Unentgeltliche Erbringung einer sonstigen Leistung 19 % USt": {
+                "account_number": "4660"
+            },
+            "Unentgeltliche Zuwendung von Waren 7 % USt": {
+                "account_number": "4670"
+            },
+            "Unentgeltliche Zuwendung von Waren ohne USt": {
+                "account_number": "4679"
+            },
+            "Unentgeltliche Zuwendung von Waren 19 % USt": {
+                "account_number": "4680"
+            },
+            "Unentgeltliche Zuwendung von Gegenst\u00e4nden 19 % USt": {
+                "account_number": "4686"
+            },
+            "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"
+                }
+            },
+            "Au\u00dferordentliche Ertr\u00e4ge (Gruppe)": {
+                "is_group": 1,
+                "Au\u00dferordentliche Ertr\u00e4ge": {
+                    "account_number": "7400"
+                },
+                "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 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"
+                    }
+                }
+            }
+        },
+        "7 - sonstige betriebliche Aufwendungen": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "Sonstige betriebliche Aufwendungen": {
+                "account_number": "6300"
+            },
+            "Interimskonto f. Aufw. in einem anderen Land (Vorst.verg. m\u00f6glich)": {
+                "account_number": "6302"
+            },
+            "Fremdleistungen/Fremdarbeiten": {
+                "account_number": "6303"
+            },
+            "Sonstige Aufwendungen betrieblich und regelm\u00e4\u00dfig": {
+                "account_number": "6304"
+            },
+            "Raumkosten": {
+                "account_number": "6305"
+            },
+            "Miete (unbewegliche Wirtschaftsg\u00fcter)": {
+                "account_number": "6310"
+            },
+            "Miete/Aufwendungen f. doppelte Haushaltsf\u00fchrung": {
+                "account_number": "6312"
+            },
+            "Pacht (unbewegliche Wirtschaftsg\u00fcter)": {
+                "account_number": "6315"
+            },
+            "Leasing (unbewegliche Wirtschaftsg\u00fcter)": {
+                "account_number": "6316"
+            },
+            "Aufwendungen f. gemietete oder gepachtete unbewegliche Wirtschaftsg., die GewSt hinzuzurechnen sind": {
+                "account_number": "6317"
+            },
+            "Miet- und Pachtnebenkosten (GewSt nicht zu ber\u00fccksichtigen)": {
+                "account_number": "6318"
+            },
+            "Heizung": {
+                "account_number": "6320"
+            },
+            "Gas, Strom, Wasser": {
+                "account_number": "6325"
+            },
+            "Reinigung": {
+                "account_number": "6330"
+            },
+            "Instandhaltung betrieblicher R\u00e4ume": {
+                "account_number": "6335"
+            },
+            "Abgaben f. betrieblich genutzten Grundbesitz": {
+                "account_number": "6340"
+            },
+            "Sonstige Raumkosten": {
+                "account_number": "6345"
+            },
+            "Aufwendungen f. ein h\u00e4usliches Arbeitszimmer (abziehbarer Anteil)": {
+                "account_number": "6348"
+            },
+            "Aufwendungen f. ein h\u00e4usliches Arbeitszimmer (nicht abziehbarer Anteil)": {
+                "account_number": "6349"
+            },
+            "Grundst\u00fccksaufwendungen betrieblich": {
+                "account_number": "6350"
+            },
+            "Grundst\u00fccksaufwendungen neutral": {
+                "account_number": "6352"
+            },
+            "Zuwendungen, Spenden (Gruppe)": {
+                "is_group": 1,
+                "Zuwendungen, Spenden, steuerlich nicht abziehbar": {
+                    "account_number": "6390"
+                },
+                "Zuwendungen, Spenden f. wissenschaftliche und kulturelle Zwecke": {
+                    "account_number": "6391"
+                },
+                "Zuwendungen, Spenden f. mildt\u00e4tige Zwecke": {
+                    "account_number": "6392"
+                },
+                "Zuwendungen, Spenden f. kirchliche, religi\u00f6se und gemeinn\u00fctzige Zwecke": {
+                    "account_number": "6393"
+                },
+                "Zuwendungen, Spenden an politische Parteien": {
+                    "account_number": "6394"
+                },
+                "Zuwendungen, Spenden an Stiftungen f. gemeinn\u00fctzige Zwecke i. S. d. \u00a7 52 Abs. 2 Nr. 1-3 AO": {
+                    "account_number": "6395"
+                },
+                "Zuwendungen, Spenden an Stiftungen f. gemeinn\u00fctzige Zwecke i. S. d. \u00a7 52 Abs. 2 Nr. 4 AO": {
+                    "account_number": "6396"
+                },
+                "Zuwendungen, Spenden an Stiftungen f. kirchliche, religi\u00f6se und gemeinn\u00fctzige Zwecke": {
+                    "account_number": "6397"
+                },
+                "Zuwendungen, Spenden an Stiftungen f.wissenschaftliche, mildt\u00e4tige und kulturelle Zwecke": {
+                    "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"
+                }
+            },
+            "Fahrzeugkosten (Gruppe)": {
+                "is_group": 1,
+                "Fahrzeugkosten": {
+                    "account_number": "6500"
+                },
+                "Kfz-Versicherungen (Gruppe)": {
+                    "is_group": 1,
+                    "Kfz-Versicherungen": {
+                        "account_number": "6520"
+                    }
+                },
+                "Laufende Kfz-Betriebskosten (Gruppe)": {
+                    "is_group": 1,
+                    "Laufende Kfz-Betriebskosten": {
+                        "account_number": "6530"
+                    }
+                },
+                "Kfz-Reparaturen (Gruppe)": {
+                    "is_group": 1,
+                    "Kfz-Reparaturen": {
+                        "account_number": "6540"
+                    }
+                },
+                "Garagenmiete (Gruppe)": {
+                    "is_group": 1,
+                    "Garagenmiete": {
+                        "account_number": "6550"
+                    }
+                },
+                "Mietleasing Kfz (Gruppe)": {
+                    "is_group": 1,
+                    "Mietleasing Kfz": {
+                        "account_number": "6560"
+                    }
+                },
+                "Sonstige Kfz-Kosten (Gruppe)": {
+                    "is_group": 1,
+                    "Sonstige Kfz-Kosten": {
+                        "account_number": "6570"
+                    }
+                },
+                "Mautgeb\u00fchren (Gruppe)": {
+                    "is_group": 1,
+                    "Mautgeb\u00fchren": {
+                        "account_number": "6580"
+                    }
+                },
+                "Kfz-Kosten f. betrieblich genutzte zum Privatverm\u00f6gen geh\u00f6rende Kraftfahrzeuge": {
+                    "account_number": "6590"
+                },
+                "Fremdfahrzeugkosten": {
+                    "account_number": "6595"
+                }
+            },
+            "Werbekosten (Gruppe)": {
+                "is_group": 1,
+                "Werbekosten": {
+                    "account_number": "6600"
+                },
+                "Streuartikel": {
+                    "account_number": "6605"
+                },
+                "Geschenke abzugsf\u00e4hig ohne \u00a7 37b EStG": {
+                    "account_number": "6610"
+                },
+                "Geschenke abzugsf\u00e4hig mit \u00a7 37b EStG": {
+                    "account_number": "6611"
+                },
+                "Pauschale Steuern f. Geschenke und Zugaben abzugsf\u00e4hig": {
+                    "account_number": "6612"
+                },
+                "Geschenke nicht abzugsf\u00e4hig ohne \u00a7 37b EStG": {
+                    "account_number": "6620"
+                },
+                "Geschenke nicht abzugsf\u00e4hig mit \u00a7 37b EStG": {
+                    "account_number": "6621"
+                },
+                "Pauschale Steuern f. Geschenke und Zuwendungen nicht abzugsf\u00e4hig": {
+                    "account_number": "6622"
+                },
+                "Geschenke ausschlie\u00dflich betrieblich genutzt": {
+                    "account_number": "6625"
+                },
+                "Zugaben mit \u00a7 37b EStG": {
+                    "account_number": "6629"
+                },
+                "Repr\u00e4sentationskosten": {
+                    "account_number": "6630"
+                },
+                "Bewirtungskosten": {
+                    "account_number": "6640"
+                },
+                "Sonstige eingeschr\u00e4nkt abziehbare Betriebsausgaben (abziehbarer Anteil)": {
+                    "account_number": "6641"
+                },
+                "Sonstige eingeschr\u00e4nkt abziehbare Betriebsausgaben (nicht abziehbarer Anteil)": {
+                    "account_number": "6642"
+                },
+                "Aufmerksamkeiten": {
+                    "account_number": "6643"
+                },
+                "Nicht abzugsf\u00e4hige Bewirtungskosten": {
+                    "account_number": "6644"
+                },
+                "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 Unternehmer (Gruppe)": {
+                    "is_group": 1,
+                    "Reisekosten Unternehmer": {
+                        "account_number": "6670"
+                    },
+                    "Reisekosten Unternehmer (nicht abziehbarer Anteil)": {
+                        "account_number": "6672"
+                    },
+                    "Reisekosten Unternehmer Fahrtkosten": {
+                        "account_number": "6673"
+                    },
+                    "Reisekosten Unternehmer Verpflegungsmehraufwand": {
+                        "account_number": "6674"
+                    },
+                    "Reisekosten Unternehmer \u00dcbernachtungsaufwand": {
+                        "account_number": "6680"
+                    }
+                },
+                "Fahrten zwischen Wohnung und Betriebsst\u00e4tte und Familienheimfahrten (abziehbarer Anteil)": {
+                    "account_number": "6688"
+                },
+                "Fahrten zwischen Wohnung und Betriebsst\u00e4tte und Familienheimfahrten (nicht abziehbarer Anteil)": {
+                    "account_number": "6689"
+                },
+                "Fahrten zwischen Wohnung und Betriebsst\u00e4tte und Familienheimfahrten (Haben)": {
+                    "account_number": "6690"
+                },
+                "Verpflegungsmehraufwendungen i. R. d. doppelten Haushaltsf\u00fchrung (abziehbarer Anteil)": {
+                    "account_number": "6691"
+                }
+            },
+            "Kosten Warenabgabe (Gruppe)": {
+                "is_group": 1,
+                "Kosten Warenabgabe": {
+                    "account_number": "6700"
+                },
+                "Verpackungsmaterial": {
+                    "account_number": "6710"
+                },
+                "Ausgangsfrachten": {
+                    "account_number": "6740"
+                },
+                "Transportversicherungen": {
+                    "account_number": "6760"
+                },
+                "Verkaufsprovisionen": {
+                    "account_number": "6770"
+                },
+                "Fremdarbeiten (Vertrieb)": {
+                    "account_number": "6780"
+                },
+                "Aufwand f. Gew\u00e4hrleistungen": {
+                    "account_number": "6790"
+                }
+            },
+            "Porto": {
+                "account_number": "6800"
+            },
+            "Telefon": {
+                "account_number": "6805"
+            },
+            "Telefax und Internetkosten": {
+                "account_number": "6810"
+            },
+            "B\u00fcrobedarf": {
+                "account_number": "6815"
+            },
+            "Zeitschriften, B\u00fccher": {
+                "account_number": "6820"
+            },
+            "Fortbildungskosten": {
+                "account_number": "6821"
+            },
+            "Freiwillige Sozialleistungen": {
+                "account_number": "6822"
+            },
+            "Rechts- und Beratungskosten": {
+                "account_number": "6825"
+            },
+            "Abschluss- und Pr\u00fcfungskosten": {
+                "account_number": "6827"
+            },
+            "Buchf\u00fchrungskosten": {
+                "account_number": "6830"
+            },
+            "Mieten f. Einrichtungen (bewegliche Wirtschaftsg\u00fcter)": {
+                "account_number": "6835"
+            },
+            "Pacht (bewegliche Wirtschaftsg\u00fcter)": {
+                "account_number": "6836"
+            },
+            "Aufwendungen f. die zeitlich befristete \u00dcberlassung von Rechten (Lizenzen, Konzessionen)": {
+                "account_number": "6837"
+            },
+            "Aufwendungen f. gemietete oder gepachtete bewegliche Wirtschaftsg., die gewerbest. hinzuzurechnen sind": {
+                "account_number": "6838"
+            },
+            "Werkzeuge und Kleinger\u00e4te": {
+                "account_number": "6845"
+            },
+            "Betriebsbedarf": {
+                "account_number": "6850"
+            },
+            "Nebenkosten des Geldverkehrs": {
+                "account_number": "6855"
+            },
+            "Aufwendungen aus Anteilen an inl\u00e4ndischen Kap.Ges.": {
+                "account_number": "6856"
+            },
+            "Ver\u00e4u\u00dferungskosten \u00a7 3 Nr. 40 EStG/\u00a7 8b Abs. 2 KStG (inl. Kap.Ges.)": {
+                "account_number": "6857"
+            },
+            "Aufwendungen f. Abraum- und Abfallbeseitigung": {
+                "account_number": "6859"
+            },
+            "Nicht abziehbare Vorsteuer 19 %": {
+                "account_number": "6871"
+            },
+            "Aufwendungen aus der W\u00e4hrungsumrechnung": {
+                "account_number": "6880"
+            },
+            "Aufwendungen aus Bewertung Finanzmittelfonds": {
+                "account_number": "6883"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchverlust)": {
+                "account_number": "6884"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19 % USt (bei Buchverlust)": {
+                "account_number": "6885"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchverlust)": {
+                "account_number": "6888"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchverlust)": {
+                "account_number": "6889"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchverlust)": {
+                "account_number": "6890"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchverlust)": {
+                "account_number": "6891"
+            },
+            "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (inl. Kap.Ges., bei Buchverlust)": {
+                "account_number": "6892"
+            },
+            "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchverlust)": {
+                "account_number": "6895"
+            },
+            "Anlagenabg\u00e4nge immaterielle VG (Restbuchwert bei Buchverlust)": {
+                "account_number": "6896"
+            },
+            "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchverlust)": {
+                "account_number": "6897"
+            },
+            "Anlagenabg\u00e4nge Finanzanlagen (inl. Kap.Ges., Restbuchwert bei Buchverlust)": {
+                "account_number": "6898"
+            },
+            "Verluste aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {
+                "account_number": "6900"
+            },
+            "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kap.Ges. (Finanzanlageverm\u00f6gen, inl. Kap.Ges.)": {
+                "account_number": "6903"
+            },
+            "Verluste aus dem Abgang von Ggenst\u00e4nden des Umlaufverm. (au\u00dfer Vorr\u00e4te)": {
+                "account_number": "6905"
+            },
+            "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm. (au\u00dfer Vorr\u00e4te, inl. Kap.Ges.)": {
+                "account_number": "6906"
+            },
+            "Abschreibungen auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapiere (\u00fcbliche H\u00f6he)": {
+                "account_number": "6910",
+                "account_type": "Round Off"
+            },
+            "Abschreibungen auf Umlaufverm\u00f6gen, steuerrechtlich bedingt (\u00fcbliche H\u00f6he)": {
+                "account_number": "6912"
+            },
+            "Einstellung in die Pauschalwertberichtigung auf Forderungen": {
+                "account_number": "6920"
+            },
+            "Einstellungen in die steuerliche R\u00fccklage nach \u00a7 6b Abs. 3 EStG": {
+                "account_number": "6922"
+            },
+            "Einstellung in die Einzelwertberichtigung auf Forderungen": {
+                "account_number": "6923"
+            },
+            "Einstellungen in die steuerliche R\u00fccklage nach \u00a7 6b Abs. 10 EStG": {
+                "account_number": "6924"
+            },
+            "Einstellungen in steuerliche R\u00fccklagen": {
+                "account_number": "6927"
+            },
+            "Einstellungen in die R\u00fccklage f. Ersatzbeschaffung nach R 6.6 EStR": {
+                "account_number": "6928"
+            },
+            "Einstellungen in die steuerliche R\u00fccklage nach \u00a7 4g EStG": {
+                "account_number": "6929"
+            },
+            "Forderungsverluste (\u00fcbliche H\u00f6he) (Gruppe)": {
+                "is_group": 1,
+                "Forderungsverluste (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6930"
+                },
+                "Forderungsverluste 7 % USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6931"
+                },
+                "Forderungsverluste aus steuerfreien EU-Lieferungen (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6932"
+                },
+                "Forderungsverluste aus im Inland steuerpfl. EU-Lieferungen 7 % USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6933"
+                },
+                "Forderungsverluste aus im Inland steuerpfl. EU-Lieferungen 16 % USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6934"
+                },
+                "Forderungsverluste 16% USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6935"
+                },
+                "Forderungsverluste 19 % USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6936"
+                },
+                "Forderungsverluste 15% USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6937"
+                },
+                "Forderungsverluste aus im Inland steuerpfl. EU-Lieferungen 19 % USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6938"
+                },
+                "Forderungsverluste aus im Inland steuerpfl. EU-Lieferungen 15% USt (\u00fcbliche H\u00f6he)": {
+                    "account_number": "6939"
+                }
+            },
+            "Periodenfremde Aufwendungen (soweit nicht au\u00dferordentlich)": {
+                "account_number": "6960"
+            },
+            "Sonstige Aufwendungen betriebsfremd und regelm\u00e4\u00dfig": {
+                "account_number": "6967"
+            },
+            "Sonstige Aufwendungen unregelm\u00e4\u00dfig": {
+                "account_number": "6969"
+            },
+            "Au\u00dferordentliche Aufwendungen (Gruppe)": {
+                "is_group": 1,
+                "Au\u00dferordentliche Aufwendungen": {
+                    "account_number": "7500"
+                },
+                "Au\u00dferordentliche Aufwendungen finanzwirksam": {
+                    "account_number": "7501"
+                },
+                "Au\u00dferordentliche Aufwendungen nicht finanzwirksam": {
+                    "account_number": "7550"
+                },
+                "Verluste durch Verschmelzung und Umwandlung": {
+                    "account_number": "7551"
+                },
+                "Verluste durch au\u00dfergew\u00f6hnliche Schadensf\u00e4lle": {
+                    "account_number": "7552"
+                },
+                "Aufwendungen f. Restrukturierungs- und Sanierungsma\u00dfnahmen": {
+                    "account_number": "7553"
+                },
+                "Verluste aus Gesch\u00e4ftsaufgabe oder -ver\u00e4u\u00dferung nach Steuern": {
+                    "account_number": "7554"
+                },
+                "Au\u00dferordentliche Aufwendungen aus der Anwendung von \u00dcbergangsvorschriften (Gruppe)": {
+                    "is_group": 1,
+                    "Au\u00dferordentliche Aufwendungen aus der Anwendung von \u00dcbergangsvorschriften": {
+                        "account_number": "7560"
+                    },
+                    "Au\u00dferordentliche Aufwendungen aus der Anwendung von \u00dcbergangsvorschriften (Pensionsr\u00fcckst.)": {
+                        "account_number": "7561"
+                    },
+                    "Au\u00dferordentliche Aufwendungen aus der Anwendung von \u00dcbergangsvorschriften (Bilanzierungshilfen)": {
+                        "account_number": "7562"
+                    },
+                    "Au\u00dferordentliche Aufwendungen aus der Anwendung von \u00dcbergangsvorschriften (Latente Steuern)": {
+                        "account_number": "7563"
+                    }
+                }
+            }
+        },
+        "8 - Ertr\u00e4ge aus Beteiligungen": {
+            "root_type": "Income",
+            "is_group": 1,
+            "Ertr\u00e4ge aus Beteiligungen": {
+                "account_number": "7000",
+                "account_type": "Income Account"
+            },
+            "Ertr\u00e4ge aus Beteiligungen an Personengesellschaften (verb. Unternehmen), \u00a7 9 GewStG": {
+                "account_number": "7004"
+            },
+            "Ertr\u00e4ge aus Anteilen an Kap.Ges. (inl\u00e4ndische Beteiligung)": {
+                "account_number": "7005"
+            },
+            "Ertr\u00e4ge aus Anteilen an Kap.Ges. (inl\u00e4ndische verb. Unternehmen)": {
+                "account_number": "7006"
+            },
+            "Sonstige GewSt-freie Gewinne aus Anteilen an einer Kap.Ges. (K\u00fcrzung gem. \u00a7 9 Nr. 2a GewStG)": {
+                "account_number": "7007"
+            },
+            "Gewinnanteile aus Mitunternehmerschaften \u00a7 9 GewStG": {
+                "account_number": "7008"
+            },
+            "Ertr\u00e4ge aus Beteiligungen an verbundenen Unternehmen": {
+                "account_number": "7009"
+            },
+            "Zins- und Dividendenertr\u00e4ge": {
+                "account_number": "7020"
+            },
+            "Erhaltene Ausgleichszahlungen (als au\u00dfenstehender Aktion\u00e4r)": {
+                "account_number": "7030"
+            }
+        },
+        "9 - Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {
+            "root_type": "Income",
+            "is_group": 1,
+            "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {
+                "account_number": "7010",
+                "account_type": "Income Account"
+            },
+            "Ertr\u00e4ge aus Ausleihungen des Finanzanlageverm\u00f6gens": {
+                "account_number": "7011"
+            },
+            "Ertr\u00e4ge aus Ausleihungen des Finanzanlageverm\u00f6gens an verbundenen Unternehmen": {
+                "account_number": "7012"
+            },
+            "Ertr\u00e4ge aus Anteilen an Personengesellschaften (Finanzanlageverm\u00f6gen)": {
+                "account_number": "7013"
+            },
+            "Ertr\u00e4ge aus Anteilen an Kap.Ges. (Finanzanlageverm\u00f6gen, inl\u00e4ndische Kap.Ges.)": {
+                "account_number": "7014"
+            },
+            "Ertr\u00e4ge aus Anteilen an Personengesellschaften (verb. Unternehmen)": {
+                "account_number": "7016"
+            },
+            "Ertr\u00e4ge aus anderen Wertpapieren des Finanzanlageverm. an Kap.Ges. (verb. Unternehmen)": {
+                "account_number": "7017"
+            },
+            "Ertr\u00e4ge aus anderen Wertpapieren des Finanzanlageverm. an Pers.Ges. (verb. Unternehmen)": {
+                "account_number": "7018"
+            },
+            "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm. aus verbundenen Unternehmen": {
+                "account_number": "7019"
+            }
+        },
+        "10 - sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
+            "root_type": "Income",
+            "is_group": 1,
+            "davon aus verbundenen Unternehmen": {
+                "is_group": 1,
+                "Diskontertr\u00e4ge aus verbundenen Unternehmen": {
+                    "account_number": "7139"
+                },
+                "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {
+                    "account_number": "7109"
+                },
+                "Sonstige Zinsertr\u00e4ge aus verbundenen Unternehmen": {
+                    "account_number": "7119",
+                    "account_type": "Income Account"
+                },
+                "Zins\u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {
+                    "account_number": "7129"
+                }
+            },
+            "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
+                "account_number": "7100",
+                "account_type": "Income Account"
+            },
+            "Ertr\u00e4ge aus Anteilen an Kap.Ges. (Umlaufverm\u00f6gen, inl\u00e4ndische Kap.Ges.)": {
+                "account_number": "7103"
+            },
+            "Zinsertr\u00e4ge \u00a7 233a AO steuerpflichtig": {
+                "account_number": "7105"
+            },
+            "Zinsertr\u00e4ge \u00a7 233a AO, \u00a7 4 Abs. 5b EStG, steuerfrei": {
+                "account_number": "7107"
+            },
+            "Sonstige Zinsertr\u00e4ge": {
+                "account_number": "7110"
+            },
+            "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Umlaufverm.": {
+                "account_number": "7115"
+            },
+            "Zins\u00e4hnliche Ertr\u00e4ge": {
+                "account_number": "7120"
+            },
+            "Diskontertr\u00e4ge": {
+                "account_number": "7130"
+            },
+            "Zinsertr\u00e4ge aus der Abzinsung von Verb.": {
+                "account_number": "7141"
+            },
+            "Zinsertr\u00e4ge aus der Abzinsung von R\u00fcckstellungen": {
+                "account_number": "7142"
+            },
+            "Zinsertr\u00e4ge aus der Abzinsung von Pensionsr\u00fcckst. und \u00e4hnl./vergleichb. Verplicht.": {
+                "account_number": "7143"
+            },
+            "Zinsertr\u00e4ge aus der Abzinsung von Pensionsr\u00fcckst. und \u00e4hnl. Verplicht. zur Verrechnung": {
+                "account_number": "7144"
+            },
+            "Erhaltene Gewinne auf Grund einer Gewinngemeinschaft": {
+                "account_number": "7192"
+            },
+            "Erhaltene Gewinne auf Grund einer Gewinn- oder Teilgewinnabf\u00fchrungsvertrags": {
+                "account_number": "7194"
+            }
+        },
+        "11 - Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufverm.": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "Abschreibungen auf Finanzanlagen (dauerhaft)": {
+                "account_number": "7200",
+                "account_type": "Depreciation"
+            },
+            "Abschreibungen auf Finanzanlagen (nicht dauerhaft)": {
+                "account_number": "7201"
+            },
+            "Abschreibungen auf Finanzanlagen \u00a7 3 Nr. 40 EStG / \u00a7 8b Abs. 3 KStG (inl. Kap.Ges., dauerh.)": {
+                "account_number": "7204"
+            },
+            "Abschreibungen auf Finanzanlagen - verb. Unternehmen": {
+                "account_number": "7207"
+            },
+            "Aufwendungen auf Grund von Verlustanteilen an Mitunternehmerschaften \u00a7 8 GewStG": {
+                "account_number": "7208"
+            },
+            "Abschreibungen auf Wertpapiere des Umlaufverm. (Gruppe)": {
+                "is_group": 1,
+                "Abschreibungen auf Wertpapiere des Umlaufverm.": {
+                    "account_number": "7210"
+                },
+                "Abschreibungen auf Wertpapiere des Umlaufverm. \u00a73Nr.40EStG/\u00a78bAbs.3KStG (inl. Kap.Ges.)": {
+                    "account_number": "7214"
+                },
+                "Abschreibungen auf Wertpapiere des Umlaufverm. - verb. Unternehmen": {
+                    "account_number": "7217"
+                }
+            },
+            "Abschreibungen auf Finanzanlagen auf Grund \u00a7 6b EStG-R\u00fccklage": {
+                "account_number": "7250"
+            },
+            "Abschreibungen auf Finanzanlagen auf Grund \u00a7 3Nr.40EStG/\u00a78bAbs.3KStG (inl. Kap.Ges.)": {
+                "account_number": "7255"
+            }
+        },
+        "12- Zinsen und \u00e4hnliche Aufwendungen": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "davon an verb. Unternehmen": {
+                "is_group": 1,
+                "Zinsen und \u00e4hnliche Aufwendungen an verb. Unternehmen (inl. Kap.Ges.)": {
+                    "account_number": "7351"
+                },
+                "Zinsen und \u00e4hnliche Aufwendungen an verb. Unternehmen": {
+                    "account_number": "7309"
+                },
+                "Zinsaufwendungen f. kurzfistige Verb. an verb. Unternehmen": {
+                    "account_number": "7319"
+                },
+                "Zinsaufwendungen f. langfristigeVerb. an verb. Unternehmen": {
+                    "account_number": "7329"
+                },
+                "Diskontaufwendungen an verb. Unternehmen": {
+                    "account_number": "7349"
+                }
+            },
+            "Zinsen und \u00e4hnliche Aufwendungen": {
+                "account_number": "7300"
+            },
+            "Steuerlich nicht abzugsf\u00e4hige andere Nebenleistungen zu Steuern \u00a7 4 Abs. 5b EStG": {
+                "account_number": "7302"
+            },
+            "Steuerlich abzugsf\u00e4hige, andere Nebenleistungen zu Steuern": {
+                "account_number": "7303"
+            },
+            "Steuerlich nicht abzugsf\u00e4hige, andere Nebenleistungen zu Steuern": {
+                "account_number": "7304"
+            },
+            "Zinsaufwendungen \u00a7 233a AO betriebliche Steuern": {
+                "account_number": "7305"
+            },
+            "Zinsaufwendungen \u00a7\u00a7 233a bis 237 AO Personensteuern": {
+                "account_number": "7306"
+            },
+            "Zinsaufwendungen \u00a7 233a AO, \u00a7 4 Abs. 5b EStG": {
+                "account_number": "7308"
+            },
+            "Zinsaufwendungen f. kurzfristige Verb.": {
+                "account_number": "7310"
+            },
+            "Nicht abzugsf\u00e4hige Schuldzinsen gem\u00e4\u00df \u00a7 4 Abs. 4a EStG (Hinzurechnungsbetrag)": {
+                "account_number": "7313"
+            },
+            "Zinsen auf Kontokorrentkonten": {
+                "account_number": "7318"
+            },
+            "Zinsaufwendungen f. langfristige Verb.": {
+                "account_number": "7320"
+            },
+            "Abschreibungen auf Disagio/Damnum zur Finanzierung": {
+                "account_number": "7323"
+            },
+            "Abschreibungen auf Disagio/Damnum zur Finanzierung des Anlageverm\u00f6gens": {
+                "account_number": "7324"
+            },
+            "Zinsaufwendungen f. Geb\u00e4ude, die zum Betriebsverm\u00f6gen geh\u00f6ren": {
+                "account_number": "7325"
+            },
+            "Zinsen zur Finanzierung des Anlageverm\u00f6gens": {
+                "account_number": "7326"
+            },
+            "Renten und dauernde Lasten": {
+                "account_number": "7327"
+            },
+            "Zins\u00e4hnliche Aufwendungen": {
+                "account_number": "7330"
+            },
+            "Diskontaufwendungen": {
+                "account_number": "7340"
+            },
+            "Zinsen und \u00e4hnl. Aufwendungen \u00a7\u00a73Nr.40,3cEStG/\u00a78bAbs.1KStG (inl. Kap.Ges.)": {
+                "account_number": "7350"
+            },
+            "Kreditprovisionen und Verwaltungskostenbeitr\u00e4ge": {
+                "account_number": "7355"
+            },
+            "Zinsanteil der Zuf\u00fchrungen zu Pensionsr\u00fcckst.": {
+                "account_number": "7360"
+            },
+            "Zinsaufwendungen aus der Abzinsung von Verb.": {
+                "account_number": "7361"
+            },
+            "Zinsaufwendungen aus der Abzinsung von R\u00fcckstellungen": {
+                "account_number": "7362"
+            },
+            "Zinsaufwendungen aus der Abzinsung von Pensionsr\u00fcckst. und \u00e4hnl. Verplicht.": {
+                "account_number": "7363"
+            },
+            "Zinsaufwendungen aus der Abzinsung von Pensionsr\u00fcckst. und \u00e4hnl. Verplicht. zur Verrechnung": {
+                "account_number": "7364"
+            },
+            "Aufwendungen aus Verlust\u00fcbernahme": {
+                "account_number": "7390"
+            }
+        },
+        "13 - Steuern vom Einkommen und vom Ertrag": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "K\u00f6rperschaftsteuer": {
+                "account_number": "7600",
+                "account_type": "Tax"
+            },
+            "Gewerbesteuer": {
+                "account_number": "7610",
+                "account_type": "Tax"
+            },
+            "Kapitalertragsteuer 25 %": {
+                "account_number": "7630"
+            },
+            "Anrechenbarer Solidarit\u00e4tszuschlag auf Kapitalertragsteuer 25 %": {
+                "account_number": "7633"
+            },
+            "Anzurechnende ausl\u00e4ndische Quellensteuer": {
+                "account_number": "7639"
+            },
+            "Gewerbesteuernachzahlungen Vorjahre": {
+                "account_number": "7640"
+            },
+            "Gewerbesteuernachzahlungen und Gewerbesteuererstattungen f. Vorjahre, \u00a7 4 Abs. 5b EStG": {
+                "account_number": "7641"
+            },
+            "Gewerbesteuererstattungen Vorjahre": {
+                "account_number": "7642"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung von Gewerbesteuerr\u00fcckstellungen, \u00a7 4 Abs. 5b EStG": {
+                "account_number": "7643"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung von Gewerbesteuerr\u00fcckstellungen": {
+                "account_number": "7644"
+            },
+            "Aufwendungen aus der Zuf\u00fchrung und Aufl\u00f6sung von latenten Steuern": {
+                "account_number": "7645"
+            },
+            "Ertr\u00e4ge aus der Zuf\u00fchrung und Aufl\u00f6sung von latenten Steuern": {
+                "account_number": "7649"
+            }
+        },
+        "15 - sonstige Steuern": {
+            "root_type": "Expense",
+            "is_group": 1,
+            "Verbrauchsteuer": {
+                "account_number": "7675"
+            },
+            "\u00d6kosteuer": {
+                "account_number": "7678"
+            },
+            "Grundsteuer": {
+                "account_number": "7680"
+            },
+            "Kfz-Steuer": {
+                "account_number": "7685"
+            },
+            "Steuernachzahlungen Vorjahre f. sonstige Steuern": {
+                "account_number": "7690"
+            },
+            "Steuererstattungen Vorjahre f. sonstige Steuern": {
+                "account_number": "7692"
+            },
+            "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen f. sonstige Steuern": {
+                "account_number": "7694"
+            }
+        },
+        "Debitoren": {
+            "root_type": "Asset",
+            "is_group": 1
+        },
+        "Kreditoren": {
+            "root_type": "Liability",
+            "is_group": 1,
+            "Wareneingangs-­Verrechnungskonto" : {
+                "account_number": "70001",
+                "account_type": "Stock Received But Not Billed"
+            }
+        }
+    }
+}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
index 37f57ec..d1a0def 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
@@ -38,24 +38,24 @@
                 "Kas": {
                     "Kas Mata Uang Lain": {
                         "Kas USD": {
-                            "account_number": "1112.0010", 
+                            "account_number": "1112.001", 
                             "account_type": "Cash"
                         }, 
                         "account_number": "1112.000"
                     }, 
                     "Kas Rupiah": {
                         "Kas Besar": {
-                            "account_number": "1111.0020", 
+                            "account_number": "1111.002", 
                             "account_type": "Cash"
                         }, 
                         "Kas Kecil": {
-                            "account_number": "1111.0010", 
+                            "account_number": "1111.001", 
                             "account_type": "Cash"
                         }, 
                         "account_number": "1111.000", 
                         "account_type": "Cash"
                     }, 
-                    "account_number": "1110.0000"
+                    "account_number": "1110.000"
                 }, 
                 "Pendapatan Yang Akan di Terima": {
                     "Pendapatan Yang di Terima": {
@@ -98,7 +98,7 @@
                     }, 
                     "account_number": "1130.000"
                 }, 
-                "account_number": "1100.0000"
+                "account_number": "1100.000"
             }, 
             "Aktiva Tetap": {
                 "Aktiva": {
@@ -121,20 +121,20 @@
                 "Investasi": {
                     "Investasi": {
                         "Deposito": {
-                            "account_number": "1231.003", 
+                            "account_number": "1231.300", 
                             "is_group": 1
                         }, 
-                        "Investai Saham": {
+                        "Investasi Saham": {
                             "Investasi Saham": {
-                                "account_number": "1231.0011"
+                                "account_number": "1231.101"
                             }, 
-                            "account_number": "1231.001"
+                            "account_number": "1231.100"
                         }, 
                         "Investasi Perumahan": {
                             "Investasi Perumahan": {
-                                "account_number": "1231.0021"
+                                "account_number": "1231.201"
                             }, 
-                            "account_number": "1231.002"
+                            "account_number": "1231.200"
                         }, 
                         "account_number": "1231.000"
                     }, 
@@ -142,7 +142,7 @@
                 }, 
                 "account_number": "1200.000"
             }, 
-            "account_number": "1000.0000", 
+            "account_number": "1000.000", 
             "root_type": "Asset"
         }, 
         "Beban": {
@@ -684,4 +684,4 @@
             "root_type": "Income"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/account_subtype/__init__.py b/erpnext/accounts/doctype/account_subtype/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/account_subtype/__init__.py
diff --git a/erpnext/accounts/doctype/account_subtype/account_subtype.js b/erpnext/accounts/doctype/account_subtype/account_subtype.js
new file mode 100644
index 0000000..30144ad
--- /dev/null
+++ b/erpnext/accounts/doctype/account_subtype/account_subtype.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Account Subtype', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/account_subtype/account_subtype.json b/erpnext/accounts/doctype/account_subtype/account_subtype.json
new file mode 100644
index 0000000..6b1f2a2
--- /dev/null
+++ b/erpnext/accounts/doctype/account_subtype/account_subtype.json
@@ -0,0 +1,134 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:account_subtype", 
+ "beta": 0, 
+ "creation": "2018-10-25 15:46:08.054586", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account_subtype", 
+   "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": "Account Subtype", 
+   "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": 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-25 15:47:03.841390", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Account Subtype", 
+ "name_case": "", 
+ "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, 
+   "write": 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": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 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": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "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": 0, 
+ "track_seen": 0, 
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account_subtype/account_subtype.py b/erpnext/accounts/doctype/account_subtype/account_subtype.py
new file mode 100644
index 0000000..46c45cc
--- /dev/null
+++ b/erpnext/accounts/doctype/account_subtype/account_subtype.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class AccountSubtype(Document):
+	pass
diff --git a/erpnext/accounts/doctype/account_subtype/test_account_subtype.js b/erpnext/accounts/doctype/account_subtype/test_account_subtype.js
new file mode 100644
index 0000000..5646763
--- /dev/null
+++ b/erpnext/accounts/doctype/account_subtype/test_account_subtype.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Account Subtype", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Account Subtype
+		() => frappe.tests.make('Account Subtype', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/account_subtype/test_account_subtype.py b/erpnext/accounts/doctype/account_subtype/test_account_subtype.py
new file mode 100644
index 0000000..c37b5b9
--- /dev/null
+++ b/erpnext/accounts/doctype/account_subtype/test_account_subtype.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestAccountSubtype(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/account_type/__init__.py b/erpnext/accounts/doctype/account_type/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/account_type/__init__.py
diff --git a/erpnext/accounts/doctype/account_type/account_type.js b/erpnext/accounts/doctype/account_type/account_type.js
new file mode 100644
index 0000000..858b56c
--- /dev/null
+++ b/erpnext/accounts/doctype/account_type/account_type.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Account Type', {
+	refresh: function() {
+
+	}
+});
diff --git a/erpnext/accounts/doctype/account_type/account_type.json b/erpnext/accounts/doctype/account_type/account_type.json
new file mode 100644
index 0000000..6b8f724
--- /dev/null
+++ b/erpnext/accounts/doctype/account_type/account_type.json
@@ -0,0 +1,134 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:account_type", 
+ "beta": 0, 
+ "creation": "2018-10-25 15:45:45.789963", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "account_type", 
+   "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": "Account Type", 
+   "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": 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-25 15:46:51.042604", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Account Type", 
+ "name_case": "", 
+ "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, 
+   "write": 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": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 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": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "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": 0, 
+ "track_seen": 0, 
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account_type/account_type.py b/erpnext/accounts/doctype/account_type/account_type.py
new file mode 100644
index 0000000..3e64293
--- /dev/null
+++ b/erpnext/accounts/doctype/account_type/account_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class AccountType(Document):
+	pass
diff --git a/erpnext/accounts/doctype/account_type/test_account_type.js b/erpnext/accounts/doctype/account_type/test_account_type.js
new file mode 100644
index 0000000..76e434f
--- /dev/null
+++ b/erpnext/accounts/doctype/account_type/test_account_type.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Account Type", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Account Type
+		() => frappe.tests.make('Account Type', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/account_type/test_account_type.py b/erpnext/accounts/doctype/account_type/test_account_type.py
new file mode 100644
index 0000000..824c2f6
--- /dev/null
+++ b/erpnext/accounts/doctype/account_type/test_account_type.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+class TestAccountType(unittest.TestCase):
+	pass
diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.py b/erpnext/accounts/doctype/accounting_period/accounting_period.py
index f7190b7..de45f3a 100644
--- a/erpnext/accounts/doctype/accounting_period/accounting_period.py
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
+from frappe import _
 
 class AccountingPeriod(Document):
 	def validate(self):
@@ -16,7 +17,7 @@
 	def autoname(self):
 		company_abbr = frappe.get_cached_value('Company',  self.company,  "abbr")
 		self.name = " - ".join([self.period_name, company_abbr])
-	
+
 	def validate_overlap(self):
 		existing_accounting_period = frappe.db.sql("""select name from `tabAccounting Period`
 			where (
@@ -33,7 +34,7 @@
 			}, as_dict=True)
 
 		if len(existing_accounting_period) > 0:
-			frappe.throw("Accounting Period overlaps with {0}".format(existing_accounting_period[0].get("name")))
+			frappe.throw(_("Accounting Period overlaps with {0}".format(existing_accounting_period[0].get("name"))))
 
 	def get_doctypes_for_closing(self):
 		docs_for_closing = []
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 64a5951..c2372bd 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -1,203 +1,203 @@
 {
- "creation": "2013-06-24 15:49:57",
- "description": "Settings for Accounts",
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "auto_accounting_for_stock",
-  "acc_frozen_upto",
-  "frozen_accounts_modifier",
-  "determine_address_tax_category_from",
-  "column_break_4",
-  "credit_controller",
-  "check_supplier_invoice_uniqueness",
-  "make_payment_via_journal_entry",
-  "unlink_payment_on_cancellation_of_invoice",
-  "unlink_advance_payment_on_cancelation_of_order",
-  "book_asset_depreciation_entry_automatically",
-  "allow_cost_center_in_entry_of_bs_account",
-  "add_taxes_from_item_tax_template",
-  "automatically_fetch_payment_terms",
-  "print_settings",
-  "show_inclusive_tax_in_print",
-  "column_break_12",
-  "show_payment_schedule_in_print",
-  "currency_exchange_section",
-  "allow_stale",
-  "stale_days",
-  "report_settings_sb",
-  "use_custom_cash_flow"
- ],
- "fields": [
-  {
-   "default": "1",
-   "description": "If enabled, the system will post accounting entries for inventory automatically.",
-   "fieldname": "auto_accounting_for_stock",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "in_list_view": 1,
-   "label": "Make Accounting Entry For Every Stock Movement"
-  },
-  {
-   "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
-   "fieldname": "acc_frozen_upto",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Accounts Frozen Upto"
-  },
-  {
-   "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
-   "fieldname": "frozen_accounts_modifier",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
-   "options": "Role"
-  },
-  {
-   "default": "Billing Address",
-   "description": "Address used to determine Tax Category in transactions.",
-   "fieldname": "determine_address_tax_category_from",
-   "fieldtype": "Select",
-   "label": "Determine Address Tax Category From",
-   "options": "Billing Address\nShipping Address"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "Role that is allowed to submit transactions that exceed credit limits set.",
-   "fieldname": "credit_controller",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Credit Controller",
-   "options": "Role"
-  },
-  {
-   "fieldname": "check_supplier_invoice_uniqueness",
-   "fieldtype": "Check",
-   "label": "Check Supplier Invoice Number Uniqueness"
-  },
-  {
-   "fieldname": "make_payment_via_journal_entry",
-   "fieldtype": "Check",
-   "label": "Make Payment via Journal Entry"
-  },
-  {
-   "default": "1",
-   "fieldname": "unlink_payment_on_cancellation_of_invoice",
-   "fieldtype": "Check",
-   "label": "Unlink Payment on Cancellation of Invoice"
-  },
-  {
-   "default": "1",
-   "fieldname": "unlink_advance_payment_on_cancelation_of_order",
-   "fieldtype": "Check",
-   "label": "Unlink Advance Payment on Cancelation of Order"
-  },
-  {
-   "default": "1",
-   "fieldname": "book_asset_depreciation_entry_automatically",
-   "fieldtype": "Check",
-   "label": "Book Asset Depreciation Entry Automatically"
-  },
-  {
-   "fieldname": "allow_cost_center_in_entry_of_bs_account",
-   "fieldtype": "Check",
-   "label": "Allow Cost Center In Entry of Balance Sheet Account"
-  },
-  {
-   "default": "1",
-   "fieldname": "add_taxes_from_item_tax_template",
-   "fieldtype": "Check",
-   "label": "Automatically Add Taxes and Charges from Item Tax Template"
-  },
-  {
-   "fieldname": "print_settings",
-   "fieldtype": "Section Break",
-   "label": "Print Settings"
-  },
-  {
-   "fieldname": "show_inclusive_tax_in_print",
-   "fieldtype": "Check",
-   "label": "Show Inclusive Tax In Print"
-  },
-  {
-   "fieldname": "column_break_12",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "show_payment_schedule_in_print",
-   "fieldtype": "Check",
-   "label": "Show Payment Schedule in Print"
-  },
-  {
-   "fieldname": "currency_exchange_section",
-   "fieldtype": "Section Break",
-   "label": "Currency Exchange Settings"
-  },
-  {
-   "default": "1",
-   "fieldname": "allow_stale",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Allow Stale Exchange Rates"
-  },
-  {
-   "default": "1",
-   "depends_on": "eval:doc.allow_stale==0",
-   "fieldname": "stale_days",
-   "fieldtype": "Int",
-   "label": "Stale Days"
-  },
-  {
-   "fieldname": "report_settings_sb",
-   "fieldtype": "Section Break",
-   "label": "Report Settings"
-  },
-  {
-   "default": "0",
-   "description": "Only select if you have setup Cash Flow Mapper documents",
-   "fieldname": "use_custom_cash_flow",
-   "fieldtype": "Check",
-   "label": "Use Custom Cash Flow Format"
-  },
-  {
-   "fieldname": "automatically_fetch_payment_terms",
-   "fieldtype": "Check",
-   "label": "Automatically Fetch Payment Terms"
-  }
- ],
- "icon": "icon-cog",
- "idx": 1,
- "issingle": 1,
- "modified": "2019-04-28 18:20:55.789946",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Accounts Settings",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "read": 1,
-   "role": "Sales User"
-  },
-  {
-   "read": 1,
-   "role": "Purchase User"
-  }
- ],
- "quick_entry": 1,
- "sort_order": "ASC",
- "track_changes": 1
-}
\ No newline at end of file
+   "creation": "2013-06-24 15:49:57",
+   "description": "Settings for Accounts",
+   "doctype": "DocType",
+   "document_type": "Other",
+   "editable_grid": 1,
+   "engine": "InnoDB",
+   "field_order": [
+    "auto_accounting_for_stock",
+    "acc_frozen_upto",
+    "frozen_accounts_modifier",
+    "determine_address_tax_category_from",
+    "column_break_4",
+    "credit_controller",
+    "check_supplier_invoice_uniqueness",
+    "make_payment_via_journal_entry",
+    "unlink_payment_on_cancellation_of_invoice",
+    "unlink_advance_payment_on_cancelation_of_order",
+    "book_asset_depreciation_entry_automatically",
+    "allow_cost_center_in_entry_of_bs_account",
+    "add_taxes_from_item_tax_template",
+    "automatically_fetch_payment_terms",
+    "print_settings",
+    "show_inclusive_tax_in_print",
+    "column_break_12",
+    "show_payment_schedule_in_print",
+    "currency_exchange_section",
+    "allow_stale",
+    "stale_days",
+    "report_settings_sb",
+    "use_custom_cash_flow"
+   ],
+   "fields": [
+    {
+     "default": "1",
+     "description": "If enabled, the system will post accounting entries for inventory automatically.",
+     "fieldname": "auto_accounting_for_stock",
+     "fieldtype": "Check",
+     "hidden": 1,
+     "in_list_view": 1,
+     "label": "Make Accounting Entry For Every Stock Movement"
+    },
+    {
+     "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
+     "fieldname": "acc_frozen_upto",
+     "fieldtype": "Date",
+     "in_list_view": 1,
+     "label": "Accounts Frozen Upto"
+    },
+    {
+     "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
+     "fieldname": "frozen_accounts_modifier",
+     "fieldtype": "Link",
+     "in_list_view": 1,
+     "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
+     "options": "Role"
+    },
+    {
+     "default": "Billing Address",
+     "description": "Address used to determine Tax Category in transactions.",
+     "fieldname": "determine_address_tax_category_from",
+     "fieldtype": "Select",
+     "label": "Determine Address Tax Category From",
+     "options": "Billing Address\nShipping Address"
+    },
+    {
+     "fieldname": "column_break_4",
+     "fieldtype": "Column Break"
+    },
+    {
+     "description": "Role that is allowed to submit transactions that exceed credit limits set.",
+     "fieldname": "credit_controller",
+     "fieldtype": "Link",
+     "in_list_view": 1,
+     "label": "Credit Controller",
+     "options": "Role"
+    },
+    {
+     "fieldname": "check_supplier_invoice_uniqueness",
+     "fieldtype": "Check",
+     "label": "Check Supplier Invoice Number Uniqueness"
+    },
+    {
+     "fieldname": "make_payment_via_journal_entry",
+     "fieldtype": "Check",
+     "label": "Make Payment via Journal Entry"
+    },
+    {
+     "default": "1",
+     "fieldname": "unlink_payment_on_cancellation_of_invoice",
+     "fieldtype": "Check",
+     "label": "Unlink Payment on Cancellation of Invoice"
+    },
+    {
+     "default": "1",
+     "fieldname": "unlink_advance_payment_on_cancelation_of_order",
+     "fieldtype": "Check",
+     "label": "Unlink Advance Payment on Cancelation of Order"
+    },
+    {
+     "default": "1",
+     "fieldname": "book_asset_depreciation_entry_automatically",
+     "fieldtype": "Check",
+     "label": "Book Asset Depreciation Entry Automatically"
+    },
+    {
+     "fieldname": "allow_cost_center_in_entry_of_bs_account",
+     "fieldtype": "Check",
+     "label": "Allow Cost Center In Entry of Balance Sheet Account"
+    },
+    {
+     "default": "1",
+     "fieldname": "add_taxes_from_item_tax_template",
+     "fieldtype": "Check",
+     "label": "Automatically Add Taxes and Charges from Item Tax Template"
+    },
+    {
+     "fieldname": "print_settings",
+     "fieldtype": "Section Break",
+     "label": "Print Settings"
+    },
+    {
+     "fieldname": "show_inclusive_tax_in_print",
+     "fieldtype": "Check",
+     "label": "Show Inclusive Tax In Print"
+    },
+    {
+     "fieldname": "column_break_12",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "show_payment_schedule_in_print",
+     "fieldtype": "Check",
+     "label": "Show Payment Schedule in Print"
+    },
+    {
+     "fieldname": "currency_exchange_section",
+     "fieldtype": "Section Break",
+     "label": "Currency Exchange Settings"
+    },
+    {
+     "default": "1",
+     "fieldname": "allow_stale",
+     "fieldtype": "Check",
+     "in_list_view": 1,
+     "label": "Allow Stale Exchange Rates"
+    },
+    {
+     "default": "1",
+     "depends_on": "eval:doc.allow_stale==0",
+     "fieldname": "stale_days",
+     "fieldtype": "Int",
+     "label": "Stale Days"
+    },
+    {
+     "fieldname": "report_settings_sb",
+     "fieldtype": "Section Break",
+     "label": "Report Settings"
+    },
+    {
+     "default": "0",
+     "description": "Only select if you have setup Cash Flow Mapper documents",
+     "fieldname": "use_custom_cash_flow",
+     "fieldtype": "Check",
+     "label": "Use Custom Cash Flow Format"
+    },
+    {
+     "fieldname": "automatically_fetch_payment_terms",
+     "fieldtype": "Check",
+     "label": "Automatically Fetch Payment Terms"
+    }
+   ],
+   "icon": "icon-cog",
+   "idx": 1,
+   "issingle": 1,
+   "modified": "2019-04-28 18:20:55.789946",
+   "modified_by": "Administrator",
+   "module": "Accounts",
+   "name": "Accounts Settings",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "create": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "role": "Accounts Manager",
+     "share": 1,
+     "write": 1
+    },
+    {
+     "read": 1,
+     "role": "Sales User"
+    },
+    {
+     "read": 1,
+     "role": "Purchase User"
+    }
+   ],
+   "quick_entry": 1,
+   "sort_order": "ASC",
+   "track_changes": 1
+  }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank/bank.js b/erpnext/accounts/doctype/bank/bank.js
index 1063a07..463d29c 100644
--- a/erpnext/accounts/doctype/bank/bank.js
+++ b/erpnext/accounts/doctype/bank/bank.js
@@ -2,7 +2,29 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Bank', {
+	onload: function(frm) {
+		add_fields_to_mapping_table(frm);
+	},
 	refresh: function(frm) {
-
+		add_fields_to_mapping_table(frm);
 	}
 });
+
+
+let add_fields_to_mapping_table = function (frm) {
+	let options = [];
+
+	frappe.model.with_doctype("Bank Transaction", function() {
+		let meta = frappe.get_meta("Bank Transaction");
+		meta.fields.forEach(value => {
+			if (!["Section Break", "Column Break"].includes(value.fieldtype)) {
+				options.push(value.fieldname);
+			}
+		});
+	});
+
+	frappe.meta.get_docfield("Bank Transaction Mapping", "bank_transaction_field",
+		frm.doc.name).options = options;
+
+	frm.fields_dict.bank_transaction_mapping.grid.refresh();
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank/bank.json b/erpnext/accounts/doctype/bank/bank.json
index 0a24726..4fa0e4f 100644
--- a/erpnext/accounts/doctype/bank/bank.json
+++ b/erpnext/accounts/doctype/bank/bank.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
@@ -15,6 +16,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,134 @@
    "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": 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
+  }, 
+  {
+   "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_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
+  }, 
+  {
+   "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
   }
  ], 
@@ -55,7 +185,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-04-07 17:00:21.246202", 
+ "modified": "2018-11-27 16:12:13.938776", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank", 
@@ -64,7 +194,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -90,5 +219,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.js b/erpnext/accounts/doctype/bank_account/bank_account.js
index a7b5891..f22dd81 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.js
+++ b/erpnext/accounts/doctype/bank_account/bank_account.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
 frappe.ui.form.on('Bank Account', {
@@ -29,5 +29,13 @@
 		else {
 			frappe.contacts.render_address_and_contact(frm);
 		}
+
+		if (frm.doc.integration_id) {
+			frm.add_custom_button(__("Unlink external integrations"), function() {
+				frappe.confirm(__("This action will unlink this account from any external service integrating ERPNext with your bank accounts. It cannot be undone. Are you certain ?"), function() {
+					frm.set_value("integration_id", "");
+				});
+			});
+		}
 	}
 });
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.json b/erpnext/accounts/doctype/bank_account/bank_account.json
index 10db0d7..076b320 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.json
+++ b/erpnext/accounts/doctype/bank_account/bank_account.json
@@ -1,189 +1,1019 @@
 {
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:account_name",
- "creation": "2017-05-29 21:35:13.136357",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
-  "account_name",
-  "account",
-  "bank",
-  "is_company_account",
-  "company",
-  "column_break_7",
-  "is_default",
-  "bank_account_no",
-  "iban",
-  "branch_code",
-  "swift_number",
-  "section_break_11",
-  "party_type",
-  "column_break_14",
-  "party",
-  "address_and_contact",
-  "address_html",
-  "website",
-  "column_break_12",
-  "contact_html"
- ],
- "fields": [
-  {
-   "fieldname": "account_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Account Name",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "account",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "bank",
-   "fieldtype": "Link",
-   "label": "Bank",
-   "options": "Bank",
-   "reqd": 1
-  },
-  {
-   "fieldname": "is_company_account",
-   "fieldtype": "Check",
-   "label": "Is Company Account"
-  },
-  {
-   "depends_on": "is_company_account",
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Company",
-   "options": "Company"
-  },
-  {
-   "fieldname": "column_break_7",
-   "fieldtype": "Column Break",
-   "search_index": 1
-  },
-  {
-   "fieldname": "is_default",
-   "fieldtype": "Check",
-   "label": "Is Default"
-  },
-  {
-   "fieldname": "bank_account_no",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Bank Account No",
-   "length": 30
-  },
-  {
-   "fieldname": "iban",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "IBAN",
-   "length": 30
-  },
-  {
-   "fieldname": "branch_code",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Branch Code"
-  },
-  {
-   "fieldname": "swift_number",
-   "fieldtype": "Data",
-   "label": "SWIFT number"
-  },
-  {
-   "depends_on": "eval:!doc.is_company_account",
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "party_type",
-   "fieldtype": "Link",
-   "label": "Party Type",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "column_break_14",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "party",
-   "fieldtype": "Dynamic Link",
-   "label": "Party",
-   "options": "party_type"
-  },
-  {
-   "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_12",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "contact_html",
-   "fieldtype": "HTML",
-   "label": "Contact HTML"
-  }
- ],
- "modified": "2019-04-25 22:10:07.951351",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Bank Account",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "import": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "bank,account",
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
+   "allow_copy": 0,
+   "allow_events_in_timeline": 0,
+   "allow_guest_to_view": 0,
+   "allow_import": 1,
+   "allow_rename": 1,
+   "autoname": "",
+   "beta": 0,
+   "creation": "2017-05-29 21:35:13.136357",
+   "custom": 0,
+   "docstatus": 0,
+   "doctype": "DocType",
+   "document_type": "Setup",
+   "editable_grid": 0,
+   "engine": "InnoDB",
+   "fields": [
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "account_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": 1,
+     "label": "Account 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,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "account",
+     "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": "GL Account",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Account",
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "bank",
+     "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": "Bank",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Bank",
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "account_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": "Account Type",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Account 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "account_subtype",
+     "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": "Account Subtype",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Account Subtype",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_7",
+     "fieldtype": "Column 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": "",
+     "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": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "is_default",
+     "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 the Default Account",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "is_company_account",
+     "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 Company Account",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "is_company_account",
+     "fieldname": "company",
+     "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": 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": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:!doc.is_company_account",
+     "fieldname": "section_break_11",
+     "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": "Party Details",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "party_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": "Party Type",
+     "length": 0,
+     "no_copy": 0,
+     "options": "DocType",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_14",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "party",
+     "fieldtype": "Dynamic 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": "Party",
+     "length": 0,
+     "no_copy": 0,
+     "options": "party_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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "account_details_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": "Account Details",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "iban",
+     "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": "IBAN",
+     "length": 30,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_12",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "bank_account_no",
+     "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 Account No",
+     "length": 30,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "branch_code",
+     "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": "Branch Code",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "swift_number",
+     "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": "SWIFT number",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "address_and_contact",
+     "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": "Address and Contact",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-map-marker",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "address_html",
+     "fieldtype": "HTML",
+     "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": "Address HTML",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "website",
+     "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": "Website",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_13",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "contact_html",
+     "fieldtype": "HTML",
+     "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": "Contact HTML",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "integration_details_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": "Integration Details",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "integration_id",
+     "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": "Integration ID",
+     "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": 1
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Change this date manually to setup the next synchronization start date",
+     "fieldname": "last_integration_date",
+     "fieldtype": "Date",
+     "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": "Last Integration Date",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_27",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "mask",
+     "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": "Mask",
+     "length": 0,
+     "no_copy": 0,
+     "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
+    }
+   ],
+   "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": "2019-03-06 17:56:05.103238",
+   "modified_by": "Administrator",
+   "module": "Accounts",
+   "name": "Bank Account",
+   "name_case": "",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "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": "Accounts Manager",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 0,
+     "write": 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": "Accounts User",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 0,
+     "write": 1
+    }
+   ],
+   "quick_entry": 0,
+   "read_only": 0,
+   "read_only_onload": 0,
+   "search_fields": "bank,account",
+   "show_name_in_global_search": 0,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "track_changes": 1,
+   "track_seen": 0,
+   "track_views": 0
+  }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.py b/erpnext/accounts/doctype/bank_account/bank_account.py
index b13259b..20ce7ca 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.py
+++ b/erpnext/accounts/doctype/bank_account/bank_account.py
@@ -13,16 +13,47 @@
 		"""Load address and contacts in `__onload`"""
 		load_address_and_contact(self)
 
+	def autoname(self):
+		self.name = self.account_name + " - " + self.bank
+
 	def on_trash(self):
 		delete_contact_and_address('BankAccount', self.name)
 
 	def validate(self):
 		self.validate_company()
+		self.validate_iban()
 
 	def validate_company(self):
 		if self.is_company_account and not self.company:
 			frappe.throw(_("Company is manadatory for company account"))
 
+	def validate_iban(self):
+		'''
+		Algorithm: https://en.wikipedia.org/wiki/International_Bank_Account_Number#Validating_the_IBAN
+		'''
+		# IBAN field is optional
+		if not self.iban:
+			return
+
+		def encode_char(c):
+			# Position in the alphabet (A=1, B=2, ...) plus nine
+			return str(9 + ord(c) - 64)
+
+		# remove whitespaces, upper case to get the right number from ord()
+		iban = ''.join(self.iban.split(' ')).upper()
+
+		# Move country code and checksum from the start to the end
+		flipped = iban[4:] + iban[:4]
+
+		# Encode characters as numbers
+		encoded = [encode_char(c) if ord(c) >= 65 and ord(c) <= 90 else c for c in flipped]
+
+		to_check = int(''.join(encoded))
+
+		if to_check % 97 != 1:
+			frappe.throw(_('IBAN is not valid'))
+
+
 @frappe.whitelist()
 def make_bank_account(doctype, docname):
 	doc = frappe.new_doc("Bank Account")
diff --git a/erpnext/accounts/doctype/bank_account/test_bank_account.py b/erpnext/accounts/doctype/bank_account/test_bank_account.py
index 43a3298..f3bb086 100644
--- a/erpnext/accounts/doctype/bank_account/test_bank_account.py
+++ b/erpnext/accounts/doctype/bank_account/test_bank_account.py
@@ -4,9 +4,46 @@
 from __future__ import unicode_literals
 
 import frappe
+from  frappe import _
+from  frappe import ValidationError
 import unittest
 
 # test_records = frappe.get_test_records('Bank Account')
 
 class TestBankAccount(unittest.TestCase):
-	pass
+
+	def test_validate_iban(self):
+		valid_ibans = [
+			'GB82 WEST 1234 5698 7654 32',
+			'DE91 1000 0000 0123 4567 89',
+			'FR76 3000 6000 0112 3456 7890 189'
+		]
+
+		invalid_ibans = [
+			# wrong checksum (3rd place)
+			'GB72 WEST 1234 5698 7654 32',
+			'DE81 1000 0000 0123 4567 89',
+			'FR66 3000 6000 0112 3456 7890 189'
+		]
+
+		bank_account = frappe.get_doc({'doctype':'Bank Account'})
+
+		try:
+			bank_account.validate_iban()
+		except AttributeError:
+			msg = _('BankAccount.validate_iban() failed for empty IBAN')
+			self.fail(msg=msg)
+
+		for iban in valid_ibans:
+			bank_account.iban = iban
+			try:
+				bank_account.validate_iban()
+			except ValidationError:
+				msg = _('BankAccount.validate_iban() failed for valid IBAN {}'.format(iban))
+				self.fail(msg=msg)
+
+		for not_iban in invalid_ibans:
+			bank_account.iban = not_iban
+			msg = _('BankAccount.validate_iban() accepted invalid IBAN {}'.format(not_iban))
+			with self.assertRaises(ValidationError, msg=msg):
+				bank_account.validate_iban()
diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py
index 101b9f2..1318cf1 100644
--- a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py
+++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py
@@ -48,7 +48,7 @@
 
 	def get_statement_headers(self):
 		if not self.bank_settings:
-			frappe.throw("Bank Data mapper doesn't exist")
+			frappe.throw(_("Bank Data mapper doesn't exist"))
 		mapper_doc = frappe.get_doc("Bank Statement Settings", self.bank_settings)
 		headers = {entry.mapped_header:entry.stmt_header for entry in mapper_doc.header_items}
 		return headers
@@ -57,7 +57,7 @@
 		if self.bank_statement is None: return
 		filename = self.bank_statement.split("/")[-1]
 		if (len(self.new_transaction_items + self.reconciled_transaction_items) > 0):
-			frappe.throw("Transactions already retreived from the statement")
+			frappe.throw(_("Transactions already retreived from the statement"))
 
 		date_format = frappe.get_value("Bank Statement Settings", self.bank_settings, "date_format")
 		if (date_format is None):
@@ -314,7 +314,7 @@
 			try:
 				reconcile_against_document(lst)
 			except:
-				frappe.throw("Exception occurred while reconciling {0}".format(payment.reference_name))
+				frappe.throw(_("Exception occurred while reconciling {0}".format(payment.reference_name)))
 
 	def submit_payment_entries(self):
 		for payment in self.new_transaction_items:
@@ -414,7 +414,7 @@
 	elif (filename.lower().endswith("xls")):
 		rows = get_rows_from_xls_file(filename)
 	else:
-		frappe.throw("Only .csv and .xlsx files are supported currently")
+		frappe.throw(_("Only .csv and .xlsx files are supported currently"))
 
 	stmt_headers = headers.values()
 	for row in rows:
diff --git a/erpnext/accounts/doctype/bank_transaction/__init__.py b/erpnext/accounts/doctype/bank_transaction/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/__init__.py
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
new file mode 100644
index 0000000..8b1bab1
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.js
@@ -0,0 +1,32 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Bank Transaction', {
+	onload(frm) {
+		frm.set_query('payment_document', 'payment_entries', function() {
+			return {
+				"filters": {
+					"name": ["in", ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Expense Claim"]]
+				}
+			};
+		});
+	}
+});
+
+frappe.ui.form.on('Bank Transaction Payments', {
+	payment_entries_remove: function(frm, cdt, cdn) {
+		update_clearance_date(frm, cdt, cdn);
+	}
+});
+
+const update_clearance_date = (frm, cdt, cdn) => {
+	if (frm.doc.docstatus === 1) {
+		frappe.xcall('erpnext.accounts.doctype.bank_transaction.bank_transaction.unclear_reference_payment',
+			{doctype: cdt, docname: cdn})
+			.then(e => {
+				if (e == "success") {
+					frappe.show_alert({message:__("Document {0} successfully uncleared", [e]), indicator:'green'});
+				}
+			});
+	}
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.json b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
new file mode 100644
index 0000000..39937bb
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.json
@@ -0,0 +1,833 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "beta": 0,
+ "creation": "2018-10-22 18:19:02.784533",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "ACC-BTN-.YYYY.-",
+   "fetch_if_empty": 0,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "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": "Series",
+   "length": 0,
+   "no_copy": 1,
+   "options": "ACC-BTN-.YYYY.-",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "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": 1,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "date",
+   "fieldtype": "Date",
+   "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": "Date",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_2",
+   "fieldtype": "Column 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Pending",
+   "fetch_if_empty": 0,
+   "fieldname": "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": 1,
+   "label": "Status",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\nPending\nSettled\nUnreconciled\nReconciled",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "bank_account",
+   "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": 1,
+   "label": "Bank Account",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Bank Account",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "fetch_from": "bank_account.company",
+   "fetch_if_empty": 0,
+   "fieldname": "company",
+   "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": 1,
+   "label": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Company",
+   "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_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "debit",
+   "fieldtype": "Currency",
+   "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": "Debit",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "credit",
+   "fieldtype": "Currency",
+   "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": "Credit",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_7",
+   "fieldtype": "Column 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "currency",
+   "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": "Currency",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_10",
+   "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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "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": "Description",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_14",
+   "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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "reference_number",
+   "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": "Reference Number",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "transaction_id",
+   "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": "Transaction ID",
+   "length": 0,
+   "no_copy": 0,
+   "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": 1
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 1,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "payment_entries",
+   "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": "Payment Entries",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Bank Transaction Payments",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_18",
+   "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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "allocated_amount",
+   "fieldtype": "Currency",
+   "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": "Allocated Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "amended_from",
+   "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": "Amended From",
+   "length": 0,
+   "no_copy": 1,
+   "options": "Bank Transaction",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_17",
+   "fieldtype": "Column 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
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fetch_if_empty": 0,
+   "fieldname": "unallocated_amount",
+   "fieldtype": "Currency",
+   "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": "Unallocated Amount",
+   "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
+  }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-05-11 05:27:55.244721",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Transaction",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "amend": 0,
+   "cancel": 1,
+   "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": 1,
+   "write": 1
+  },
+  {
+   "amend": 0,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
+   "write": 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": "Accounts User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "date",
+ "sort_order": "DESC",
+ "title_field": "bank_account",
+ "track_changes": 0,
+ "track_seen": 0,
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
new file mode 100644
index 0000000..f943b34
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.controllers.status_updater import StatusUpdater
+from frappe.utils import flt
+from six.moves import reduce
+from frappe import _
+
+class BankTransaction(StatusUpdater):
+	def after_insert(self):
+		self.unallocated_amount = abs(flt(self.credit) - flt(self.debit))
+
+	def on_submit(self):
+		self.clear_linked_payment_entries()
+		self.set_status()
+
+	def on_update_after_submit(self):
+		self.update_allocations()
+		self.clear_linked_payment_entries()
+		self.set_status(update=True)
+
+	def update_allocations(self):
+		if self.payment_entries:
+			allocated_amount = reduce(lambda x, y: flt(x) + flt(y), [x.allocated_amount for x in self.payment_entries])
+		else:
+			allocated_amount = 0
+
+		if allocated_amount:
+			frappe.db.set_value(self.doctype, self.name, "allocated_amount", flt(allocated_amount))
+			frappe.db.set_value(self.doctype, self.name, "unallocated_amount", abs(flt(self.credit) - flt(self.debit)) - flt(allocated_amount))
+
+		else:
+			frappe.db.set_value(self.doctype, self.name, "allocated_amount", 0)
+			frappe.db.set_value(self.doctype, self.name, "unallocated_amount", abs(flt(self.credit) - flt(self.debit)))
+
+		amount = self.debit or self.credit
+		if amount == self.allocated_amount:
+			frappe.db.set_value(self.doctype, self.name, "status", "Reconciled")
+
+		self.reload()
+
+	def clear_linked_payment_entries(self):
+		for payment_entry in self.payment_entries:
+			allocated_amount = get_total_allocated_amount(payment_entry)
+			paid_amount = get_paid_amount(payment_entry)
+
+			if paid_amount and allocated_amount:
+				if  flt(allocated_amount[0]["allocated_amount"]) > flt(paid_amount):
+					frappe.throw(_("The total allocated amount ({0}) is greated than the paid amount ({1}).".format(flt(allocated_amount[0]["allocated_amount"]), flt(paid_amount))))
+				elif flt(allocated_amount[0]["allocated_amount"]) == flt(paid_amount):
+					if payment_entry.payment_document in ["Payment Entry", "Journal Entry", "Purchase Invoice", "Expense Claim"]:
+						self.clear_simple_entry(payment_entry)
+
+					elif payment_entry.payment_document == "Sales Invoice":
+						self.clear_sales_invoice(payment_entry)
+
+	def clear_simple_entry(self, payment_entry):
+		frappe.db.set_value(payment_entry.payment_document, payment_entry.payment_entry, "clearance_date", self.date)
+
+	def clear_sales_invoice(self, payment_entry):
+		frappe.db.set_value("Sales Invoice Payment", dict(parenttype=payment_entry.payment_document,
+			parent=payment_entry.payment_entry), "clearance_date", self.date)
+
+def get_total_allocated_amount(payment_entry):
+	return frappe.db.sql("""
+		SELECT
+			SUM(btp.allocated_amount) as allocated_amount,
+			bt.name
+		FROM
+			`tabBank Transaction Payments` as btp
+		LEFT JOIN
+			`tabBank Transaction` bt ON bt.name=btp.parent
+		WHERE
+			btp.payment_document = %s
+		AND
+			btp.payment_entry = %s
+		AND
+			bt.docstatus = 1""", (payment_entry.payment_document, payment_entry.payment_entry), as_dict=True)
+
+def get_paid_amount(payment_entry):
+	if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
+		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "paid_amount")
+
+	elif payment_entry.payment_document == "Journal Entry":
+		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "total_credit")
+
+	elif payment_entry.payment_document == "Expense Claim":
+		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "total_amount_reimbursed")
+
+	else:
+		frappe.throw("Please reconcile {0}: {1} manually".format(payment_entry.payment_document, payment_entry.payment_entry))
+
+@frappe.whitelist()
+def unclear_reference_payment(doctype, docname):
+	if frappe.db.exists(doctype, docname):
+		doc = frappe.get_doc(doctype, docname)
+		if doctype == "Sales Invoice":
+			frappe.db.set_value("Sales Invoice Payment", dict(parenttype=doc.payment_document,
+				parent=doc.payment_entry), "clearance_date", None)
+		else:
+			frappe.db.set_value(doc.payment_document, doc.payment_entry, "clearance_date", None)
+
+		return doc.payment_entry
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js b/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
new file mode 100644
index 0000000..2ecc2b0
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_list.js
@@ -0,0 +1,13 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.listview_settings['Bank Transaction'] = {
+	add_fields: ["unallocated_amount"],
+	get_indicator: function(doc) {
+		if(flt(doc.unallocated_amount)>0) {
+			return [__("Unreconciled"), "orange", "unallocated_amount,>,0"];
+		} else if(flt(doc.unallocated_amount)<=0) {
+			return [__("Reconciled"), "green", "unallocated_amount,=,0"];
+		}
+	}
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
new file mode 100644
index 0000000..deedafd
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe.utils import getdate
+from frappe.utils.dateutils import parse_date
+from six import iteritems
+
+@frappe.whitelist()
+def upload_bank_statement():
+	if getattr(frappe, "uploaded_file", None):
+		with open(frappe.uploaded_file, "rb") as upfile:
+			fcontent = upfile.read()
+	else:
+		from frappe.utils.file_manager import get_uploaded_content
+		fname, fcontent = get_uploaded_content()
+
+	if frappe.safe_encode(fname).lower().endswith("csv".encode('utf-8')):
+		from frappe.utils.csvutils import read_csv_content
+		rows = read_csv_content(fcontent, False)
+
+	elif frappe.safe_encode(fname).lower().endswith("xlsx".encode('utf-8')):
+		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
+		rows = read_xlsx_file_from_attached_file(fcontent=fcontent)
+
+	columns = rows[0]
+	rows.pop(0)
+	data = rows
+	return {"columns": columns, "data": data}
+
+
+@frappe.whitelist()
+def create_bank_entries(columns, data, bank_account):
+	header_map = get_header_mapping(columns, bank_account)
+
+	success = 0
+	errors = 0
+	for d in json.loads(data):
+		if all(item is None for item in d) is True:
+			continue
+		fields = {}
+		for key, value in iteritems(header_map):
+			fields.update({key: d[int(value)-1]})
+
+		try:
+			bank_transaction = frappe.get_doc({
+				"doctype": "Bank Transaction"
+			})
+			bank_transaction.update(fields)
+			bank_transaction.date = getdate(parse_date(bank_transaction.date))
+			bank_transaction.bank_account = bank_account
+			bank_transaction.insert()
+			bank_transaction.submit()
+			success += 1
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			errors += 1
+
+	return {"success": success, "errors": errors}
+
+def get_header_mapping(columns, bank_account):
+	mapping = get_bank_mapping(bank_account)
+
+	header_map = {}
+	for column in json.loads(columns):
+		if column["content"] in mapping:
+			header_map.update({mapping[column["content"]]: column["colIndex"]})
+
+	return header_map
+
+def get_bank_mapping(bank_account):
+	bank_name = frappe.db.get_value("Bank Account", bank_account, "bank")
+	bank = frappe.get_doc("Bank", bank_name)
+
+	mapping = {row.file_field:row.bank_transaction_field for row in bank.bank_transaction_mapping}
+
+	return mapping
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.js b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.js
new file mode 100644
index 0000000..305119e
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Transaction", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Transaction
+		() => frappe.tests.make('Bank Transaction', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
new file mode 100644
index 0000000..0fe57c3
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
@@ -0,0 +1,290 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
+from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
+from erpnext.accounts.page.bank_reconciliation.bank_reconciliation import reconcile, get_linked_payments
+
+test_dependencies = ["Item", "Cost Center"]
+
+class TestBankTransaction(unittest.TestCase):
+	def setUp(self):
+		add_transactions()
+		add_payments()
+
+	def tearDown(self):
+		for bt in frappe.get_all("Bank Transaction"):
+			doc = frappe.get_doc("Bank Transaction", bt.name)
+			doc.cancel()
+			doc.delete()
+
+		# Delete directly in DB to avoid validation errors for countries not allowing deletion
+		frappe.db.sql("""delete from `tabPayment Entry Reference`""")
+		frappe.db.sql("""delete from `tabPayment Entry`""")
+
+		frappe.flags.test_bank_transactions_created = False
+		frappe.flags.test_payments_created = False
+
+	# This test checks if ERPNext is able to provide a linked payment for a bank transaction based on the amount of the bank transaction.
+	def test_linked_payments(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="Re 95282925234 FE/000002917 AT171513000281183046 Conrad Electronic"))
+		linked_payments = get_linked_payments(bank_transaction.name)
+		self.assertTrue(linked_payments[0].party == "Conrad Electronic")
+
+	# This test validates a simple reconciliation leading to the clearance of the bank transaction and the payment
+	def test_reconcile(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="1512567 BG/000002918 OPSKATTUZWXXX AT776000000098709837 Herr G"))
+		payment = frappe.get_doc("Payment Entry", dict(party="Mr G", paid_amount=1200))
+		reconcile(bank_transaction.name, "Payment Entry", payment.name)
+
+		unallocated_amount = frappe.db.get_value("Bank Transaction", bank_transaction.name, "unallocated_amount")
+		self.assertTrue(unallocated_amount == 0)
+
+		clearance_date = frappe.db.get_value("Payment Entry", payment.name, "clearance_date")
+		self.assertTrue(clearance_date is not None)
+
+	# Check if ERPNext can correctly fetch a linked payment based on the party
+	def test_linked_payments_based_on_party(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="1512567 BG/000003025 OPSKATTUZWXXX AT776000000098709849 Herr G"))
+		linked_payments = get_linked_payments(bank_transaction.name)
+		self.assertTrue(len(linked_payments)==1)
+
+	# Check if ERPNext can correctly filter a linked payments based on the debit/credit amount
+	def test_debit_credit_output(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="Auszahlung Karte MC/000002916 AUTOMAT 698769 K002 27.10. 14:07"))
+		linked_payments = get_linked_payments(bank_transaction.name)
+		self.assertTrue(linked_payments[0].payment_type == "Pay")
+
+	# Check error if already reconciled
+	def test_already_reconciled(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="1512567 BG/000002918 OPSKATTUZWXXX AT776000000098709837 Herr G"))
+		payment = frappe.get_doc("Payment Entry", dict(party="Mr G", paid_amount=1200))
+		reconcile(bank_transaction.name, "Payment Entry", payment.name)
+
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="1512567 BG/000002918 OPSKATTUZWXXX AT776000000098709837 Herr G"))
+		payment = frappe.get_doc("Payment Entry", dict(party="Mr G", paid_amount=1200))
+		self.assertRaises(frappe.ValidationError, reconcile, bank_transaction=bank_transaction.name, payment_doctype="Payment Entry", payment_name=payment.name)
+
+	# Raise an error if creditor transaction vs creditor payment
+	def test_invalid_creditor_reconcilation(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="I2015000011 VD/000002514 ATWWXXX AT4701345000003510057 Bio"))
+		payment = frappe.get_doc("Payment Entry", dict(party="Conrad Electronic", paid_amount=690))
+		self.assertRaises(frappe.ValidationError, reconcile, bank_transaction=bank_transaction.name, payment_doctype="Payment Entry", payment_name=payment.name)
+
+	# Raise an error if debitor transaction vs debitor payment
+	def test_invalid_debitor_reconcilation(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="Auszahlung Karte MC/000002916 AUTOMAT 698769 K002 27.10. 14:07"))
+		payment = frappe.get_doc("Payment Entry", dict(party="Fayva", paid_amount=109080))
+		self.assertRaises(frappe.ValidationError, reconcile, bank_transaction=bank_transaction.name, payment_doctype="Payment Entry", payment_name=payment.name)
+
+	# Raise an error if debitor transaction vs debitor payment
+	def test_clear_sales_invoice(self):
+		bank_transaction = frappe.get_doc("Bank Transaction", dict(description="I2015000011 VD/000002514 ATWWXXX AT4701345000003510057 Bio"))
+		payment = frappe.get_doc("Sales Invoice", dict(customer="Fayva", status=["=", "Paid"]))
+		reconcile(bank_transaction.name, "Sales Invoice", payment.name)
+
+		self.assertEqual(frappe.db.get_value("Bank Transaction", bank_transaction.name, "unallocated_amount"), 0)
+		self.assertTrue(frappe.db.get_value("Sales Invoice Payment", dict(parent=payment.name), "clearance_date") is not None)
+
+def add_transactions():
+	if frappe.flags.test_bank_transactions_created:
+		return
+
+	frappe.set_user("Administrator")
+	try:
+		frappe.get_doc({
+			"doctype": "Bank",
+			"bank_name":"Citi Bank",
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+	try:
+		frappe.get_doc({
+			"doctype": "Bank Account",
+			"account_name":"Checking Account",
+			"bank": "Citi Bank",
+			"account": "_Test Bank - _TC"
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+	doc = frappe.get_doc({
+		"doctype": "Bank Transaction",
+		"description":"1512567 BG/000002918 OPSKATTUZWXXX AT776000000098709837 Herr G",
+		"date": "2018-10-23",
+		"debit": 1200,
+		"currency": "INR",
+		"bank_account": "Checking Account - Citi Bank"
+	}).insert()
+	doc.submit()
+
+	doc = frappe.get_doc({
+		"doctype": "Bank Transaction",
+		"description":"1512567 BG/000003025 OPSKATTUZWXXX AT776000000098709849 Herr G",
+		"date": "2018-10-23",
+		"debit": 1700,
+		"currency": "INR",
+		"bank_account": "Checking Account - Citi Bank"
+	}).insert()
+	doc.submit()
+
+	doc = frappe.get_doc({
+		"doctype": "Bank Transaction",
+		"description":"Re 95282925234 FE/000002917 AT171513000281183046 Conrad Electronic",
+		"date": "2018-10-26",
+		"debit": 690,
+		"currency": "INR",
+		"bank_account": "Checking Account - Citi Bank"
+	}).insert()
+	doc.submit()
+
+	doc = frappe.get_doc({
+		"doctype": "Bank Transaction",
+		"description":"Auszahlung Karte MC/000002916 AUTOMAT 698769 K002 27.10. 14:07",
+		"date": "2018-10-27",
+		"debit": 3900,
+		"currency": "INR",
+		"bank_account": "Checking Account - Citi Bank"
+	}).insert()
+	doc.submit()
+
+	doc = frappe.get_doc({
+		"doctype": "Bank Transaction",
+		"description":"I2015000011 VD/000002514 ATWWXXX AT4701345000003510057 Bio",
+		"date": "2018-10-27",
+		"credit": 109080,
+		"currency": "INR",
+		"bank_account": "Checking Account - Citi Bank"
+	}).insert()
+	doc.submit()
+
+	frappe.flags.test_bank_transactions_created = True
+
+def add_payments():
+	if frappe.flags.test_payments_created:
+		return
+
+	frappe.set_user("Administrator")
+
+	try:
+		frappe.get_doc({
+			"doctype": "Supplier",
+			"supplier_group":"All Supplier Groups",
+			"supplier_type": "Company",
+			"supplier_name": "Conrad Electronic"
+		}).insert()
+
+	except frappe.DuplicateEntryError:
+		pass
+
+	pi = make_purchase_invoice(supplier="Conrad Electronic", qty=1, rate=690)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "Conrad Oct 18"
+	pe.reference_date = "2018-10-24"
+	pe.insert()
+	pe.submit()
+
+	try:
+		frappe.get_doc({
+			"doctype": "Supplier",
+			"supplier_group":"All Supplier Groups",
+			"supplier_type": "Company",
+			"supplier_name": "Mr G"
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+	pi = make_purchase_invoice(supplier="Mr G", qty=1, rate=1200)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "Herr G Oct 18"
+	pe.reference_date = "2018-10-24"
+	pe.insert()
+	pe.submit()
+
+	pi = make_purchase_invoice(supplier="Mr G", qty=1, rate=1700)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "Herr G Nov 18"
+	pe.reference_date = "2018-11-01"
+	pe.insert()
+	pe.submit()
+
+	try:
+		frappe.get_doc({
+			"doctype": "Supplier",
+			"supplier_group":"All Supplier Groups",
+			"supplier_type": "Company",
+			"supplier_name": "Poore Simon's"
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+	try:
+		frappe.get_doc({
+			"doctype": "Customer",
+			"customer_group":"All Customer Groups",
+			"customer_type": "Company",
+			"customer_name": "Poore Simon's"
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+	pi = make_purchase_invoice(supplier="Poore Simon's", qty=1, rate=3900)
+	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "Poore Simon's Oct 18"
+	pe.reference_date = "2018-10-28"
+	pe.insert()
+	pe.submit()
+
+	si = create_sales_invoice(customer="Poore Simon's", qty=1, rate=3900)
+	pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "Poore Simon's Oct 18"
+	pe.reference_date = "2018-10-28"
+	pe.insert()
+	pe.submit()
+
+	try:
+		frappe.get_doc({
+			"doctype": "Customer",
+			"customer_group":"All Customer Groups",
+			"customer_type": "Company",
+			"customer_name": "Fayva"
+		}).insert()
+	except frappe.DuplicateEntryError:
+		pass
+
+	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080)
+	pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
+	pe.reference_no = "Fayva Oct 18"
+	pe.reference_date = "2018-10-29"
+	pe.insert()
+	pe.submit()
+
+	mode_of_payment = frappe.get_doc({
+		"doctype": "Mode of Payment",
+		"name": "Cash"
+	})
+
+	if not frappe.db.get_value('Mode of Payment Account', {'company': "_Test Company", 'parent': "Cash"}):
+		mode_of_payment.append("accounts", {
+			"company": "_Test Company",
+			"default_account": "_Test Bank - _TC"
+		})
+		mode_of_payment.save()
+
+	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_submit=1)
+	si.is_pos = 1
+	si.append("payments", {
+		"mode_of_payment": "Cash",
+		"account": "_Test Bank - _TC",
+		"amount": 109080
+	})
+	si.save()
+	si.submit()
+
+	frappe.flags.test_payments_created = True
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction_mapping/__init__.py b/erpnext/accounts/doctype/bank_transaction_mapping/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction_mapping/__init__.py
diff --git a/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json b/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json
new file mode 100644
index 0000000..ace554b
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json
@@ -0,0 +1,107 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-10-24 15:24:56.713277", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank_transaction_field", 
+   "fieldtype": "Select", 
+   "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": "Field in Bank Transaction", 
+   "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": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "file_field", 
+   "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": "Column in Bank File", 
+   "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": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "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": "2018-10-24 15:24:56.713277", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Transaction Mapping", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0, 
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.py b/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.py
new file mode 100644
index 0000000..95a5bc3
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class BankTransactionMapping(Document):
+	pass
diff --git a/erpnext/accounts/doctype/bank_transaction_payments/__init__.py b/erpnext/accounts/doctype/bank_transaction_payments/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction_payments/__init__.py
diff --git a/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json b/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json
new file mode 100644
index 0000000..a75e866
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json
@@ -0,0 +1,141 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-11-28 08:55:40.815355", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_document", 
+   "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": "Payment Document", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "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": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_entry", 
+   "fieldtype": "Dynamic 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": "Payment Entry", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_document", 
+   "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": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allocated_amount", 
+   "fieldtype": "Currency", 
+   "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": "Allocated Amount", 
+   "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": 0
+  }
+ ], 
+ "has_web_view": 0, 
+ "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": "2018-12-06 10:57:02.635141", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Bank Transaction Payments", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "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
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.py b/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.py
new file mode 100644
index 0000000..d6d7c10
--- /dev/null
+++ b/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe.model.document import Document
+
+class BankTransactionPayments(Document):
+	pass
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index b7f383f..b6c48c8 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -228,6 +228,10 @@
 				frappe.model.validate_missing(jvd, "account");
 				var party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
 				out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
+
+				if (in_list(['Debit Note', 'Credit Note'], doc.voucher_type)) {
+					out.filters.push([jvd.reference_type, "is_return", "=", 1]);
+				}
 			}
 
 			if(in_list(["Sales Order", "Purchase Order"], jvd.reference_type)) {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index d082b60..3132c93 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -331,7 +331,8 @@
 		for reference_name, total in iteritems(self.reference_totals):
 			reference_type = self.reference_types[reference_name]
 
-			if reference_type in ("Sales Invoice", "Purchase Invoice"):
+			if (reference_type in ("Sales Invoice", "Purchase Invoice") and
+				self.voucher_type not in ['Debit Note', 'Credit Note']):
 				invoice = frappe.db.get_value(reference_type, reference_name,
 					["docstatus", "outstanding_amount"], as_dict=1)
 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 92803a6..ea76126 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -535,6 +535,20 @@
 			"amount": self.total_allocated_amount * (tax_details['tax']['rate'] / 100)
 		}
 
+	def set_gain_or_loss(self, account_details=None):
+		if not self.difference_amount:
+			self.set_difference_amount()
+
+		row = {
+			'amount': self.difference_amount
+		}
+
+		if account_details:
+			row.update(account_details)
+
+		self.append('deductions', row)
+		self.set_unallocated_amount()
+
 @frappe.whitelist()
 def get_outstanding_reference_documents(args):
 
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 4c24a9f..d3992d5 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -16,6 +16,20 @@
 			})[0].outstanding_amount;
 
 			frappe.model.set_value(cdt, cdn, "allocated_amount", Math.min(invoice_amount, row.amount));
+
+			frm.call({
+				doc: frm.doc,
+				method: 'get_difference_amount',
+				args: {
+					child_row: row
+				},
+				callback: function(r, rt) {
+					if(r.message) {
+						frappe.model.set_value(cdt, cdn,
+							"difference_amount", r.message);
+					}
+				}
+			});
 		}
 	}
 });
@@ -104,6 +118,91 @@
 
 	reconcile: function() {
 		var me = this;
+		var show_dialog = me.frm.doc.payments.filter(d => d.difference_amount && !d.difference_account);
+
+		if (show_dialog && show_dialog.length) {
+
+			this.data = [];
+			const dialog = new frappe.ui.Dialog({
+				title: __("Select Difference Account"),
+				fields: [
+					{
+						fieldname: "payments", fieldtype: "Table", label: __("Payments"),
+						data: this.data, in_place_edit: true,
+						get_data: () => {
+							return this.data;
+						},
+						fields: [{
+							fieldtype:'Data',
+							fieldname:"docname",
+							in_list_view: 1,
+							hidden: 1
+						}, {
+							fieldtype:'Data',
+							fieldname:"reference_name",
+							label: __("Voucher No"),
+							in_list_view: 1,
+							read_only: 1
+						}, {
+							fieldtype:'Link',
+							options: 'Account',
+							in_list_view: 1,
+							label: __("Difference Account"),
+							fieldname: 'difference_account',
+							reqd: 1,
+							get_query: function() {
+								return {
+									filters: {
+										company: me.frm.doc.company,
+										is_group: 0
+									}
+								}
+							}
+						}, {
+							fieldtype:'Currency',
+							in_list_view: 1,
+							label: __("Difference Amount"),
+							fieldname: 'difference_amount',
+							read_only: 1
+						}]
+					},
+				],
+				primary_action: function() {
+					const args = dialog.get_values()["payments"];
+
+					args.forEach(d => {
+						frappe.model.set_value("Payment Reconciliation Payment", d.docname,
+							"difference_account", d.difference_account);
+					});
+
+					me.reconcile_payment_entries();
+					dialog.hide();
+				},
+				primary_action_label: __('Reconcile Entries')
+			});
+
+			this.frm.doc.payments.forEach(d => {
+				if (d.difference_amount && !d.difference_account) {
+					dialog.fields_dict.payments.df.data.push({
+						'docname': d.name,
+						'reference_name': d.reference_name,
+						'difference_amount': d.difference_amount,
+						'difference_account': d.difference_account,
+					});
+				}
+			});
+
+			this.data = dialog.fields_dict.payments.df.data;
+			dialog.fields_dict.payments.grid.refresh();
+			dialog.show();
+		} else {
+			this.reconcile_payment_entries();
+		}
+	},
+
+	reconcile_payment_entries: function() {
+		var me = this;
+
 		return this.frm.call({
 			doc: me.frm.doc,
 			method: 'reconcile',
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 9e7c3eb..b74eed5 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -3,10 +3,11 @@
 
 from __future__ import unicode_literals
 import frappe, erpnext
-from frappe.utils import flt
+from frappe.utils import flt, today
 from frappe import msgprint, _
 from frappe.model.document import Document
-from erpnext.accounts.utils import get_outstanding_invoices
+from erpnext.accounts.utils import (get_outstanding_invoices,
+	update_reference_in_payment_entry, reconcile_against_document)
 from erpnext.controllers.accounts_controller import get_advance_payment_entries
 
 class PaymentReconciliation(Document):
@@ -20,14 +21,16 @@
 		payment_entries = self.get_payment_entries()
 		journal_entries = self.get_jv_entries()
 
-		self.add_payment_entries(payment_entries + journal_entries)
+		if self.party_type in ["Customer", "Supplier"]:
+			dr_or_cr_notes = self.get_dr_or_cr_notes()
+
+		self.add_payment_entries(payment_entries + journal_entries + dr_or_cr_notes)
 
 	def get_payment_entries(self):
 		order_doctype = "Sales Order" if self.party_type=="Customer" else "Purchase Order"
-
 		payment_entries = get_advance_payment_entries(self.party_type, self.party,
 			self.receivable_payable_account, order_doctype, against_all_orders=True, limit=self.limit)
-			
+
 		return payment_entries
 
 	def get_jv_entries(self):
@@ -37,7 +40,7 @@
 		bank_account_condition = "t2.against_account like %(bank_cash_account)s" \
 				if self.bank_cash_account else "1=1"
 
-		limit_cond = "limit %s" % (self.limit or 1000)
+		limit_cond = "limit %s" % self.limit if self.limit else ""
 
 		journal_entries = frappe.db.sql("""
 			select
@@ -72,6 +75,34 @@
 
 		return list(journal_entries)
 
+	def get_dr_or_cr_notes(self):
+		dr_or_cr = ("credit_in_account_currency"
+			if erpnext.get_party_account_type(self.party_type) == 'Receivable' else "debit_in_account_currency")
+
+		reconciled_dr_or_cr =  ("debit_in_account_currency"
+			if dr_or_cr == "credit_in_account_currency" else "credit_in_account_currency")
+
+		voucher_type = ('Sales Invoice'
+			if self.party_type == 'Customer' else "Purchase Invoice")
+
+		return frappe.db.sql(""" SELECT `tab{doc}`.name as reference_name, %(voucher_type)s as reference_type,
+				(sum(`tabGL Entry`.{dr_or_cr}) - sum(`tabGL Entry`.{reconciled_dr_or_cr})) as amount
+			FROM `tab{doc}`, `tabGL Entry`
+			WHERE
+				(`tab{doc}`.name = `tabGL Entry`.against_voucher or `tab{doc}`.name = `tabGL Entry`.voucher_no)
+				and `tab{doc}`.is_return = 1 and `tabGL Entry`.against_voucher_type = %(voucher_type)s
+				and `tab{doc}`.docstatus = 1 and `tabGL Entry`.party = %(party)s
+				and `tabGL Entry`.party_type = %(party_type)s and `tabGL Entry`.account = %(account)s
+			GROUP BY `tabSales Invoice`.name
+			Having
+				amount > 0
+		""".format(doc=voucher_type, dr_or_cr=dr_or_cr, reconciled_dr_or_cr=reconciled_dr_or_cr), {
+			'party': self.party,
+			'party_type': self.party_type,
+			'voucher_type': voucher_type,
+			'account': self.receivable_payable_account
+		}, as_dict=1)
+
 	def add_payment_entries(self, entries):
 		self.set('payments', [])
 		for e in entries:
@@ -84,7 +115,10 @@
 		condition = self.check_condition()
 
 		non_reconciled_invoices = get_outstanding_invoices(self.party_type, self.party,
-			self.receivable_payable_account, condition=condition, limit=self.limit)
+			self.receivable_payable_account, condition=condition)
+
+		if self.limit:
+			non_reconciled_invoices = non_reconciled_invoices[:self.limit]
 
 		self.add_invoice_entries(non_reconciled_invoices)
 
@@ -112,36 +146,67 @@
 			if erpnext.get_party_account_type(self.party_type) == 'Receivable' else "debit_in_account_currency")
 
 		lst = []
+		dr_or_cr_notes = []
 		for e in self.get('payments'):
+			reconciled_entry = []
 			if e.invoice_number and e.allocated_amount:
-				lst.append(frappe._dict({
-					'voucher_type': e.reference_type,
-					'voucher_no' : e.reference_name,
-					'voucher_detail_no' : e.reference_row,
-					'against_voucher_type' : e.invoice_type,
-					'against_voucher'  : e.invoice_number,
-					'account' : self.receivable_payable_account,
-					'party_type': self.party_type,
-					'party': self.party,
-					'is_advance' : e.is_advance,
-					'dr_or_cr' : dr_or_cr,
-					'unadjusted_amount' : flt(e.amount),
-					'allocated_amount' : flt(e.allocated_amount)
-				}))
+				if e.reference_type in ['Sales Invoice', 'Purchase Invoice']:
+					reconciled_entry = dr_or_cr_notes
+				else:
+					reconciled_entry = lst
+
+				reconciled_entry.append(self.get_payment_details(e, dr_or_cr))
 
 		if lst:
-			from erpnext.accounts.utils import reconcile_against_document
 			reconcile_against_document(lst)
 
-			msgprint(_("Successfully Reconciled"))
-			self.get_unreconciled_entries()
+		if dr_or_cr_notes:
+			reconcile_dr_cr_note(dr_or_cr_notes)
+
+		msgprint(_("Successfully Reconciled"))
+		self.get_unreconciled_entries()
+
+	def get_payment_details(self, row, dr_or_cr):
+		return frappe._dict({
+			'voucher_type': row.reference_type,
+			'voucher_no' : row.reference_name,
+			'voucher_detail_no' : row.reference_row,
+			'against_voucher_type' : row.invoice_type,
+			'against_voucher'  : row.invoice_number,
+			'account' : self.receivable_payable_account,
+			'party_type': self.party_type,
+			'party': self.party,
+			'is_advance' : row.is_advance,
+			'dr_or_cr' : dr_or_cr,
+			'unadjusted_amount' : flt(row.amount),
+			'allocated_amount' : flt(row.allocated_amount),
+			'difference_amount': row.difference_amount,
+			'difference_account': row.difference_account
+		})
+
+	def get_difference_amount(self, child_row):
+		if child_row.get("reference_type") != 'Payment Entry': return
+
+		child_row = frappe._dict(child_row)
+
+		if child_row.invoice_number and " | " in child_row.invoice_number:
+			child_row.invoice_type, child_row.invoice_number = child_row.invoice_number.split(" | ")
+
+		dr_or_cr = ("credit_in_account_currency"
+			if erpnext.get_party_account_type(self.party_type) == 'Receivable' else "debit_in_account_currency")
+
+		row = self.get_payment_details(child_row, dr_or_cr)
+
+		doc = frappe.get_doc(row.voucher_type, row.voucher_no)
+		update_reference_in_payment_entry(row, doc, do_not_save=True)
+
+		return doc.difference_amount
 
 	def check_mandatory_to_fetch(self):
 		for fieldname in ["company", "party_type", "party", "receivable_payable_account"]:
 			if not self.get(fieldname):
 				frappe.throw(_("Please select {0} first").format(self.meta.get_label(fieldname)))
 
-
 	def validate_invoice(self):
 		if not self.get("invoices"):
 			frappe.throw(_("No records found in the Invoice table"))
@@ -186,3 +251,41 @@
 			cond += " and `{0}` <= {1}".format(dr_or_cr, flt(self.maximum_amount))
 
 		return cond
+
+def reconcile_dr_cr_note(dr_cr_notes):
+	for d in dr_cr_notes:
+		voucher_type = ('Credit Note'
+			if d.voucher_type == 'Sales Invoice' else 'Debit Note')
+
+		dr_or_cr = ('credit_in_account_currency'
+			if d.reference_type == 'Sales Invoice' else 'debit_in_account_currency')
+
+		reconcile_dr_or_cr = ('debit_in_account_currency'
+			if dr_or_cr == 'credit_in_account_currency' else 'credit_in_account_currency')
+
+		jv = frappe.get_doc({
+			"doctype": "Journal Entry",
+			"voucher_type": voucher_type,
+			"posting_date": today(),
+			"accounts": [
+				{
+					'account': d.account,
+					'party': d.party,
+					'party_type': d.party_type,
+					reconcile_dr_or_cr: (abs(d.allocated_amount)
+						if abs(d.unadjusted_amount) > abs(d.allocated_amount) else abs(d.unadjusted_amount)),
+					'reference_type': d.against_voucher_type,
+					'reference_name': d.against_voucher
+				},
+				{
+					'account': d.account,
+					'party': d.party,
+					'party_type': d.party_type,
+					dr_or_cr: abs(d.allocated_amount),
+					'reference_type': d.voucher_type,
+					'reference_name': d.voucher_no
+				}
+			]
+		})
+
+		jv.submit()
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index 814257c..018bfd0 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -1,389 +1,127 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2014-07-09 16:13:35.452759", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "creation": "2014-07-09 16:13:35.452759",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "field_order": [
+  "reference_type",
+  "reference_name",
+  "posting_date",
+  "is_advance",
+  "reference_row",
+  "col_break1",
+  "invoice_number",
+  "amount",
+  "allocated_amount",
+  "section_break_10",
+  "difference_account",
+  "difference_amount",
+  "sec_break1",
+  "remark"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_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": "Reference Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "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
-  }, 
+   "fieldname": "reference_type",
+   "fieldtype": "Link",
+   "label": "Reference Type",
+   "options": "DocType",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Dynamic 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": "Reference Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "reference_type", 
-   "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
-  }, 
+   "columns": 2,
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Reference Name",
+   "options": "reference_type",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "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": "Posting Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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
-  }, 
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "label": "Posting Date",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_advance", 
-   "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": "Is Advance", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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
-  }, 
+   "fieldname": "is_advance",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Is Advance",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_row", 
-   "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": "Reference Row", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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
-  }, 
+   "fieldname": "reference_row",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Reference Row",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column 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": "", 
-   "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
-  }, 
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "invoice_number", 
-   "fieldtype": "Select", 
-   "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": "Invoice Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "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": 0
-  }, 
+   "columns": 2,
+   "fieldname": "invoice_number",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Invoice Number",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "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": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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
-  }, 
+   "columns": 2,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "allocated_amount", 
-   "fieldtype": "Currency", 
-   "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": "Allocated amount", 
-   "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": 0
-  }, 
+   "columns": 2,
+   "fieldname": "allocated_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Allocated amount",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sec_break1", 
-   "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": "", 
-   "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
-  }, 
+   "fieldname": "sec_break1",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "remark", 
-   "fieldtype": "Small Text", 
-   "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": "Remark", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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
+   "fieldname": "remark",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Remark",
+   "read_only": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "difference_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Difference Account",
+   "options": "Account"
+  },
+  {
+   "fieldname": "difference_amount",
+   "fieldtype": "Currency",
+   "label": "Difference Amount",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_10",
+   "fieldtype": "Section Break"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2019-01-07 16:52:07.567027", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Reconciliation Payment", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "modified": "2019-06-24 00:08:11.150796",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Payment Reconciliation Payment",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 9a95e08..a94d127 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -220,7 +220,12 @@
 
 	if args.transaction_type=="selling":
 		if args.customer and not (args.customer_group and args.territory):
-			customer = frappe.get_cached_value("Customer", args.customer, ["customer_group", "territory"])
+
+			if args.quotation_to and args.quotation_to != 'Customer':
+				customer = frappe._dict()
+			else:
+				customer = frappe.get_cached_value("Customer", args.customer, ["customer_group", "territory"])
+
 			if customer:
 				args.customer_group, args.territory = customer
 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index d224961..f4b656d 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -157,7 +157,7 @@
 	can_change_release_date: function(date) {
 		const diff = frappe.datetime.get_diff(date, frappe.datetime.nowdate());
 		if (diff < 0) {
-			frappe.throw('New release date should be in the future');
+			frappe.throw(__('New release date should be in the future'));
 			return false;
 		} else {
 			return true;
@@ -523,8 +523,13 @@
 	},
 
 	onload: function(frm) {
-		if(frm.doc.__onload && !frm.doc.__onload.supplier_tds) {
-			me.frm.set_df_property("apply_tds", "read_only", 1);
+		if(frm.doc.__onload) {
+			if(frm.doc.supplier) {
+				frm.doc.apply_tds = frm.doc.__onload.supplier_tds ? 1 : 0;
+			}
+			if(!frm.doc.__onload.supplier_tds) {
+				frm.set_df_property("apply_tds", "read_only", 1);
+			}
 		}
 
 		erpnext.queries.setup_queries(frm, "Warehouse", function() {
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 0d9a46b..73c4bc1 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1,1342 +1,1349 @@
 {
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-21 16:16:39",
- "doctype": "DocType",
- "document_type": "Document",
- "field_order": [
-  "title",
-  "naming_series",
-  "supplier",
-  "supplier_name",
-  "tax_id",
-  "due_date",
-  "is_paid",
-  "is_return",
-  "apply_tds",
-  "column_break1",
-  "company",
-  "posting_date",
-  "posting_time",
-  "set_posting_time",
-  "amended_from",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "sb_14",
-  "on_hold",
-  "release_date",
-  "cb_17",
-  "hold_comment",
-  "supplier_invoice_details",
-  "bill_no",
-  "column_break_15",
-  "bill_date",
-  "returns",
-  "return_against",
-  "section_addresses",
-  "supplier_address",
-  "address_display",
-  "contact_person",
-  "contact_display",
-  "contact_mobile",
-  "contact_email",
-  "col_break_address",
-  "shipping_address",
-  "shipping_address_display",
-  "currency_and_price_list",
-  "currency",
-  "conversion_rate",
-  "column_break2",
-  "buying_price_list",
-  "price_list_currency",
-  "plc_conversion_rate",
-  "ignore_pricing_rule",
-  "sec_warehouse",
-  "set_warehouse",
-  "rejected_warehouse",
-  "col_break_warehouse",
-  "is_subcontracted",
-  "supplier_warehouse",
-  "items_section",
-  "update_stock",
-  "scan_barcode",
-  "items",
-  "pricing_rule_details",
-  "pricing_rules",
-  "raw_materials_supplied",
-  "supplied_items",
-  "section_break_26",
-  "total_qty",
-  "base_total",
-  "base_net_total",
-  "column_break_28",
-  "total",
-  "net_total",
-  "total_net_weight",
-  "taxes_section",
-  "tax_category",
-  "column_break_49",
-  "shipping_rule",
-  "section_break_51",
-  "taxes_and_charges",
-  "taxes",
-  "sec_tax_breakup",
-  "other_charges_calculation",
-  "totals",
-  "base_taxes_and_charges_added",
-  "base_taxes_and_charges_deducted",
-  "base_total_taxes_and_charges",
-  "column_break_40",
-  "taxes_and_charges_added",
-  "taxes_and_charges_deducted",
-  "total_taxes_and_charges",
-  "section_break_44",
-  "apply_discount_on",
-  "base_discount_amount",
-  "column_break_46",
-  "additional_discount_percentage",
-  "discount_amount",
-  "section_break_49",
-  "base_grand_total",
-  "base_rounding_adjustment",
-  "base_rounded_total",
-  "base_in_words",
-  "column_break8",
-  "grand_total",
-  "rounding_adjustment",
-  "rounded_total",
-  "in_words",
-  "total_advance",
-  "outstanding_amount",
-  "disable_rounded_total",
-  "payments_section",
-  "mode_of_payment",
-  "cash_bank_account",
-  "col_br_payments",
-  "paid_amount",
-  "base_paid_amount",
-  "write_off",
-  "write_off_amount",
-  "base_write_off_amount",
-  "column_break_61",
-  "write_off_account",
-  "write_off_cost_center",
-  "advances_section",
-  "allocate_advances_automatically",
-  "get_advances",
-  "advances",
-  "payment_schedule_section",
-  "payment_terms_template",
-  "payment_schedule",
-  "terms_section_break",
-  "tc_name",
-  "terms",
-  "printing_settings",
-  "letter_head",
-  "group_same_items",
-  "column_break_112",
-  "select_print_heading",
-  "language",
-  "more_info",
-  "credit_to",
-  "party_account_currency",
-  "is_opening",
-  "against_expense_account",
-  "column_break_63",
-  "status",
-  "inter_company_invoice_reference",
-  "remarks",
-  "subscription_section",
-  "from_date",
-  "to_date",
-  "column_break_114",
-  "auto_repeat",
-  "update_auto_repeat_reference"
- ],
- "fields": [
-  {
-   "allow_on_submit": 1,
-   "default": "{supplier_name}",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Title",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "ACC-PINV-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Supplier",
-   "oldfieldname": "supplier",
-   "oldfieldtype": "Link",
-   "options": "Supplier",
-   "print_hide": 1,
-   "search_index": 1
-  },
-  {
-   "bold": 1,
-   "depends_on": "supplier",
-   "fetch_from": "supplier.supplier_name",
-   "fieldname": "supplier_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Supplier Name",
-   "oldfieldname": "supplier_name",
-   "oldfieldtype": "Data",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "supplier.tax_id",
-   "fieldname": "tax_id",
-   "fieldtype": "Read Only",
-   "label": "Tax Id",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "due_date",
-   "fieldtype": "Date",
-   "label": "Due Date",
-   "oldfieldname": "due_date",
-   "oldfieldtype": "Date"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_paid",
-   "fieldtype": "Check",
-   "label": "Is Paid",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_return",
-   "fieldtype": "Check",
-   "label": "Is Return (Debit Note)",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "apply_tds",
-   "fieldtype": "Check",
-   "label": "Apply Tax Withholding Amount",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Company",
-   "options": "Company",
-   "print_hide": 1,
-   "remember_last_selected_value": 1
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Date",
-   "oldfieldname": "posting_date",
-   "oldfieldtype": "Date",
-   "print_hide": 1,
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "posting_time",
-   "fieldtype": "Time",
-   "label": "Posting Time",
-   "no_copy": 1,
-   "print_hide": 1,
-   "print_width": "100px",
-   "width": "100px"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "set_posting_time",
-   "fieldtype": "Check",
-   "label": "Edit Posting Date and Time",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Link",
-   "options": "Purchase Invoice",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.on_hold",
-   "fieldname": "sb_14",
-   "fieldtype": "Section Break",
-   "label": "Hold Invoice"
-  },
-  {
-   "default": "0",
-   "fieldname": "on_hold",
-   "fieldtype": "Check",
-   "label": "Hold Invoice"
-  },
-  {
-   "depends_on": "eval:doc.on_hold",
-   "description": "Once set, this invoice will be on hold till the set date",
-   "fieldname": "release_date",
-   "fieldtype": "Date",
-   "label": "Release Date"
-  },
-  {
-   "fieldname": "cb_17",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval:doc.on_hold",
-   "fieldname": "hold_comment",
-   "fieldtype": "Small Text",
-   "label": "Reason For Putting On Hold"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "bill_no",
-   "fieldname": "supplier_invoice_details",
-   "fieldtype": "Section Break",
-   "label": "Supplier Invoice Details"
-  },
-  {
-   "fieldname": "bill_no",
-   "fieldtype": "Data",
-   "label": "Supplier Invoice No",
-   "oldfieldname": "bill_no",
-   "oldfieldtype": "Data",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_15",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "bill_date",
-   "fieldtype": "Date",
-   "label": "Supplier Invoice Date",
-   "oldfieldname": "bill_date",
-   "oldfieldtype": "Date",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "return_against",
-   "fieldname": "returns",
-   "fieldtype": "Section Break",
-   "label": "Returns"
-  },
-  {
-   "depends_on": "return_against",
-   "fieldname": "return_against",
-   "fieldtype": "Link",
-   "label": "Return Against Purchase Invoice",
-   "no_copy": 1,
-   "options": "Purchase Invoice",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "section_addresses",
-   "fieldtype": "Section Break",
-   "label": "Address and Contact"
-  },
-  {
-   "fieldname": "supplier_address",
-   "fieldtype": "Link",
-   "label": "Select Supplier Address",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "address_display",
-   "fieldtype": "Small Text",
-   "label": "Address",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_person",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "label": "Contact Person",
-   "options": "Contact",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "contact_display",
-   "fieldtype": "Small Text",
-   "label": "Contact",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_mobile",
-   "fieldtype": "Small Text",
-   "label": "Mobile No",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_email",
-   "fieldtype": "Small Text",
-   "label": "Contact Email",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "col_break_address",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "shipping_address",
-   "fieldtype": "Link",
-   "label": "Select Shipping Address",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
-   "label": "Shipping Address",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "currency_and_price_list",
-   "fieldtype": "Section Break",
-   "label": "Currency and Price List",
-   "options": "fa fa-tag"
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "label": "Currency",
-   "oldfieldname": "currency",
-   "oldfieldtype": "Select",
-   "options": "Currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "conversion_rate",
-   "fieldtype": "Float",
-   "label": "Exchange Rate",
-   "oldfieldname": "conversion_rate",
-   "oldfieldtype": "Currency",
-   "precision": "9",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "buying_price_list",
-   "fieldtype": "Link",
-   "label": "Price List",
-   "options": "Price List",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "price_list_currency",
-   "fieldtype": "Link",
-   "label": "Price List Currency",
-   "options": "Currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "plc_conversion_rate",
-   "fieldtype": "Float",
-   "label": "Price List Exchange Rate",
-   "precision": "9",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "ignore_pricing_rule",
-   "fieldtype": "Check",
-   "label": "Ignore Pricing Rule",
-   "no_copy": 1,
-   "permlevel": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "sec_warehouse",
-   "fieldtype": "Section Break"
-  },
-  {
-   "depends_on": "update_stock",
-   "fieldname": "set_warehouse",
-   "fieldtype": "Link",
-   "label": "Set Accepted Warehouse",
-   "options": "Warehouse",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "update_stock",
-   "description": "Warehouse where you are maintaining stock of rejected items",
-   "fieldname": "rejected_warehouse",
-   "fieldtype": "Link",
-   "label": "Rejected Warehouse",
-   "no_copy": 1,
-   "options": "Warehouse",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "col_break_warehouse",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "No",
-   "fieldname": "is_subcontracted",
-   "fieldtype": "Select",
-   "label": "Raw Materials Supplied",
-   "options": "No\nYes",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "eval:doc.is_subcontracted==\"Yes\"",
-   "fieldname": "supplier_warehouse",
-   "fieldtype": "Link",
-   "label": "Supplier Warehouse",
-   "no_copy": 1,
-   "options": "Warehouse",
-   "print_hide": 1,
-   "print_width": "50px",
-   "width": "50px"
-  },
-  {
-   "fieldname": "items_section",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart"
-  },
-  {
-   "default": "0",
-   "fieldname": "update_stock",
-   "fieldtype": "Check",
-   "label": "Update Stock",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "scan_barcode",
-   "fieldtype": "Data",
-   "label": "Scan Barcode"
-  },
-  {
-   "allow_bulk_edit": 1,
-   "fieldname": "items",
-   "fieldtype": "Table",
-   "label": "Items",
-   "oldfieldname": "entries",
-   "oldfieldtype": "Table",
-   "options": "Purchase Invoice Item",
-   "reqd": 1
-  },
-  {
-   "fieldname": "pricing_rule_details",
-   "fieldtype": "Section Break",
-   "label": "Pricing Rules"
-  },
-  {
-   "fieldname": "pricing_rules",
-   "fieldtype": "Table",
-   "label": "Pricing Rule Detail",
-   "options": "Pricing Rule Detail",
-   "read_only": 1
-  },
-  {
-   "collapsible_depends_on": "supplied_items",
-   "fieldname": "raw_materials_supplied",
-   "fieldtype": "Section Break",
-   "label": "Raw Materials Supplied"
-  },
-  {
-   "fieldname": "supplied_items",
-   "fieldtype": "Table",
-   "label": "Supplied Items",
-   "options": "Purchase Receipt Item Supplied",
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_26",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "total_qty",
-   "fieldtype": "Float",
-   "label": "Total Quantity",
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_total",
-   "fieldtype": "Currency",
-   "label": "Total (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_net_total",
-   "fieldtype": "Currency",
-   "label": "Net Total (Company Currency)",
-   "oldfieldname": "net_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_28",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total",
-   "fieldtype": "Currency",
-   "label": "Total",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "net_total",
-   "fieldtype": "Currency",
-   "label": "Net Total",
-   "oldfieldname": "net_total_import",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_net_weight",
-   "fieldtype": "Float",
-   "label": "Total Net Weight",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "taxes_section",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money"
-  },
-  {
-   "fieldname": "tax_category",
-   "fieldtype": "Link",
-   "label": "Tax Category",
-   "options": "Tax Category",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_49",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "shipping_rule",
-   "fieldtype": "Link",
-   "label": "Shipping Rule",
-   "options": "Shipping Rule",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "section_break_51",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "taxes_and_charges",
-   "fieldtype": "Link",
-   "label": "Purchase Taxes and Charges Template",
-   "oldfieldname": "purchase_other_charges",
-   "oldfieldtype": "Link",
-   "options": "Purchase Taxes and Charges Template",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "label": "Purchase Taxes and Charges",
-   "oldfieldname": "purchase_tax_details",
-   "oldfieldtype": "Table",
-   "options": "Purchase Taxes and Charges"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sec_tax_breakup",
-   "fieldtype": "Section Break",
-   "label": "Tax Breakup"
-  },
-  {
-   "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
-   "label": "Taxes and Charges Calculation",
-   "no_copy": 1,
-   "oldfieldtype": "HTML",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "totals",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money"
-  },
-  {
-   "fieldname": "base_taxes_and_charges_added",
-   "fieldtype": "Currency",
-   "label": "Taxes and Charges Added (Company Currency)",
-   "oldfieldname": "other_charges_added",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_taxes_and_charges_deducted",
-   "fieldtype": "Currency",
-   "label": "Taxes and Charges Deducted (Company Currency)",
-   "oldfieldname": "other_charges_deducted",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges (Company Currency)",
-   "oldfieldname": "total_tax",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_40",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "taxes_and_charges_added",
-   "fieldtype": "Currency",
-   "label": "Taxes and Charges Added",
-   "oldfieldname": "other_charges_added_import",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "taxes_and_charges_deducted",
-   "fieldtype": "Currency",
-   "label": "Taxes and Charges Deducted",
-   "oldfieldname": "other_charges_deducted_import",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "discount_amount",
-   "fieldname": "section_break_44",
-   "fieldtype": "Section Break",
-   "label": "Additional Discount"
-  },
-  {
-   "default": "Grand Total",
-   "fieldname": "apply_discount_on",
-   "fieldtype": "Select",
-   "label": "Apply Additional Discount On",
-   "options": "\nGrand Total\nNet Total",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_discount_amount",
-   "fieldtype": "Currency",
-   "label": "Additional Discount Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_46",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "additional_discount_percentage",
-   "fieldtype": "Float",
-   "label": "Additional Discount Percentage",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "discount_amount",
-   "fieldtype": "Currency",
-   "label": "Additional Discount Amount",
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "section_break_49",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "base_grand_total",
-   "fieldtype": "Currency",
-   "label": "Grand Total (Company Currency)",
-   "oldfieldname": "grand_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_rounding_adjustment",
-   "fieldtype": "Currency",
-   "label": "Rounding Adjustment (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:!doc.disable_rounded_total",
-   "fieldname": "base_rounded_total",
-   "fieldtype": "Currency",
-   "label": "Rounded Total (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_in_words",
-   "fieldtype": "Data",
-   "label": "In Words (Company Currency)",
-   "oldfieldname": "in_words",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break8",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_hide": 1,
-   "width": "50%"
-  },
-  {
-   "fieldname": "grand_total",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Grand Total",
-   "oldfieldname": "grand_total_import",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "rounding_adjustment",
-   "fieldtype": "Currency",
-   "label": "Rounding Adjustment",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:!doc.disable_rounded_total",
-   "fieldname": "rounded_total",
-   "fieldtype": "Currency",
-   "label": "Rounded Total",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "in_words",
-   "fieldtype": "Data",
-   "label": "In Words",
-   "oldfieldname": "in_words_import",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_advance",
-   "fieldtype": "Currency",
-   "label": "Total Advance",
-   "no_copy": 1,
-   "oldfieldname": "total_advance",
-   "oldfieldtype": "Currency",
-   "options": "party_account_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "outstanding_amount",
-   "fieldtype": "Currency",
-   "label": "Outstanding Amount",
-   "no_copy": 1,
-   "oldfieldname": "outstanding_amount",
-   "oldfieldtype": "Currency",
-   "options": "party_account_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "grand_total",
-   "fieldname": "disable_rounded_total",
-   "fieldtype": "Check",
-   "label": "Disable Rounded Total"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "paid_amount",
-   "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)",
-   "fieldname": "payments_section",
-   "fieldtype": "Section Break",
-   "label": "Payments"
-  },
-  {
-   "fieldname": "mode_of_payment",
-   "fieldtype": "Link",
-   "label": "Mode of Payment",
-   "options": "Mode of Payment",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "cash_bank_account",
-   "fieldtype": "Link",
-   "label": "Cash/Bank Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "col_br_payments",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "is_paid",
-   "fieldname": "paid_amount",
-   "fieldtype": "Currency",
-   "label": "Paid Amount",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_paid_amount",
-   "fieldtype": "Currency",
-   "label": "Paid Amount (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "write_off_amount",
-   "depends_on": "grand_total",
-   "fieldname": "write_off",
-   "fieldtype": "Section Break",
-   "label": "Write Off"
-  },
-  {
-   "fieldname": "write_off_amount",
-   "fieldtype": "Currency",
-   "label": "Write Off Amount",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_write_off_amount",
-   "fieldtype": "Currency",
-   "label": "Write Off Amount (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_61",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval:flt(doc.write_off_amount)!=0",
-   "fieldname": "write_off_account",
-   "fieldtype": "Link",
-   "label": "Write Off Account",
-   "options": "Account",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "eval:flt(doc.write_off_amount)!=0",
-   "fieldname": "write_off_cost_center",
-   "fieldtype": "Link",
-   "label": "Write Off Cost Center",
-   "options": "Cost Center",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "advances",
-   "fieldname": "advances_section",
-   "fieldtype": "Section Break",
-   "label": "Advance Payments",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "allocate_advances_automatically",
-   "fieldtype": "Check",
-   "label": "Set Advances and Allocate (FIFO)"
-  },
-  {
-   "depends_on": "eval:!doc.allocate_advances_automatically",
-   "fieldname": "get_advances",
-   "fieldtype": "Button",
-   "label": "Get Advances Paid",
-   "oldfieldtype": "Button",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "advances",
-   "fieldtype": "Table",
-   "label": "Advances",
-   "no_copy": 1,
-   "oldfieldname": "advance_allocation_details",
-   "oldfieldtype": "Table",
-   "options": "Purchase Invoice Advance",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:(!doc.is_return)",
-   "fieldname": "payment_schedule_section",
-   "fieldtype": "Section Break",
-   "label": "Payment Terms"
-  },
-  {
-   "fieldname": "payment_terms_template",
-   "fieldtype": "Link",
-   "label": "Payment Terms Template",
-   "options": "Payment Terms Template"
-  },
-  {
-   "fieldname": "payment_schedule",
-   "fieldtype": "Table",
-   "label": "Payment Schedule",
-   "no_copy": 1,
-   "options": "Payment Schedule",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "terms",
-   "fieldname": "terms_section_break",
-   "fieldtype": "Section Break",
-   "label": "Terms and Conditions",
-   "options": "fa fa-legal"
-  },
-  {
-   "fieldname": "tc_name",
-   "fieldtype": "Link",
-   "label": "Terms",
-   "options": "Terms and Conditions",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "terms",
-   "fieldtype": "Text Editor",
-   "label": "Terms and Conditions1"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "printing_settings",
-   "fieldtype": "Section Break",
-   "label": "Printing Settings"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "label": "Letter Head",
-   "options": "Letter Head",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "0",
-   "fieldname": "group_same_items",
-   "fieldtype": "Check",
-   "label": "Group same items",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_112",
-   "fieldtype": "Column Break"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "select_print_heading",
-   "fieldtype": "Link",
-   "label": "Print Heading",
-   "no_copy": 1,
-   "oldfieldname": "select_print_heading",
-   "oldfieldtype": "Link",
-   "options": "Print Heading",
-   "print_hide": 1,
-   "report_hide": 1
-  },
-  {
-   "fieldname": "language",
-   "fieldtype": "Data",
-   "label": "Print Language",
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "More Information",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-file-text",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "credit_to",
-   "fieldtype": "Link",
-   "label": "Credit To",
-   "oldfieldname": "credit_to",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "print_hide": 1,
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "party_account_currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Party Account Currency",
-   "no_copy": 1,
-   "options": "Currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "No",
-   "fieldname": "is_opening",
-   "fieldtype": "Select",
-   "label": "Is Opening",
-   "oldfieldname": "is_opening",
-   "oldfieldtype": "Select",
-   "options": "No\nYes",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "against_expense_account",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Against Expense Account",
-   "no_copy": 1,
-   "oldfieldname": "against_expense_account",
-   "oldfieldtype": "Small Text",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_63",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "Draft",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_standard_filter": 1,
-   "label": "Status",
-   "options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled"
-  },
-  {
-   "fieldname": "inter_company_invoice_reference",
-   "fieldtype": "Link",
-   "label": "Inter Company Invoice Reference",
-   "options": "Sales Invoice",
-   "read_only": 1
-  },
-  {
-   "fieldname": "remarks",
-   "fieldtype": "Small Text",
-   "label": "Remarks",
-   "no_copy": 1,
-   "oldfieldname": "remarks",
-   "oldfieldtype": "Text",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription Section",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "description": "Start date of current invoice's period",
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "label": "From Date",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "description": "End date of current invoice's period",
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "label": "To Date",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_114",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "auto_repeat",
-   "fieldtype": "Link",
-   "label": "Auto Repeat",
-   "no_copy": 1,
-   "options": "Auto Repeat",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "depends_on": "eval: doc.auto_repeat",
-   "fieldname": "update_auto_repeat_reference",
-   "fieldtype": "Button",
-   "label": "Update Auto Repeat Reference"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions "
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  }
- ],
- "icon": "fa fa-file-text",
- "idx": 204,
- "is_submittable": 1,
- "modified": "2019-05-25 22:04:28.889159",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Purchase Invoice",
- "name_case": "Title Case",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Purchase User"
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Auditor"
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "role": "Accounts Manager",
-   "write": 1
-  }
- ],
- "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "supplier",
- "title_field": "title",
- "track_changes": 1
-}
\ No newline at end of file
+   "allow_import": 1,
+   "autoname": "naming_series:",
+   "creation": "2013-05-21 16:16:39",
+   "doctype": "DocType",
+   "document_type": "Document",
+   "field_order": [
+    "title",
+    "naming_series",
+    "supplier",
+    "supplier_name",
+    "tax_id",
+    "due_date",
+    "is_paid",
+    "is_return",
+    "apply_tds",
+    "column_break1",
+    "company",
+    "posting_date",
+    "posting_time",
+    "set_posting_time",
+    "amended_from",
+    "accounting_dimensions_section",
+    "cost_center",
+    "dimension_col_break",
+    "sb_14",
+    "on_hold",
+    "release_date",
+    "cb_17",
+    "hold_comment",
+    "supplier_invoice_details",
+    "bill_no",
+    "column_break_15",
+    "bill_date",
+    "returns",
+    "return_against",
+    "section_addresses",
+    "supplier_address",
+    "address_display",
+    "contact_person",
+    "contact_display",
+    "contact_mobile",
+    "contact_email",
+    "col_break_address",
+    "shipping_address",
+    "shipping_address_display",
+    "currency_and_price_list",
+    "currency",
+    "conversion_rate",
+    "column_break2",
+    "buying_price_list",
+    "price_list_currency",
+    "plc_conversion_rate",
+    "ignore_pricing_rule",
+    "sec_warehouse",
+    "set_warehouse",
+    "rejected_warehouse",
+    "col_break_warehouse",
+    "is_subcontracted",
+    "supplier_warehouse",
+    "items_section",
+    "update_stock",
+    "scan_barcode",
+    "items",
+    "pricing_rule_details",
+    "pricing_rules",
+    "raw_materials_supplied",
+    "supplied_items",
+    "section_break_26",
+    "total_qty",
+    "base_total",
+    "base_net_total",
+    "column_break_28",
+    "total",
+    "net_total",
+    "total_net_weight",
+    "taxes_section",
+    "tax_category",
+    "column_break_49",
+    "shipping_rule",
+    "section_break_51",
+    "taxes_and_charges",
+    "taxes",
+    "sec_tax_breakup",
+    "other_charges_calculation",
+    "totals",
+    "base_taxes_and_charges_added",
+    "base_taxes_and_charges_deducted",
+    "base_total_taxes_and_charges",
+    "column_break_40",
+    "taxes_and_charges_added",
+    "taxes_and_charges_deducted",
+    "total_taxes_and_charges",
+    "section_break_44",
+    "apply_discount_on",
+    "base_discount_amount",
+    "column_break_46",
+    "additional_discount_percentage",
+    "discount_amount",
+    "section_break_49",
+    "base_grand_total",
+    "base_rounding_adjustment",
+    "base_rounded_total",
+    "base_in_words",
+    "column_break8",
+    "grand_total",
+    "rounding_adjustment",
+    "rounded_total",
+    "in_words",
+    "total_advance",
+    "outstanding_amount",
+    "disable_rounded_total",
+    "payments_section",
+    "mode_of_payment",
+    "cash_bank_account",
+    "clearance_date",
+    "col_br_payments",
+    "paid_amount",
+    "base_paid_amount",
+    "write_off",
+    "write_off_amount",
+    "base_write_off_amount",
+    "column_break_61",
+    "write_off_account",
+    "write_off_cost_center",
+    "advances_section",
+    "allocate_advances_automatically",
+    "get_advances",
+    "advances",
+    "payment_schedule_section",
+    "payment_terms_template",
+    "payment_schedule",
+    "terms_section_break",
+    "tc_name",
+    "terms",
+    "printing_settings",
+    "letter_head",
+    "group_same_items",
+    "column_break_112",
+    "select_print_heading",
+    "language",
+    "more_info",
+    "credit_to",
+    "party_account_currency",
+    "is_opening",
+    "against_expense_account",
+    "column_break_63",
+    "status",
+    "inter_company_invoice_reference",
+    "remarks",
+    "subscription_section",
+    "from_date",
+    "to_date",
+    "column_break_114",
+    "auto_repeat",
+    "update_auto_repeat_reference"
+   ],
+   "fields": [
+    {
+     "allow_on_submit": 1,
+     "default": "{supplier_name}",
+     "fieldname": "title",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Title",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "naming_series",
+     "fieldtype": "Select",
+     "label": "Series",
+     "no_copy": 1,
+     "oldfieldname": "naming_series",
+     "oldfieldtype": "Select",
+     "options": "ACC-PINV-.YYYY.-",
+     "print_hide": 1,
+     "reqd": 1,
+     "set_only_once": 1
+    },
+    {
+     "fieldname": "supplier",
+     "fieldtype": "Link",
+     "in_standard_filter": 1,
+     "label": "Supplier",
+     "oldfieldname": "supplier",
+     "oldfieldtype": "Link",
+     "options": "Supplier",
+     "print_hide": 1,
+     "search_index": 1
+    },
+    {
+     "bold": 1,
+     "depends_on": "supplier",
+     "fetch_from": "supplier.supplier_name",
+     "fieldname": "supplier_name",
+     "fieldtype": "Data",
+     "in_global_search": 1,
+     "label": "Supplier Name",
+     "oldfieldname": "supplier_name",
+     "oldfieldtype": "Data",
+     "read_only": 1
+    },
+    {
+     "fetch_from": "supplier.tax_id",
+     "fieldname": "tax_id",
+     "fieldtype": "Read Only",
+     "label": "Tax Id",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "due_date",
+     "fieldtype": "Date",
+     "label": "Due Date",
+     "oldfieldname": "due_date",
+     "oldfieldtype": "Date"
+    },
+    {
+     "default": "0",
+     "fieldname": "is_paid",
+     "fieldtype": "Check",
+     "label": "Is Paid",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "is_return",
+     "fieldtype": "Check",
+     "label": "Is Return (Debit Note)",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "apply_tds",
+     "fieldtype": "Check",
+     "label": "Apply Tax Withholding Amount",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break1",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break",
+     "width": "50%"
+    },
+    {
+     "fieldname": "company",
+     "fieldtype": "Link",
+     "in_standard_filter": 1,
+     "label": "Company",
+     "options": "Company",
+     "print_hide": 1,
+     "remember_last_selected_value": 1
+    },
+    {
+     "fieldname": "cost_center",
+     "fieldtype": "Link",
+     "label": "Cost Center",
+     "options": "Cost Center"
+    },
+    {
+     "default": "Today",
+     "fieldname": "posting_date",
+     "fieldtype": "Date",
+     "in_list_view": 1,
+     "label": "Date",
+     "oldfieldname": "posting_date",
+     "oldfieldtype": "Date",
+     "print_hide": 1,
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "posting_time",
+     "fieldtype": "Time",
+     "label": "Posting Time",
+     "no_copy": 1,
+     "print_hide": 1,
+     "print_width": "100px",
+     "width": "100px"
+    },
+    {
+     "default": "0",
+     "depends_on": "eval:doc.docstatus==0",
+     "fieldname": "set_posting_time",
+     "fieldtype": "Check",
+     "label": "Edit Posting Date and Time",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "amended_from",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Amended From",
+     "no_copy": 1,
+     "oldfieldname": "amended_from",
+     "oldfieldtype": "Link",
+     "options": "Purchase Invoice",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "eval:doc.on_hold",
+     "fieldname": "sb_14",
+     "fieldtype": "Section Break",
+     "label": "Hold Invoice"
+    },
+    {
+     "default": "0",
+     "fieldname": "on_hold",
+     "fieldtype": "Check",
+     "label": "Hold Invoice"
+    },
+    {
+     "depends_on": "eval:doc.on_hold",
+     "description": "Once set, this invoice will be on hold till the set date",
+     "fieldname": "release_date",
+     "fieldtype": "Date",
+     "label": "Release Date"
+    },
+    {
+     "fieldname": "cb_17",
+     "fieldtype": "Column Break"
+    },
+    {
+     "depends_on": "eval:doc.on_hold",
+     "fieldname": "hold_comment",
+     "fieldtype": "Small Text",
+     "label": "Reason For Putting On Hold"
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "bill_no",
+     "fieldname": "supplier_invoice_details",
+     "fieldtype": "Section Break",
+     "label": "Supplier Invoice Details"
+    },
+    {
+     "fieldname": "bill_no",
+     "fieldtype": "Data",
+     "label": "Supplier Invoice No",
+     "oldfieldname": "bill_no",
+     "oldfieldtype": "Data",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_15",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "bill_date",
+     "fieldtype": "Date",
+     "label": "Supplier Invoice Date",
+     "oldfieldname": "bill_date",
+     "oldfieldtype": "Date",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "return_against",
+     "fieldname": "returns",
+     "fieldtype": "Section Break",
+     "label": "Returns"
+    },
+    {
+     "depends_on": "return_against",
+     "fieldname": "return_against",
+     "fieldtype": "Link",
+     "label": "Return Against Purchase Invoice",
+     "no_copy": 1,
+     "options": "Purchase Invoice",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "section_addresses",
+     "fieldtype": "Section Break",
+     "label": "Address and Contact"
+    },
+    {
+     "fieldname": "supplier_address",
+     "fieldtype": "Link",
+     "label": "Select Supplier Address",
+     "options": "Address",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "address_display",
+     "fieldtype": "Small Text",
+     "label": "Address",
+     "read_only": 1
+    },
+    {
+     "fieldname": "contact_person",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "label": "Contact Person",
+     "options": "Contact",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "contact_display",
+     "fieldtype": "Small Text",
+     "label": "Contact",
+     "read_only": 1
+    },
+    {
+     "fieldname": "contact_mobile",
+     "fieldtype": "Small Text",
+     "label": "Mobile No",
+     "read_only": 1
+    },
+    {
+     "fieldname": "contact_email",
+     "fieldtype": "Small Text",
+     "label": "Contact Email",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "col_break_address",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "shipping_address",
+     "fieldtype": "Link",
+     "label": "Select Shipping Address",
+     "options": "Address",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "shipping_address_display",
+     "fieldtype": "Small Text",
+     "label": "Shipping Address",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "currency_and_price_list",
+     "fieldtype": "Section Break",
+     "label": "Currency and Price List",
+     "options": "fa fa-tag"
+    },
+    {
+     "fieldname": "currency",
+     "fieldtype": "Link",
+     "label": "Currency",
+     "oldfieldname": "currency",
+     "oldfieldtype": "Select",
+     "options": "Currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "conversion_rate",
+     "fieldtype": "Float",
+     "label": "Exchange Rate",
+     "oldfieldname": "conversion_rate",
+     "oldfieldtype": "Currency",
+     "precision": "9",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break2",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "buying_price_list",
+     "fieldtype": "Link",
+     "label": "Price List",
+     "options": "Price List",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "price_list_currency",
+     "fieldtype": "Link",
+     "label": "Price List Currency",
+     "options": "Currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "plc_conversion_rate",
+     "fieldtype": "Float",
+     "label": "Price List Exchange Rate",
+     "precision": "9",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "ignore_pricing_rule",
+     "fieldtype": "Check",
+     "label": "Ignore Pricing Rule",
+     "no_copy": 1,
+     "permlevel": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "sec_warehouse",
+     "fieldtype": "Section Break"
+    },
+    {
+     "depends_on": "update_stock",
+     "fieldname": "set_warehouse",
+     "fieldtype": "Link",
+     "label": "Set Accepted Warehouse",
+     "options": "Warehouse",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "update_stock",
+     "description": "Warehouse where you are maintaining stock of rejected items",
+     "fieldname": "rejected_warehouse",
+     "fieldtype": "Link",
+     "label": "Rejected Warehouse",
+     "no_copy": 1,
+     "options": "Warehouse",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "col_break_warehouse",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "No",
+     "fieldname": "is_subcontracted",
+     "fieldtype": "Select",
+     "label": "Raw Materials Supplied",
+     "options": "No\nYes",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "eval:doc.is_subcontracted==\"Yes\"",
+     "fieldname": "supplier_warehouse",
+     "fieldtype": "Link",
+     "label": "Supplier Warehouse",
+     "no_copy": 1,
+     "options": "Warehouse",
+     "print_hide": 1,
+     "print_width": "50px",
+     "width": "50px"
+    },
+    {
+     "fieldname": "items_section",
+     "fieldtype": "Section Break",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-shopping-cart"
+    },
+    {
+     "default": "0",
+     "fieldname": "update_stock",
+     "fieldtype": "Check",
+     "label": "Update Stock",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "scan_barcode",
+     "fieldtype": "Data",
+     "label": "Scan Barcode"
+    },
+    {
+     "allow_bulk_edit": 1,
+     "fieldname": "items",
+     "fieldtype": "Table",
+     "label": "Items",
+     "oldfieldname": "entries",
+     "oldfieldtype": "Table",
+     "options": "Purchase Invoice Item",
+     "reqd": 1
+    },
+    {
+     "fieldname": "pricing_rule_details",
+     "fieldtype": "Section Break",
+     "label": "Pricing Rules"
+    },
+    {
+     "fieldname": "pricing_rules",
+     "fieldtype": "Table",
+     "label": "Pricing Rule Detail",
+     "options": "Pricing Rule Detail",
+     "read_only": 1
+    },
+    {
+     "collapsible_depends_on": "supplied_items",
+     "fieldname": "raw_materials_supplied",
+     "fieldtype": "Section Break",
+     "label": "Raw Materials Supplied"
+    },
+    {
+     "fieldname": "supplied_items",
+     "fieldtype": "Table",
+     "label": "Supplied Items",
+     "options": "Purchase Receipt Item Supplied",
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_26",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "total_qty",
+     "fieldtype": "Float",
+     "label": "Total Quantity",
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_total",
+     "fieldtype": "Currency",
+     "label": "Total (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_net_total",
+     "fieldtype": "Currency",
+     "label": "Net Total (Company Currency)",
+     "oldfieldname": "net_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_28",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "total",
+     "fieldtype": "Currency",
+     "label": "Total",
+     "options": "currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "net_total",
+     "fieldtype": "Currency",
+     "label": "Net Total",
+     "oldfieldname": "net_total_import",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "total_net_weight",
+     "fieldtype": "Float",
+     "label": "Total Net Weight",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "taxes_section",
+     "fieldtype": "Section Break",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money"
+    },
+    {
+     "fieldname": "tax_category",
+     "fieldtype": "Link",
+     "label": "Tax Category",
+     "options": "Tax Category",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_49",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "shipping_rule",
+     "fieldtype": "Link",
+     "label": "Shipping Rule",
+     "options": "Shipping Rule",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "section_break_51",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "taxes_and_charges",
+     "fieldtype": "Link",
+     "label": "Purchase Taxes and Charges Template",
+     "oldfieldname": "purchase_other_charges",
+     "oldfieldtype": "Link",
+     "options": "Purchase Taxes and Charges Template",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "taxes",
+     "fieldtype": "Table",
+     "label": "Purchase Taxes and Charges",
+     "oldfieldname": "purchase_tax_details",
+     "oldfieldtype": "Table",
+     "options": "Purchase Taxes and Charges"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "sec_tax_breakup",
+     "fieldtype": "Section Break",
+     "label": "Tax Breakup"
+    },
+    {
+     "fieldname": "other_charges_calculation",
+     "fieldtype": "Text",
+     "label": "Taxes and Charges Calculation",
+     "no_copy": 1,
+     "oldfieldtype": "HTML",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "totals",
+     "fieldtype": "Section Break",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money"
+    },
+    {
+     "fieldname": "base_taxes_and_charges_added",
+     "fieldtype": "Currency",
+     "label": "Taxes and Charges Added (Company Currency)",
+     "oldfieldname": "other_charges_added",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_taxes_and_charges_deducted",
+     "fieldtype": "Currency",
+     "label": "Taxes and Charges Deducted (Company Currency)",
+     "oldfieldname": "other_charges_deducted",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "label": "Total Taxes and Charges (Company Currency)",
+     "oldfieldname": "total_tax",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_40",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "taxes_and_charges_added",
+     "fieldtype": "Currency",
+     "label": "Taxes and Charges Added",
+     "oldfieldname": "other_charges_added_import",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "taxes_and_charges_deducted",
+     "fieldtype": "Currency",
+     "label": "Taxes and Charges Deducted",
+     "oldfieldname": "other_charges_deducted_import",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "label": "Total Taxes and Charges",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "discount_amount",
+     "fieldname": "section_break_44",
+     "fieldtype": "Section Break",
+     "label": "Additional Discount"
+    },
+    {
+     "default": "Grand Total",
+     "fieldname": "apply_discount_on",
+     "fieldtype": "Select",
+     "label": "Apply Additional Discount On",
+     "options": "\nGrand Total\nNet Total",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "base_discount_amount",
+     "fieldtype": "Currency",
+     "label": "Additional Discount Amount (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_46",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "additional_discount_percentage",
+     "fieldtype": "Float",
+     "label": "Additional Discount Percentage",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "discount_amount",
+     "fieldtype": "Currency",
+     "label": "Additional Discount Amount",
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "section_break_49",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "base_grand_total",
+     "fieldtype": "Currency",
+     "label": "Grand Total (Company Currency)",
+     "oldfieldname": "grand_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_rounding_adjustment",
+     "fieldtype": "Currency",
+     "label": "Rounding Adjustment (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "depends_on": "eval:!doc.disable_rounded_total",
+     "fieldname": "base_rounded_total",
+     "fieldtype": "Currency",
+     "label": "Rounded Total (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_in_words",
+     "fieldtype": "Data",
+     "label": "In Words (Company Currency)",
+     "oldfieldname": "in_words",
+     "oldfieldtype": "Data",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break8",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break",
+     "print_hide": 1,
+     "width": "50%"
+    },
+    {
+     "fieldname": "grand_total",
+     "fieldtype": "Currency",
+     "in_list_view": 1,
+     "label": "Grand Total",
+     "oldfieldname": "grand_total_import",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "rounding_adjustment",
+     "fieldtype": "Currency",
+     "label": "Rounding Adjustment",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "depends_on": "eval:!doc.disable_rounded_total",
+     "fieldname": "rounded_total",
+     "fieldtype": "Currency",
+     "label": "Rounded Total",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "in_words",
+     "fieldtype": "Data",
+     "label": "In Words",
+     "oldfieldname": "in_words_import",
+     "oldfieldtype": "Data",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "total_advance",
+     "fieldtype": "Currency",
+     "label": "Total Advance",
+     "no_copy": 1,
+     "oldfieldname": "total_advance",
+     "oldfieldtype": "Currency",
+     "options": "party_account_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "outstanding_amount",
+     "fieldtype": "Currency",
+     "label": "Outstanding Amount",
+     "no_copy": 1,
+     "oldfieldname": "outstanding_amount",
+     "oldfieldtype": "Currency",
+     "options": "party_account_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "depends_on": "grand_total",
+     "fieldname": "disable_rounded_total",
+     "fieldtype": "Check",
+     "label": "Disable Rounded Total"
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "paid_amount",
+     "depends_on": "eval:doc.is_paid===1||(doc.advances && doc.advances.length>0)",
+     "fieldname": "payments_section",
+     "fieldtype": "Section Break",
+     "label": "Payments"
+    },
+    {
+     "fieldname": "mode_of_payment",
+     "fieldtype": "Link",
+     "label": "Mode of Payment",
+     "options": "Mode of Payment",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "cash_bank_account",
+     "fieldtype": "Link",
+     "label": "Cash/Bank Account",
+     "options": "Account"
+    },
+    {
+     "fieldname": "clearance_date",
+     "fieldtype": "Date",
+     "hidden": 1,
+     "label": "Clearance Date"
+     },
+    {
+     "fieldname": "col_br_payments",
+     "fieldtype": "Column Break"
+    },
+    {
+     "depends_on": "is_paid",
+     "fieldname": "paid_amount",
+     "fieldtype": "Currency",
+     "label": "Paid Amount",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "base_paid_amount",
+     "fieldtype": "Currency",
+     "label": "Paid Amount (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "write_off_amount",
+     "depends_on": "grand_total",
+     "fieldname": "write_off",
+     "fieldtype": "Section Break",
+     "label": "Write Off"
+    },
+    {
+     "fieldname": "write_off_amount",
+     "fieldtype": "Currency",
+     "label": "Write Off Amount",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "base_write_off_amount",
+     "fieldtype": "Currency",
+     "label": "Write Off Amount (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_61",
+     "fieldtype": "Column Break"
+    },
+    {
+     "depends_on": "eval:flt(doc.write_off_amount)!=0",
+     "fieldname": "write_off_account",
+     "fieldtype": "Link",
+     "label": "Write Off Account",
+     "options": "Account",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "eval:flt(doc.write_off_amount)!=0",
+     "fieldname": "write_off_cost_center",
+     "fieldtype": "Link",
+     "label": "Write Off Cost Center",
+     "options": "Cost Center",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "advances",
+     "fieldname": "advances_section",
+     "fieldtype": "Section Break",
+     "label": "Advance Payments",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "allocate_advances_automatically",
+     "fieldtype": "Check",
+     "label": "Set Advances and Allocate (FIFO)"
+    },
+    {
+     "depends_on": "eval:!doc.allocate_advances_automatically",
+     "fieldname": "get_advances",
+     "fieldtype": "Button",
+     "label": "Get Advances Paid",
+     "oldfieldtype": "Button",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "advances",
+     "fieldtype": "Table",
+     "label": "Advances",
+     "no_copy": 1,
+     "oldfieldname": "advance_allocation_details",
+     "oldfieldtype": "Table",
+     "options": "Purchase Invoice Advance",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "eval:(!doc.is_return)",
+     "fieldname": "payment_schedule_section",
+     "fieldtype": "Section Break",
+     "label": "Payment Terms"
+    },
+    {
+     "fieldname": "payment_terms_template",
+     "fieldtype": "Link",
+     "label": "Payment Terms Template",
+     "options": "Payment Terms Template"
+    },
+    {
+     "fieldname": "payment_schedule",
+     "fieldtype": "Table",
+     "label": "Payment Schedule",
+     "no_copy": 1,
+     "options": "Payment Schedule",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "terms",
+     "fieldname": "terms_section_break",
+     "fieldtype": "Section Break",
+     "label": "Terms and Conditions",
+     "options": "fa fa-legal"
+    },
+    {
+     "fieldname": "tc_name",
+     "fieldtype": "Link",
+     "label": "Terms",
+     "options": "Terms and Conditions",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "terms",
+     "fieldtype": "Text Editor",
+     "label": "Terms and Conditions1"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "printing_settings",
+     "fieldtype": "Section Break",
+     "label": "Printing Settings"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "letter_head",
+     "fieldtype": "Link",
+     "label": "Letter Head",
+     "options": "Letter Head",
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "0",
+     "fieldname": "group_same_items",
+     "fieldtype": "Check",
+     "label": "Group same items",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_112",
+     "fieldtype": "Column Break"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "select_print_heading",
+     "fieldtype": "Link",
+     "label": "Print Heading",
+     "no_copy": 1,
+     "oldfieldname": "select_print_heading",
+     "oldfieldtype": "Link",
+     "options": "Print Heading",
+     "print_hide": 1,
+     "report_hide": 1
+    },
+    {
+     "fieldname": "language",
+     "fieldtype": "Data",
+     "label": "Print Language",
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "more_info",
+     "fieldtype": "Section Break",
+     "label": "More Information",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-file-text",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "credit_to",
+     "fieldtype": "Link",
+     "label": "Credit To",
+     "oldfieldname": "credit_to",
+     "oldfieldtype": "Link",
+     "options": "Account",
+     "print_hide": 1,
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "party_account_currency",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Party Account Currency",
+     "no_copy": 1,
+     "options": "Currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "No",
+     "fieldname": "is_opening",
+     "fieldtype": "Select",
+     "label": "Is Opening",
+     "oldfieldname": "is_opening",
+     "oldfieldtype": "Select",
+     "options": "No\nYes",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "against_expense_account",
+     "fieldtype": "Small Text",
+     "hidden": 1,
+     "label": "Against Expense Account",
+     "no_copy": 1,
+     "oldfieldname": "against_expense_account",
+     "oldfieldtype": "Small Text",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_63",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "Draft",
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "in_standard_filter": 1,
+     "label": "Status",
+     "options": "\nDraft\nReturn\nDebit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled"
+    },
+    {
+     "fieldname": "inter_company_invoice_reference",
+     "fieldtype": "Link",
+     "label": "Inter Company Invoice Reference",
+     "options": "Sales Invoice",
+     "read_only": 1
+    },
+    {
+     "fieldname": "remarks",
+     "fieldtype": "Small Text",
+     "label": "Remarks",
+     "no_copy": 1,
+     "oldfieldname": "remarks",
+     "oldfieldtype": "Text",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "subscription_section",
+     "fieldtype": "Section Break",
+     "label": "Subscription Section",
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "description": "Start date of current invoice's period",
+     "fieldname": "from_date",
+     "fieldtype": "Date",
+     "label": "From Date",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "description": "End date of current invoice's period",
+     "fieldname": "to_date",
+     "fieldtype": "Date",
+     "label": "To Date",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_114",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "auto_repeat",
+     "fieldtype": "Link",
+     "label": "Auto Repeat",
+     "no_copy": 1,
+     "options": "Auto Repeat",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "depends_on": "eval: doc.auto_repeat",
+     "fieldname": "update_auto_repeat_reference",
+     "fieldtype": "Button",
+     "label": "Update Auto Repeat Reference"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "accounting_dimensions_section",
+     "fieldtype": "Section Break",
+     "label": "Accounting Dimensions "
+    },
+    {
+     "fieldname": "dimension_col_break",
+     "fieldtype": "Column Break"
+    }
+   ],
+   "icon": "fa fa-file-text",
+   "idx": 204,
+   "is_submittable": 1,
+   "modified": "2019-06-18 22:04:28.889159",
+   "modified_by": "Administrator",
+   "module": "Accounts",
+   "name": "Purchase Invoice",
+   "name_case": "Title Case",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Accounts User",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Purchase User"
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Accounts Manager",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Auditor"
+    },
+    {
+     "permlevel": 1,
+     "read": 1,
+     "role": "Accounts Manager",
+     "write": 1
+    }
+   ],
+   "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount",
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "timeline_field": "supplier",
+   "title_field": "title",
+   "track_changes": 1
+  }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 4d87edf..a6f6ace 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -105,7 +105,7 @@
 
 	def validate_release_date(self):
 		if self.release_date and getdate(nowdate()) >= getdate(self.release_date):
-			frappe.msgprint('Release date must be in the future', raise_exception=True)
+			frappe.throw(_('Release date must be in the future'))
 
 	def validate_cash(self):
 		if not self.cash_bank_account and flt(self.paid_amount):
@@ -787,9 +787,8 @@
 		for d in self.items:
 			if d.project and d.project not in project_list:
 				project = frappe.get_doc("Project", d.project)
-				project.flags.dont_sync_tasks = True
 				project.update_purchase_costing()
-				project.save()
+				project.db_update()
 				project_list.append(d.project)
 
 	def validate_supplier_invoice(self):
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
index 4103e57..4e76a8d 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js
@@ -6,8 +6,8 @@
 	add_fields: ["supplier", "supplier_name", "base_grand_total", "outstanding_amount", "due_date", "company",
 		"currency", "is_return", "release_date", "on_hold"],
 	get_indicator: function(doc) {
-		if(cint(doc.is_return)==1) {
-			return [__("Return"), "darkgrey", "is_return,=,Yes"];
+		if(flt(doc.outstanding_amount) < 0 && doc.docstatus == 1) {
+			return [__("Debit Note Issued"), "darkgrey", "outstanding_amount,<,0"]
 		} else if(flt(doc.outstanding_amount) > 0 && doc.docstatus==1) {
 			if(cint(doc.on_hold) && !doc.release_date) {
 				return [__("On Hold"), "darkgrey"];
@@ -18,9 +18,9 @@
 			} else {
 				return [__("Unpaid"), "orange", "outstanding_amount,>,0|due,>=,Today"];
 			}
-		} else if(flt(doc.outstanding_amount) < 0 && doc.docstatus == 1) {
-			return [__("Debit Note Issued"), "darkgrey", "outstanding_amount,<,0"]
-		}else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
+		} else if(cint(doc.is_return)) {
+			return [__("Return"), "darkgrey", "is_return,=,Yes"];
+		} else if(flt(doc.outstanding_amount)==0 && doc.docstatus==1) {
 			return [__("Paid"), "green", "outstanding_amount,=,0"];
 		}
 	}
diff --git a/erpnext/accounts/doctype/sales_invoice/regional/india.js b/erpnext/accounts/doctype/sales_invoice/regional/india.js
new file mode 100644
index 0000000..c8305e3
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice/regional/india.js
@@ -0,0 +1,38 @@
+frappe.ui.form.on("Sales Invoice", {
+	setup: function(frm) {
+		frm.set_query('transporter', function() {
+			return {
+				filters: {
+					'is_transporter': 1
+				}
+			};
+		});
+
+		frm.set_query('driver', function(doc) {
+			return {
+				filters: {
+					'transporter': doc.transporter
+				}
+			};
+		});
+	},
+
+	refresh: function(frm) {
+		if(frm.doc.docstatus == 1 && !frm.is_dirty()
+			&& !frm.doc.is_return && !frm.doc.ewaybill) {
+
+			frm.add_custom_button('e-Way Bill JSON', () => {
+				var w = window.open(
+					frappe.urllib.get_full_url(
+						"/api/method/erpnext.regional.india.utils.generate_ewb_json?"
+						+ "dt=" + encodeURIComponent(frm.doc.doctype)
+						+ "&dn=" + encodeURIComponent(frm.doc.name)
+					)
+				);
+				if (!w) {
+					frappe.msgprint(__("Please enable pop-ups")); return;
+				}
+			}, __("Make"));
+		}
+	}
+});
diff --git a/erpnext/accounts/doctype/sales_invoice/regional/india_list.js b/erpnext/accounts/doctype/sales_invoice/regional/india_list.js
new file mode 100644
index 0000000..66d74b4
--- /dev/null
+++ b/erpnext/accounts/doctype/sales_invoice/regional/india_list.js
@@ -0,0 +1,33 @@
+var globalOnload = frappe.listview_settings['Sales Invoice'].onload;
+frappe.listview_settings['Sales Invoice'].onload = function (doclist) {
+
+	// Provision in case onload event is added to sales_invoice.js in future
+	if (globalOnload) {
+		globalOnload(doclist);
+	}
+
+	const action = () => {
+		const selected_docs = doclist.get_checked_items();
+		const docnames = doclist.get_checked_items(true);
+
+		for (let doc of selected_docs) {
+			if (doc.docstatus !== 1) {
+				frappe.throw(__("e-Way Bill JSON can only be generated from a submitted document"));
+			}
+		}
+
+		var w = window.open(
+			frappe.urllib.get_full_url(
+				"/api/method/erpnext.regional.india.utils.generate_ewb_json?"
+				+ "dt=" + encodeURIComponent(doclist.doctype)
+				+ "&dn=" + encodeURIComponent(docnames)
+			)
+		);
+		if (!w) {
+			frappe.msgprint(__("Please enable pop-ups")); return;
+		}
+
+	};
+
+	doclist.page.add_actions_menu_item(__('Generate e-Way Bill JSON'), action, false);
+};
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 292d95d..4aec1c8 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -1,1615 +1,1615 @@
 {
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-24 19:29:05",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "customer_section",
-  "title",
-  "naming_series",
-  "customer",
-  "customer_name",
-  "tax_id",
-  "is_pos",
-  "pos_profile",
-  "offline_pos_name",
-  "is_return",
-  "column_break1",
-  "company",
-  "posting_date",
-  "posting_time",
-  "set_posting_time",
-  "due_date",
-  "amended_from",
-  "returns",
-  "return_against",
-  "column_break_21",
-  "update_billed_amount_in_sales_order",
-  "accounting_dimensions_section",
-  "project",
-  "dimension_col_break",
-  "cost_center",
-  "customer_po_details",
-  "po_no",
-  "column_break_23",
-  "po_date",
-  "address_and_contact",
-  "customer_address",
-  "address_display",
-  "contact_person",
-  "contact_display",
-  "contact_mobile",
-  "contact_email",
-  "territory",
-  "col_break4",
-  "shipping_address_name",
-  "shipping_address",
-  "company_address",
-  "company_address_display",
-  "currency_and_price_list",
-  "currency",
-  "conversion_rate",
-  "column_break2",
-  "selling_price_list",
-  "price_list_currency",
-  "plc_conversion_rate",
-  "ignore_pricing_rule",
-  "sec_warehouse",
-  "set_warehouse",
-  "items_section",
-  "update_stock",
-  "scan_barcode",
-  "items",
-  "pricing_rule_details",
-  "pricing_rules",
-  "packing_list",
-  "packed_items",
-  "product_bundle_help",
-  "time_sheet_list",
-  "timesheets",
-  "total_billing_amount",
-  "section_break_30",
-  "total_qty",
-  "base_total",
-  "base_net_total",
-  "column_break_32",
-  "total",
-  "net_total",
-  "total_net_weight",
-  "taxes_section",
-  "taxes_and_charges",
-  "column_break_38",
-  "shipping_rule",
-  "tax_category",
-  "section_break_40",
-  "taxes",
-  "sec_tax_breakup",
-  "other_charges_calculation",
-  "section_break_43",
-  "base_total_taxes_and_charges",
-  "column_break_47",
-  "total_taxes_and_charges",
-  "loyalty_points_redemption",
-  "loyalty_points",
-  "loyalty_amount",
-  "redeem_loyalty_points",
-  "column_break_77",
-  "loyalty_program",
-  "loyalty_redemption_account",
-  "loyalty_redemption_cost_center",
-  "section_break_49",
-  "apply_discount_on",
-  "base_discount_amount",
-  "column_break_51",
-  "additional_discount_percentage",
-  "discount_amount",
-  "totals",
-  "base_grand_total",
-  "base_rounding_adjustment",
-  "base_rounded_total",
-  "base_in_words",
-  "column_break5",
-  "grand_total",
-  "rounding_adjustment",
-  "rounded_total",
-  "in_words",
-  "total_advance",
-  "outstanding_amount",
-  "advances_section",
-  "allocate_advances_automatically",
-  "get_advances",
-  "advances",
-  "payment_schedule_section",
-  "payment_terms_template",
-  "payment_schedule",
-  "payments_section",
-  "cash_bank_account",
-  "payments",
-  "section_break_84",
-  "base_paid_amount",
-  "column_break_86",
-  "paid_amount",
-  "section_break_88",
-  "base_change_amount",
-  "column_break_90",
-  "change_amount",
-  "account_for_change_amount",
-  "column_break4",
-  "write_off_amount",
-  "base_write_off_amount",
-  "write_off_outstanding_amount_automatically",
-  "column_break_74",
-  "write_off_account",
-  "write_off_cost_center",
-  "terms_section_break",
-  "tc_name",
-  "terms",
-  "edit_printing_settings",
-  "letter_head",
-  "group_same_items",
-  "language",
-  "column_break_84",
-  "select_print_heading",
-  "more_information",
-  "inter_company_invoice_reference",
-  "customer_group",
-  "campaign",
-  "col_break23",
-  "status",
-  "source",
-  "more_info",
-  "debit_to",
-  "party_account_currency",
-  "is_opening",
-  "c_form_applicable",
-  "c_form_no",
-  "column_break8",
-  "remarks",
-  "sales_team_section_break",
-  "sales_partner",
-  "column_break10",
-  "commission_rate",
-  "total_commission",
-  "section_break2",
-  "sales_team",
-  "subscription_section",
-  "from_date",
-  "to_date",
-  "column_break_140",
-  "auto_repeat",
-  "update_auto_repeat_reference",
-  "against_income_account",
-  "pos_total_qty"
- ],
- "fields": [
-  {
-   "fieldname": "customer_section",
-   "fieldtype": "Section Break",
-   "options": "fa fa-user"
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "{customer_name}",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Title",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "ACC-SINV-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Customer",
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "print_hide": 1,
-   "search_index": 1
-  },
-  {
-   "bold": 1,
-   "depends_on": "customer",
-   "fetch_from": "customer.customer_name",
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Customer Name",
-   "oldfieldname": "customer_name",
-   "oldfieldtype": "Data",
-   "read_only": 1
-  },
-  {
-   "fieldname": "tax_id",
-   "fieldtype": "Data",
-   "label": "Tax Id",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "label": "Project",
-   "oldfieldname": "project_name",
-   "oldfieldtype": "Link",
-   "options": "Project",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_pos",
-   "fieldtype": "Check",
-   "label": "Include Payment (POS)",
-   "oldfieldname": "is_pos",
-   "oldfieldtype": "Check",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "is_pos",
-   "fieldname": "pos_profile",
-   "fieldtype": "Link",
-   "label": "POS Profile",
-   "options": "POS Profile",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "offline_pos_name",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Offline POS Name",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_return",
-   "fieldtype": "Check",
-   "label": "Is Return (Credit Note)",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "print_hide": 1,
-   "remember_last_selected_value": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "bold": 1,
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "label": "Date",
-   "no_copy": 1,
-   "oldfieldname": "posting_date",
-   "oldfieldtype": "Date",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "posting_time",
-   "fieldtype": "Time",
-   "label": "Posting Time",
-   "no_copy": 1,
-   "oldfieldname": "posting_time",
-   "oldfieldtype": "Time",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.docstatus==0",
-   "fieldname": "set_posting_time",
-   "fieldtype": "Check",
-   "label": "Edit Posting Date and Time",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "due_date",
-   "fieldtype": "Date",
-   "label": "Payment Due Date",
-   "no_copy": 1,
-   "oldfieldname": "due_date",
-   "oldfieldtype": "Date"
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Link",
-   "options": "Sales Invoice",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "return_against",
-   "fieldname": "returns",
-   "fieldtype": "Section Break",
-   "label": "Returns"
-  },
-  {
-   "depends_on": "return_against",
-   "fieldname": "return_against",
-   "fieldtype": "Link",
-   "label": "Return Against Sales Invoice",
-   "no_copy": 1,
-   "options": "Sales Invoice",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_21",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval: doc.is_return && doc.return_against",
-   "fieldname": "update_billed_amount_in_sales_order",
-   "fieldtype": "Check",
-   "label": "Update Billed Amount in Sales Order"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "po_no",
-   "fieldname": "customer_po_details",
-   "fieldtype": "Section Break",
-   "label": "Customer PO Details"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "po_no",
-   "fieldtype": "Data",
-   "label": "Customer's Purchase Order",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_23",
-   "fieldtype": "Column Break"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "po_date",
-   "fieldtype": "Date",
-   "label": "Customer's Purchase Order Date"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "address_and_contact",
-   "fieldtype": "Section Break",
-   "label": "Address and Contact"
-  },
-  {
-   "fieldname": "customer_address",
-   "fieldtype": "Link",
-   "label": "Customer Address",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "address_display",
-   "fieldtype": "Small Text",
-   "label": "Address",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_person",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "label": "Contact Person",
-   "options": "Contact",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "contact_display",
-   "fieldtype": "Small Text",
-   "label": "Contact",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_mobile",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Mobile No",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_email",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Contact Email",
-   "options": "Email",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "territory",
-   "fieldtype": "Link",
-   "label": "Territory",
-   "options": "Territory",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "shipping_address_name",
-   "fieldtype": "Link",
-   "label": "Shipping Address Name",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
-   "label": "Shipping Address",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "company_address",
-   "fieldtype": "Link",
-   "label": "Company Address Name",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Company Address",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "depends_on": "customer",
-   "fieldname": "currency_and_price_list",
-   "fieldtype": "Section Break",
-   "label": "Currency and Price List"
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "label": "Currency",
-   "oldfieldname": "currency",
-   "oldfieldtype": "Select",
-   "options": "Currency",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "description": "Rate at which Customer Currency is converted to customer's base currency",
-   "fieldname": "conversion_rate",
-   "fieldtype": "Float",
-   "label": "Exchange Rate",
-   "oldfieldname": "conversion_rate",
-   "oldfieldtype": "Currency",
-   "precision": "9",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "selling_price_list",
-   "fieldtype": "Link",
-   "label": "Price List",
-   "oldfieldname": "price_list_name",
-   "oldfieldtype": "Select",
-   "options": "Price List",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "price_list_currency",
-   "fieldtype": "Link",
-   "label": "Price List Currency",
-   "options": "Currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "description": "Rate at which Price list currency is converted to customer's base currency",
-   "fieldname": "plc_conversion_rate",
-   "fieldtype": "Float",
-   "label": "Price List Exchange Rate",
-   "precision": "9",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "ignore_pricing_rule",
-   "fieldtype": "Check",
-   "label": "Ignore Pricing Rule",
-   "no_copy": 1,
-   "permlevel": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "sec_warehouse",
-   "fieldtype": "Section Break"
-  },
-  {
-   "depends_on": "update_stock",
-   "fieldname": "set_warehouse",
-   "fieldtype": "Link",
-   "label": "Set Source Warehouse",
-   "options": "Warehouse",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "items_section",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart"
-  },
-  {
-   "default": "0",
-   "fieldname": "update_stock",
-   "fieldtype": "Check",
-   "label": "Update Stock",
-   "oldfieldname": "update_stock",
-   "oldfieldtype": "Check",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "scan_barcode",
-   "fieldtype": "Data",
-   "label": "Scan Barcode"
-  },
-  {
-   "allow_bulk_edit": 1,
-   "fieldname": "items",
-   "fieldtype": "Table",
-   "label": "Items",
-   "oldfieldname": "entries",
-   "oldfieldtype": "Table",
-   "options": "Sales Invoice Item",
-   "reqd": 1
-  },
-  {
-   "fieldname": "pricing_rule_details",
-   "fieldtype": "Section Break",
-   "label": "Pricing Rules"
-  },
-  {
-   "fieldname": "pricing_rules",
-   "fieldtype": "Table",
-   "label": "Pricing Rule Detail",
-   "options": "Pricing Rule Detail",
-   "read_only": 1
-  },
-  {
-   "fieldname": "packing_list",
-   "fieldtype": "Section Break",
-   "label": "Packing List",
-   "options": "fa fa-suitcase",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "packed_items",
-   "fieldtype": "Table",
-   "label": "Packed Items",
-   "options": "Packed Item",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "product_bundle_help",
-   "fieldtype": "HTML",
-   "label": "Product Bundle Help",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.total_billing_amount > 0",
-   "fieldname": "time_sheet_list",
-   "fieldtype": "Section Break",
-   "label": "Time Sheet List"
-  },
-  {
-   "fieldname": "timesheets",
-   "fieldtype": "Table",
-   "label": "Time Sheets",
-   "options": "Sales Invoice Timesheet",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "total_billing_amount",
-   "fieldtype": "Currency",
-   "label": "Total Billing Amount",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_30",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "total_qty",
-   "fieldtype": "Float",
-   "label": "Total Quantity",
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_total",
-   "fieldtype": "Currency",
-   "label": "Total (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_net_total",
-   "fieldtype": "Currency",
-   "label": "Net Total (Company Currency)",
-   "oldfieldname": "net_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break_32",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total",
-   "fieldtype": "Currency",
-   "label": "Total",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "net_total",
-   "fieldtype": "Currency",
-   "label": "Net Total",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_net_weight",
-   "fieldtype": "Float",
-   "label": "Total Net Weight",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "taxes_section",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money"
-  },
-  {
-   "fieldname": "taxes_and_charges",
-   "fieldtype": "Link",
-   "label": "Sales Taxes and Charges Template",
-   "oldfieldname": "charge",
-   "oldfieldtype": "Link",
-   "options": "Sales Taxes and Charges Template",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_38",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "shipping_rule",
-   "fieldtype": "Link",
-   "label": "Shipping Rule",
-   "oldfieldtype": "Button",
-   "options": "Shipping Rule",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "tax_category",
-   "fieldtype": "Link",
-   "label": "Tax Category",
-   "options": "Tax Category",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "section_break_40",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "label": "Sales Taxes and Charges",
-   "oldfieldname": "other_charges",
-   "oldfieldtype": "Table",
-   "options": "Sales Taxes and Charges"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sec_tax_breakup",
-   "fieldtype": "Section Break",
-   "label": "Tax Breakup"
-  },
-  {
-   "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
-   "label": "Taxes and Charges Calculation",
-   "no_copy": 1,
-   "oldfieldtype": "HTML",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_43",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "base_total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges (Company Currency)",
-   "oldfieldname": "other_charges_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_47",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "loyalty_points_redemption",
-   "fieldtype": "Section Break",
-   "label": "Loyalty Points Redemption"
-  },
-  {
-   "depends_on": "redeem_loyalty_points",
-   "fieldname": "loyalty_points",
-   "fieldtype": "Int",
-   "label": "Loyalty Points",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "depends_on": "redeem_loyalty_points",
-   "fieldname": "loyalty_amount",
-   "fieldtype": "Currency",
-   "label": "Loyalty Amount",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "redeem_loyalty_points",
-   "fieldtype": "Check",
-   "label": "Redeem Loyalty Points",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_77",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fetch_from": "customer.loyalty_program",
-   "fieldname": "loyalty_program",
-   "fieldtype": "Link",
-   "label": "Loyalty Program",
-   "no_copy": 1,
-   "options": "Loyalty Program",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "redeem_loyalty_points",
-   "fieldname": "loyalty_redemption_account",
-   "fieldtype": "Link",
-   "label": "Redemption Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "redeem_loyalty_points",
-   "fieldname": "loyalty_redemption_cost_center",
-   "fieldtype": "Link",
-   "label": "Redemption Cost Center",
-   "no_copy": 1,
-   "options": "Cost Center"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "discount_amount",
-   "fieldname": "section_break_49",
-   "fieldtype": "Section Break",
-   "label": "Additional Discount"
-  },
-  {
-   "default": "Grand Total",
-   "fieldname": "apply_discount_on",
-   "fieldtype": "Select",
-   "label": "Apply Additional Discount On",
-   "options": "\nGrand Total\nNet Total",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_discount_amount",
-   "fieldtype": "Currency",
-   "label": "Additional Discount Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_51",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "additional_discount_percentage",
-   "fieldtype": "Float",
-   "label": "Additional Discount Percentage",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "discount_amount",
-   "fieldtype": "Currency",
-   "label": "Additional Discount Amount",
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "totals",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_grand_total",
-   "fieldtype": "Currency",
-   "label": "Grand Total (Company Currency)",
-   "oldfieldname": "grand_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "base_rounding_adjustment",
-   "fieldtype": "Currency",
-   "label": "Rounding Adjustment (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_rounded_total",
-   "fieldtype": "Currency",
-   "label": "Rounded Total (Company Currency)",
-   "oldfieldname": "rounded_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "description": "In Words will be visible once you save the Sales Invoice.",
-   "fieldname": "base_in_words",
-   "fieldtype": "Data",
-   "label": "In Words (Company Currency)",
-   "oldfieldname": "in_words",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break5",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_hide": 1,
-   "width": "50%"
-  },
-  {
-   "bold": 1,
-   "fieldname": "grand_total",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Grand Total",
-   "oldfieldname": "grand_total_export",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "rounding_adjustment",
-   "fieldtype": "Currency",
-   "label": "Rounding Adjustment",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "rounded_total",
-   "fieldtype": "Currency",
-   "label": "Rounded Total",
-   "oldfieldname": "rounded_total_export",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "in_words",
-   "fieldtype": "Data",
-   "label": "In Words",
-   "oldfieldname": "in_words_export",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_advance",
-   "fieldtype": "Currency",
-   "label": "Total Advance",
-   "oldfieldname": "total_advance",
-   "oldfieldtype": "Currency",
-   "options": "party_account_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "outstanding_amount",
-   "fieldtype": "Currency",
-   "label": "Outstanding Amount",
-   "no_copy": 1,
-   "oldfieldname": "outstanding_amount",
-   "oldfieldtype": "Currency",
-   "options": "party_account_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "advances",
-   "fieldname": "advances_section",
-   "fieldtype": "Section Break",
-   "label": "Advance Payments",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "allocate_advances_automatically",
-   "fieldtype": "Check",
-   "label": "Allocate Advances Automatically (FIFO)"
-  },
-  {
-   "depends_on": "eval:!doc.allocate_advances_automatically",
-   "fieldname": "get_advances",
-   "fieldtype": "Button",
-   "label": "Get Advances Received",
-   "options": "set_advances"
-  },
-  {
-   "fieldname": "advances",
-   "fieldtype": "Table",
-   "label": "Advances",
-   "oldfieldname": "advance_adjustment_details",
-   "oldfieldtype": "Table",
-   "options": "Sales Invoice Advance",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:(!doc.is_pos && !doc.is_return)",
-   "fieldname": "payment_schedule_section",
-   "fieldtype": "Section Break",
-   "label": "Payment Terms"
-  },
-  {
-   "depends_on": "eval:(!doc.is_pos && !doc.is_return)",
-   "fieldname": "payment_terms_template",
-   "fieldtype": "Link",
-   "label": "Payment Terms Template",
-   "no_copy": 1,
-   "options": "Payment Terms Template",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "eval:(!doc.is_pos && !doc.is_return)",
-   "fieldname": "payment_schedule",
-   "fieldtype": "Table",
-   "label": "Payment Schedule",
-   "no_copy": 1,
-   "options": "Payment Schedule",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
-   "fieldname": "payments_section",
-   "fieldtype": "Section Break",
-   "label": "Payments",
-   "options": "fa fa-money"
-  },
-  {
-   "depends_on": "is_pos",
-   "fieldname": "cash_bank_account",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Cash/Bank Account",
-   "oldfieldname": "cash_bank_account",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "eval:doc.is_pos===1",
-   "fieldname": "payments",
-   "fieldtype": "Table",
-   "label": "Sales Invoice Payment",
-   "options": "Sales Invoice Payment",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "section_break_84",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "base_paid_amount",
-   "fieldtype": "Currency",
-   "label": "Paid Amount (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_86",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval: doc.is_pos || doc.redeem_loyalty_points",
-   "fieldname": "paid_amount",
-   "fieldtype": "Currency",
-   "label": "Paid Amount",
-   "no_copy": 1,
-   "oldfieldname": "paid_amount",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_88",
-   "fieldtype": "Section Break"
-  },
-  {
-   "depends_on": "is_pos",
-   "fieldname": "base_change_amount",
-   "fieldtype": "Currency",
-   "label": "Base Change Amount (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_90",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "is_pos",
-   "fieldname": "change_amount",
-   "fieldtype": "Currency",
-   "label": "Change Amount",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "is_pos",
-   "fieldname": "account_for_change_amount",
-   "fieldtype": "Link",
-   "label": "Account for Change Amount",
-   "options": "Account",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "write_off_amount",
-   "depends_on": "grand_total",
-   "fieldname": "column_break4",
-   "fieldtype": "Section Break",
-   "label": "Write Off",
-   "width": "50%"
-  },
-  {
-   "fieldname": "write_off_amount",
-   "fieldtype": "Currency",
-   "label": "Write Off Amount",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_write_off_amount",
-   "fieldtype": "Currency",
-   "label": "Write Off Amount (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "is_pos",
-   "fieldname": "write_off_outstanding_amount_automatically",
-   "fieldtype": "Check",
-   "label": "Write Off Outstanding Amount",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_74",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "write_off_account",
-   "fieldtype": "Link",
-   "label": "Write Off Account",
-   "options": "Account",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "write_off_cost_center",
-   "fieldtype": "Link",
-   "label": "Write Off Cost Center",
-   "options": "Cost Center",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "terms",
-   "fieldname": "terms_section_break",
-   "fieldtype": "Section Break",
-   "label": "Terms",
-   "oldfieldtype": "Section Break"
-  },
-  {
-   "fieldname": "tc_name",
-   "fieldtype": "Link",
-   "label": "Terms",
-   "oldfieldname": "tc_name",
-   "oldfieldtype": "Link",
-   "options": "Terms and Conditions",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "terms",
-   "fieldtype": "Text Editor",
-   "label": "Terms and Conditions Details",
-   "oldfieldname": "terms",
-   "oldfieldtype": "Text Editor"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "edit_printing_settings",
-   "fieldtype": "Section Break",
-   "label": "Printing Settings"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "label": "Letter Head",
-   "oldfieldname": "letter_head",
-   "oldfieldtype": "Select",
-   "options": "Letter Head",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "0",
-   "fieldname": "group_same_items",
-   "fieldtype": "Check",
-   "label": "Group same items",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "language",
-   "fieldtype": "Data",
-   "label": "Print Language",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_84",
-   "fieldtype": "Column Break"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "select_print_heading",
-   "fieldtype": "Link",
-   "label": "Print Heading",
-   "no_copy": 1,
-   "oldfieldname": "select_print_heading",
-   "oldfieldtype": "Link",
-   "options": "Print Heading",
-   "print_hide": 1,
-   "report_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "depends_on": "customer",
-   "fieldname": "more_information",
-   "fieldtype": "Section Break",
-   "label": "More Information"
-  },
-  {
-   "fieldname": "inter_company_invoice_reference",
-   "fieldtype": "Link",
-   "label": "Inter Company Invoice Reference",
-   "options": "Purchase Invoice",
-   "read_only": 1
-  },
-  {
-   "fieldname": "customer_group",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Customer Group",
-   "options": "Customer Group",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "campaign",
-   "fieldtype": "Link",
-   "label": "Campaign",
-   "oldfieldname": "campaign",
-   "oldfieldtype": "Link",
-   "options": "Campaign",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "col_break23",
-   "fieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "default": "Draft",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_standard_filter": 1,
-   "label": "Status",
-   "no_copy": 1,
-   "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "source",
-   "fieldtype": "Link",
-   "label": "Source",
-   "oldfieldname": "source",
-   "oldfieldtype": "Select",
-   "options": "Lead Source",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "Accounting Details",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-file-text",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "debit_to",
-   "fieldtype": "Link",
-   "label": "Debit To",
-   "oldfieldname": "debit_to",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "print_hide": 1,
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "party_account_currency",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Party Account Currency",
-   "no_copy": 1,
-   "options": "Currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "No",
-   "fieldname": "is_opening",
-   "fieldtype": "Select",
-   "label": "Is Opening Entry",
-   "oldfieldname": "is_opening",
-   "oldfieldtype": "Select",
-   "options": "No\nYes",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "c_form_applicable",
-   "fieldtype": "Select",
-   "label": "C-Form Applicable",
-   "no_copy": 1,
-   "options": "No\nYes",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "c_form_no",
-   "fieldtype": "Link",
-   "label": "C-Form No",
-   "no_copy": 1,
-   "options": "C-Form",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break8",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "remarks",
-   "fieldtype": "Small Text",
-   "label": "Remarks",
-   "no_copy": 1,
-   "oldfieldname": "remarks",
-   "oldfieldtype": "Text",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "sales_partner",
-   "fieldname": "sales_team_section_break",
-   "fieldtype": "Section Break",
-   "label": "Commission",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-group",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "sales_partner",
-   "fieldtype": "Link",
-   "label": "Sales Partner",
-   "oldfieldname": "sales_partner",
-   "oldfieldtype": "Link",
-   "options": "Sales Partner",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break10",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_hide": 1,
-   "width": "50%"
-  },
-  {
-   "fieldname": "commission_rate",
-   "fieldtype": "Float",
-   "label": "Commission Rate (%)",
-   "oldfieldname": "commission_rate",
-   "oldfieldtype": "Currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "total_commission",
-   "fieldtype": "Currency",
-   "label": "Total Commission",
-   "oldfieldname": "total_commission",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "sales_team",
-   "fieldname": "section_break2",
-   "fieldtype": "Section Break",
-   "label": "Sales Team",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "sales_team",
-   "fieldtype": "Table",
-   "label": "Sales Team1",
-   "oldfieldname": "sales_team",
-   "oldfieldtype": "Table",
-   "options": "Sales Team",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription Section"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "label": "From Date",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "label": "To Date",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_140",
-   "fieldtype": "Column Break"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "auto_repeat",
-   "fieldtype": "Link",
-   "label": "Auto Repeat",
-   "no_copy": 1,
-   "options": "Auto Repeat",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "depends_on": "eval: doc.auto_repeat",
-   "fieldname": "update_auto_repeat_reference",
-   "fieldtype": "Button",
-   "label": "Update Auto Repeat Reference"
-  },
-  {
-   "fieldname": "against_income_account",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Against Income Account",
-   "no_copy": 1,
-   "oldfieldname": "against_income_account",
-   "oldfieldtype": "Small Text",
-   "print_hide": 1,
-   "report_hide": 1
-  },
-  {
-   "fieldname": "pos_total_qty",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "Total Qty",
-   "print_hide": 1,
-   "print_hide_if_no_value": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  }
- ],
- "icon": "fa fa-file-text",
- "idx": 181,
- "is_submittable": 1,
- "modified": "2019-05-25 22:05:03.474745",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Invoice",
- "name_case": "Title Case",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "create": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "role": "Accounts Manager",
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "role": "All"
-  }
- ],
- "quick_entry": 1,
- "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "customer",
- "title_field": "title",
- "track_changes": 1,
- "track_seen": 1
-}
\ No newline at end of file
+   "allow_import": 1,
+   "autoname": "naming_series:",
+   "creation": "2013-05-24 19:29:05",
+   "doctype": "DocType",
+   "engine": "InnoDB",
+   "field_order": [
+    "customer_section",
+    "title",
+    "naming_series",
+    "customer",
+    "customer_name",
+    "tax_id",
+    "is_pos",
+    "pos_profile",
+    "offline_pos_name",
+    "is_return",
+    "column_break1",
+    "company",
+    "posting_date",
+    "posting_time",
+    "set_posting_time",
+    "due_date",
+    "amended_from",
+    "returns",
+    "return_against",
+    "column_break_21",
+    "update_billed_amount_in_sales_order",
+    "accounting_dimensions_section",
+    "project",
+    "dimension_col_break",
+    "cost_center",
+    "customer_po_details",
+    "po_no",
+    "column_break_23",
+    "po_date",
+    "address_and_contact",
+    "customer_address",
+    "address_display",
+    "contact_person",
+    "contact_display",
+    "contact_mobile",
+    "contact_email",
+    "territory",
+    "col_break4",
+    "shipping_address_name",
+    "shipping_address",
+    "company_address",
+    "company_address_display",
+    "currency_and_price_list",
+    "currency",
+    "conversion_rate",
+    "column_break2",
+    "selling_price_list",
+    "price_list_currency",
+    "plc_conversion_rate",
+    "ignore_pricing_rule",
+    "sec_warehouse",
+    "set_warehouse",
+    "items_section",
+    "update_stock",
+    "scan_barcode",
+    "items",
+    "pricing_rule_details",
+    "pricing_rules",
+    "packing_list",
+    "packed_items",
+    "product_bundle_help",
+    "time_sheet_list",
+    "timesheets",
+    "total_billing_amount",
+    "section_break_30",
+    "total_qty",
+    "base_total",
+    "base_net_total",
+    "column_break_32",
+    "total",
+    "net_total",
+    "total_net_weight",
+    "taxes_section",
+    "taxes_and_charges",
+    "column_break_38",
+    "shipping_rule",
+    "tax_category",
+    "section_break_40",
+    "taxes",
+    "sec_tax_breakup",
+    "other_charges_calculation",
+    "section_break_43",
+    "base_total_taxes_and_charges",
+    "column_break_47",
+    "total_taxes_and_charges",
+    "loyalty_points_redemption",
+    "loyalty_points",
+    "loyalty_amount",
+    "redeem_loyalty_points",
+    "column_break_77",
+    "loyalty_program",
+    "loyalty_redemption_account",
+    "loyalty_redemption_cost_center",
+    "section_break_49",
+    "apply_discount_on",
+    "base_discount_amount",
+    "column_break_51",
+    "additional_discount_percentage",
+    "discount_amount",
+    "totals",
+    "base_grand_total",
+    "base_rounding_adjustment",
+    "base_rounded_total",
+    "base_in_words",
+    "column_break5",
+    "grand_total",
+    "rounding_adjustment",
+    "rounded_total",
+    "in_words",
+    "total_advance",
+    "outstanding_amount",
+    "advances_section",
+    "allocate_advances_automatically",
+    "get_advances",
+    "advances",
+    "payment_schedule_section",
+    "payment_terms_template",
+    "payment_schedule",
+    "payments_section",
+    "cash_bank_account",
+    "payments",
+    "section_break_84",
+    "base_paid_amount",
+    "column_break_86",
+    "paid_amount",
+    "section_break_88",
+    "base_change_amount",
+    "column_break_90",
+    "change_amount",
+    "account_for_change_amount",
+    "column_break4",
+    "write_off_amount",
+    "base_write_off_amount",
+    "write_off_outstanding_amount_automatically",
+    "column_break_74",
+    "write_off_account",
+    "write_off_cost_center",
+    "terms_section_break",
+    "tc_name",
+    "terms",
+    "edit_printing_settings",
+    "letter_head",
+    "group_same_items",
+    "language",
+    "column_break_84",
+    "select_print_heading",
+    "more_information",
+    "inter_company_invoice_reference",
+    "customer_group",
+    "campaign",
+    "col_break23",
+    "status",
+    "source",
+    "more_info",
+    "debit_to",
+    "party_account_currency",
+    "is_opening",
+    "c_form_applicable",
+    "c_form_no",
+    "column_break8",
+    "remarks",
+    "sales_team_section_break",
+    "sales_partner",
+    "column_break10",
+    "commission_rate",
+    "total_commission",
+    "section_break2",
+    "sales_team",
+    "subscription_section",
+    "from_date",
+    "to_date",
+    "column_break_140",
+    "auto_repeat",
+    "update_auto_repeat_reference",
+    "against_income_account",
+    "pos_total_qty"
+   ],
+   "fields": [
+    {
+     "fieldname": "customer_section",
+     "fieldtype": "Section Break",
+     "options": "fa fa-user"
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "{customer_name}",
+     "fieldname": "title",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Title",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "bold": 1,
+     "fieldname": "naming_series",
+     "fieldtype": "Select",
+     "label": "Series",
+     "no_copy": 1,
+     "oldfieldname": "naming_series",
+     "oldfieldtype": "Select",
+     "options": "ACC-SINV-.YYYY.-",
+     "print_hide": 1,
+     "reqd": 1,
+     "set_only_once": 1
+    },
+    {
+     "bold": 1,
+     "fieldname": "customer",
+     "fieldtype": "Link",
+     "in_standard_filter": 1,
+     "label": "Customer",
+     "oldfieldname": "customer",
+     "oldfieldtype": "Link",
+     "options": "Customer",
+     "print_hide": 1,
+     "search_index": 1
+    },
+    {
+     "bold": 1,
+     "depends_on": "customer",
+     "fetch_from": "customer.customer_name",
+     "fieldname": "customer_name",
+     "fieldtype": "Data",
+     "in_global_search": 1,
+     "label": "Customer Name",
+     "oldfieldname": "customer_name",
+     "oldfieldtype": "Data",
+     "read_only": 1
+    },
+    {
+     "fieldname": "tax_id",
+     "fieldtype": "Data",
+     "label": "Tax Id",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "project",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "label": "Project",
+     "oldfieldname": "project_name",
+     "oldfieldtype": "Link",
+     "options": "Project",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "is_pos",
+     "fieldtype": "Check",
+     "label": "Include Payment (POS)",
+     "oldfieldname": "is_pos",
+     "oldfieldtype": "Check",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "is_pos",
+     "fieldname": "pos_profile",
+     "fieldtype": "Link",
+     "label": "POS Profile",
+     "options": "POS Profile",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "offline_pos_name",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Offline POS Name",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "is_return",
+     "fieldtype": "Check",
+     "label": "Is Return (Credit Note)",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break1",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break"
+    },
+    {
+     "fieldname": "company",
+     "fieldtype": "Link",
+     "in_standard_filter": 1,
+     "label": "Company",
+     "oldfieldname": "company",
+     "oldfieldtype": "Link",
+     "options": "Company",
+     "print_hide": 1,
+     "remember_last_selected_value": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "cost_center",
+     "fieldtype": "Link",
+     "label": "Cost Center",
+     "options": "Cost Center"
+    },
+    {
+     "bold": 1,
+     "default": "Today",
+     "fieldname": "posting_date",
+     "fieldtype": "Date",
+     "label": "Date",
+     "no_copy": 1,
+     "oldfieldname": "posting_date",
+     "oldfieldtype": "Date",
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "posting_time",
+     "fieldtype": "Time",
+     "label": "Posting Time",
+     "no_copy": 1,
+     "oldfieldname": "posting_time",
+     "oldfieldtype": "Time",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "depends_on": "eval:doc.docstatus==0",
+     "fieldname": "set_posting_time",
+     "fieldtype": "Check",
+     "label": "Edit Posting Date and Time",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "due_date",
+     "fieldtype": "Date",
+     "label": "Payment Due Date",
+     "no_copy": 1,
+     "oldfieldname": "due_date",
+     "oldfieldtype": "Date"
+    },
+    {
+     "fieldname": "amended_from",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Amended From",
+     "no_copy": 1,
+     "oldfieldname": "amended_from",
+     "oldfieldtype": "Link",
+     "options": "Sales Invoice",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "depends_on": "return_against",
+     "fieldname": "returns",
+     "fieldtype": "Section Break",
+     "label": "Returns"
+    },
+    {
+     "depends_on": "return_against",
+     "fieldname": "return_against",
+     "fieldtype": "Link",
+     "label": "Return Against Sales Invoice",
+     "no_copy": 1,
+     "options": "Sales Invoice",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_21",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "0",
+     "depends_on": "eval: doc.is_return && doc.return_against",
+     "fieldname": "update_billed_amount_in_sales_order",
+     "fieldtype": "Check",
+     "label": "Update Billed Amount in Sales Order"
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "po_no",
+     "fieldname": "customer_po_details",
+     "fieldtype": "Section Break",
+     "label": "Customer PO Details"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "po_no",
+     "fieldtype": "Data",
+     "label": "Customer's Purchase Order",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_23",
+     "fieldtype": "Column Break"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "po_date",
+     "fieldtype": "Date",
+     "label": "Customer's Purchase Order Date"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "address_and_contact",
+     "fieldtype": "Section Break",
+     "label": "Address and Contact"
+    },
+    {
+     "fieldname": "customer_address",
+     "fieldtype": "Link",
+     "label": "Customer Address",
+     "options": "Address",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "address_display",
+     "fieldtype": "Small Text",
+     "label": "Address",
+     "read_only": 1
+    },
+    {
+     "fieldname": "contact_person",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "label": "Contact Person",
+     "options": "Contact",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "contact_display",
+     "fieldtype": "Small Text",
+     "label": "Contact",
+     "read_only": 1
+    },
+    {
+     "fieldname": "contact_mobile",
+     "fieldtype": "Small Text",
+     "hidden": 1,
+     "label": "Mobile No",
+     "read_only": 1
+    },
+    {
+     "fieldname": "contact_email",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Contact Email",
+     "options": "Email",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "territory",
+     "fieldtype": "Link",
+     "label": "Territory",
+     "options": "Territory",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "col_break4",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "shipping_address_name",
+     "fieldtype": "Link",
+     "label": "Shipping Address Name",
+     "options": "Address",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "shipping_address",
+     "fieldtype": "Small Text",
+     "label": "Shipping Address",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "company_address",
+     "fieldtype": "Link",
+     "label": "Company Address Name",
+     "options": "Address",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "company_address_display",
+     "fieldtype": "Small Text",
+     "hidden": 1,
+     "label": "Company Address",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "depends_on": "customer",
+     "fieldname": "currency_and_price_list",
+     "fieldtype": "Section Break",
+     "label": "Currency and Price List"
+    },
+    {
+     "fieldname": "currency",
+     "fieldtype": "Link",
+     "label": "Currency",
+     "oldfieldname": "currency",
+     "oldfieldtype": "Select",
+     "options": "Currency",
+     "print_hide": 1,
+     "reqd": 1
+    },
+    {
+     "description": "Rate at which Customer Currency is converted to customer's base currency",
+     "fieldname": "conversion_rate",
+     "fieldtype": "Float",
+     "label": "Exchange Rate",
+     "oldfieldname": "conversion_rate",
+     "oldfieldtype": "Currency",
+     "precision": "9",
+     "print_hide": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "column_break2",
+     "fieldtype": "Column Break",
+     "width": "50%"
+    },
+    {
+     "fieldname": "selling_price_list",
+     "fieldtype": "Link",
+     "label": "Price List",
+     "oldfieldname": "price_list_name",
+     "oldfieldtype": "Select",
+     "options": "Price List",
+     "print_hide": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "price_list_currency",
+     "fieldtype": "Link",
+     "label": "Price List Currency",
+     "options": "Currency",
+     "print_hide": 1,
+     "read_only": 1,
+     "reqd": 1
+    },
+    {
+     "description": "Rate at which Price list currency is converted to customer's base currency",
+     "fieldname": "plc_conversion_rate",
+     "fieldtype": "Float",
+     "label": "Price List Exchange Rate",
+     "precision": "9",
+     "print_hide": 1,
+     "reqd": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "ignore_pricing_rule",
+     "fieldtype": "Check",
+     "label": "Ignore Pricing Rule",
+     "no_copy": 1,
+     "permlevel": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "sec_warehouse",
+     "fieldtype": "Section Break"
+    },
+    {
+     "depends_on": "update_stock",
+     "fieldname": "set_warehouse",
+     "fieldtype": "Link",
+     "label": "Set Source Warehouse",
+     "options": "Warehouse",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "items_section",
+     "fieldtype": "Section Break",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-shopping-cart"
+    },
+    {
+     "default": "0",
+     "fieldname": "update_stock",
+     "fieldtype": "Check",
+     "label": "Update Stock",
+     "oldfieldname": "update_stock",
+     "oldfieldtype": "Check",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "scan_barcode",
+     "fieldtype": "Data",
+     "label": "Scan Barcode"
+    },
+    {
+     "allow_bulk_edit": 1,
+     "fieldname": "items",
+     "fieldtype": "Table",
+     "label": "Items",
+     "oldfieldname": "entries",
+     "oldfieldtype": "Table",
+     "options": "Sales Invoice Item",
+     "reqd": 1
+    },
+    {
+     "fieldname": "pricing_rule_details",
+     "fieldtype": "Section Break",
+     "label": "Pricing Rules"
+    },
+    {
+     "fieldname": "pricing_rules",
+     "fieldtype": "Table",
+     "label": "Pricing Rule Detail",
+     "options": "Pricing Rule Detail",
+     "read_only": 1
+    },
+    {
+     "fieldname": "packing_list",
+     "fieldtype": "Section Break",
+     "label": "Packing List",
+     "options": "fa fa-suitcase",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "packed_items",
+     "fieldtype": "Table",
+     "label": "Packed Items",
+     "options": "Packed Item",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "product_bundle_help",
+     "fieldtype": "HTML",
+     "label": "Product Bundle Help",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "eval:doc.total_billing_amount > 0",
+     "fieldname": "time_sheet_list",
+     "fieldtype": "Section Break",
+     "label": "Time Sheet List"
+    },
+    {
+     "fieldname": "timesheets",
+     "fieldtype": "Table",
+     "label": "Time Sheets",
+     "options": "Sales Invoice Timesheet",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "total_billing_amount",
+     "fieldtype": "Currency",
+     "label": "Total Billing Amount",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_30",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "total_qty",
+     "fieldtype": "Float",
+     "label": "Total Quantity",
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_total",
+     "fieldtype": "Currency",
+     "label": "Total (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_net_total",
+     "fieldtype": "Currency",
+     "label": "Net Total (Company Currency)",
+     "oldfieldname": "net_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "column_break_32",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "total",
+     "fieldtype": "Currency",
+     "label": "Total",
+     "options": "currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "net_total",
+     "fieldtype": "Currency",
+     "label": "Net Total",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "total_net_weight",
+     "fieldtype": "Float",
+     "label": "Total Net Weight",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "taxes_section",
+     "fieldtype": "Section Break",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money"
+    },
+    {
+     "fieldname": "taxes_and_charges",
+     "fieldtype": "Link",
+     "label": "Sales Taxes and Charges Template",
+     "oldfieldname": "charge",
+     "oldfieldtype": "Link",
+     "options": "Sales Taxes and Charges Template",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_38",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "shipping_rule",
+     "fieldtype": "Link",
+     "label": "Shipping Rule",
+     "oldfieldtype": "Button",
+     "options": "Shipping Rule",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "tax_category",
+     "fieldtype": "Link",
+     "label": "Tax Category",
+     "options": "Tax Category",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "section_break_40",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "taxes",
+     "fieldtype": "Table",
+     "label": "Sales Taxes and Charges",
+     "oldfieldname": "other_charges",
+     "oldfieldtype": "Table",
+     "options": "Sales Taxes and Charges"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "sec_tax_breakup",
+     "fieldtype": "Section Break",
+     "label": "Tax Breakup"
+    },
+    {
+     "fieldname": "other_charges_calculation",
+     "fieldtype": "Text",
+     "label": "Taxes and Charges Calculation",
+     "no_copy": 1,
+     "oldfieldtype": "HTML",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_43",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "base_total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "label": "Total Taxes and Charges (Company Currency)",
+     "oldfieldname": "other_charges_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_47",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "label": "Total Taxes and Charges",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "loyalty_points_redemption",
+     "fieldtype": "Section Break",
+     "label": "Loyalty Points Redemption"
+    },
+    {
+     "depends_on": "redeem_loyalty_points",
+     "fieldname": "loyalty_points",
+     "fieldtype": "Int",
+     "label": "Loyalty Points",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "depends_on": "redeem_loyalty_points",
+     "fieldname": "loyalty_amount",
+     "fieldtype": "Currency",
+     "label": "Loyalty Amount",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "redeem_loyalty_points",
+     "fieldtype": "Check",
+     "label": "Redeem Loyalty Points",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_77",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fetch_from": "customer.loyalty_program",
+     "fieldname": "loyalty_program",
+     "fieldtype": "Link",
+     "label": "Loyalty Program",
+     "no_copy": 1,
+     "options": "Loyalty Program",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "depends_on": "redeem_loyalty_points",
+     "fieldname": "loyalty_redemption_account",
+     "fieldtype": "Link",
+     "label": "Redemption Account",
+     "no_copy": 1,
+     "options": "Account"
+    },
+    {
+     "depends_on": "redeem_loyalty_points",
+     "fieldname": "loyalty_redemption_cost_center",
+     "fieldtype": "Link",
+     "label": "Redemption Cost Center",
+     "no_copy": 1,
+     "options": "Cost Center"
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "discount_amount",
+     "fieldname": "section_break_49",
+     "fieldtype": "Section Break",
+     "label": "Additional Discount"
+    },
+    {
+     "default": "Grand Total",
+     "fieldname": "apply_discount_on",
+     "fieldtype": "Select",
+     "label": "Apply Additional Discount On",
+     "options": "\nGrand Total\nNet Total",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "base_discount_amount",
+     "fieldtype": "Currency",
+     "label": "Additional Discount Amount (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_51",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "additional_discount_percentage",
+     "fieldtype": "Float",
+     "label": "Additional Discount Percentage",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "discount_amount",
+     "fieldtype": "Currency",
+     "label": "Additional Discount Amount",
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "totals",
+     "fieldtype": "Section Break",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "base_grand_total",
+     "fieldtype": "Currency",
+     "label": "Grand Total (Company Currency)",
+     "oldfieldname": "grand_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "base_rounding_adjustment",
+     "fieldtype": "Currency",
+     "label": "Rounding Adjustment (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_rounded_total",
+     "fieldtype": "Currency",
+     "label": "Rounded Total (Company Currency)",
+     "oldfieldname": "rounded_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "description": "In Words will be visible once you save the Sales Invoice.",
+     "fieldname": "base_in_words",
+     "fieldtype": "Data",
+     "label": "In Words (Company Currency)",
+     "oldfieldname": "in_words",
+     "oldfieldtype": "Data",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break5",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break",
+     "print_hide": 1,
+     "width": "50%"
+    },
+    {
+     "bold": 1,
+     "fieldname": "grand_total",
+     "fieldtype": "Currency",
+     "in_list_view": 1,
+     "label": "Grand Total",
+     "oldfieldname": "grand_total_export",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "read_only": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "rounding_adjustment",
+     "fieldtype": "Currency",
+     "label": "Rounding Adjustment",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "bold": 1,
+     "fieldname": "rounded_total",
+     "fieldtype": "Currency",
+     "label": "Rounded Total",
+     "oldfieldname": "rounded_total_export",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "in_words",
+     "fieldtype": "Data",
+     "label": "In Words",
+     "oldfieldname": "in_words_export",
+     "oldfieldtype": "Data",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "total_advance",
+     "fieldtype": "Currency",
+     "label": "Total Advance",
+     "oldfieldname": "total_advance",
+     "oldfieldtype": "Currency",
+     "options": "party_account_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "outstanding_amount",
+     "fieldtype": "Currency",
+     "label": "Outstanding Amount",
+     "no_copy": 1,
+     "oldfieldname": "outstanding_amount",
+     "oldfieldtype": "Currency",
+     "options": "party_account_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "advances",
+     "fieldname": "advances_section",
+     "fieldtype": "Section Break",
+     "label": "Advance Payments",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "allocate_advances_automatically",
+     "fieldtype": "Check",
+     "label": "Allocate Advances Automatically (FIFO)"
+    },
+    {
+     "depends_on": "eval:!doc.allocate_advances_automatically",
+     "fieldname": "get_advances",
+     "fieldtype": "Button",
+     "label": "Get Advances Received",
+     "options": "set_advances"
+    },
+    {
+     "fieldname": "advances",
+     "fieldtype": "Table",
+     "label": "Advances",
+     "oldfieldname": "advance_adjustment_details",
+     "oldfieldtype": "Table",
+     "options": "Sales Invoice Advance",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "eval:(!doc.is_pos && !doc.is_return)",
+     "fieldname": "payment_schedule_section",
+     "fieldtype": "Section Break",
+     "label": "Payment Terms"
+    },
+    {
+     "depends_on": "eval:(!doc.is_pos && !doc.is_return)",
+     "fieldname": "payment_terms_template",
+     "fieldtype": "Link",
+     "label": "Payment Terms Template",
+     "no_copy": 1,
+     "options": "Payment Terms Template",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "eval:(!doc.is_pos && !doc.is_return)",
+     "fieldname": "payment_schedule",
+     "fieldtype": "Table",
+     "label": "Payment Schedule",
+     "no_copy": 1,
+     "options": "Payment Schedule",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
+     "fieldname": "payments_section",
+     "fieldtype": "Section Break",
+     "label": "Payments",
+     "options": "fa fa-money"
+    },
+    {
+     "depends_on": "is_pos",
+     "fieldname": "cash_bank_account",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Cash/Bank Account",
+     "oldfieldname": "cash_bank_account",
+     "oldfieldtype": "Link",
+     "options": "Account",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "eval:doc.is_pos===1",
+     "fieldname": "payments",
+     "fieldtype": "Table",
+     "label": "Sales Invoice Payment",
+     "options": "Sales Invoice Payment",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "section_break_84",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "base_paid_amount",
+     "fieldtype": "Currency",
+     "label": "Paid Amount (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_86",
+     "fieldtype": "Column Break"
+    },
+    {
+     "depends_on": "eval: doc.is_pos || doc.redeem_loyalty_points",
+     "fieldname": "paid_amount",
+     "fieldtype": "Currency",
+     "label": "Paid Amount",
+     "no_copy": 1,
+     "oldfieldname": "paid_amount",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_88",
+     "fieldtype": "Section Break"
+    },
+    {
+     "depends_on": "is_pos",
+     "fieldname": "base_change_amount",
+     "fieldtype": "Currency",
+     "label": "Base Change Amount (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_90",
+     "fieldtype": "Column Break"
+    },
+    {
+     "depends_on": "is_pos",
+     "fieldname": "change_amount",
+     "fieldtype": "Currency",
+     "label": "Change Amount",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "is_pos",
+     "fieldname": "account_for_change_amount",
+     "fieldtype": "Link",
+     "label": "Account for Change Amount",
+     "options": "Account",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "write_off_amount",
+     "depends_on": "grand_total",
+     "fieldname": "column_break4",
+     "fieldtype": "Section Break",
+     "label": "Write Off",
+     "width": "50%"
+    },
+    {
+     "fieldname": "write_off_amount",
+     "fieldtype": "Currency",
+     "label": "Write Off Amount",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "base_write_off_amount",
+     "fieldtype": "Currency",
+     "label": "Write Off Amount (Company Currency)",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "depends_on": "is_pos",
+     "fieldname": "write_off_outstanding_amount_automatically",
+     "fieldtype": "Check",
+     "label": "Write Off Outstanding Amount",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_74",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "write_off_account",
+     "fieldtype": "Link",
+     "label": "Write Off Account",
+     "options": "Account",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "write_off_cost_center",
+     "fieldtype": "Link",
+     "label": "Write Off Cost Center",
+     "options": "Cost Center",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "terms",
+     "fieldname": "terms_section_break",
+     "fieldtype": "Section Break",
+     "label": "Terms",
+     "oldfieldtype": "Section Break"
+    },
+    {
+     "fieldname": "tc_name",
+     "fieldtype": "Link",
+     "label": "Terms",
+     "oldfieldname": "tc_name",
+     "oldfieldtype": "Link",
+     "options": "Terms and Conditions",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "terms",
+     "fieldtype": "Text Editor",
+     "label": "Terms and Conditions Details",
+     "oldfieldname": "terms",
+     "oldfieldtype": "Text Editor"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "edit_printing_settings",
+     "fieldtype": "Section Break",
+     "label": "Printing Settings"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "letter_head",
+     "fieldtype": "Link",
+     "label": "Letter Head",
+     "oldfieldname": "letter_head",
+     "oldfieldtype": "Select",
+     "options": "Letter Head",
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "0",
+     "fieldname": "group_same_items",
+     "fieldtype": "Check",
+     "label": "Group same items",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "language",
+     "fieldtype": "Data",
+     "label": "Print Language",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_84",
+     "fieldtype": "Column Break"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "select_print_heading",
+     "fieldtype": "Link",
+     "label": "Print Heading",
+     "no_copy": 1,
+     "oldfieldname": "select_print_heading",
+     "oldfieldtype": "Link",
+     "options": "Print Heading",
+     "print_hide": 1,
+     "report_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "depends_on": "customer",
+     "fieldname": "more_information",
+     "fieldtype": "Section Break",
+     "label": "More Information"
+    },
+    {
+     "fieldname": "inter_company_invoice_reference",
+     "fieldtype": "Link",
+     "label": "Inter Company Invoice Reference",
+     "options": "Purchase Invoice",
+     "read_only": 1
+    },
+    {
+     "fieldname": "customer_group",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Customer Group",
+     "options": "Customer Group",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "campaign",
+     "fieldtype": "Link",
+     "label": "Campaign",
+     "oldfieldname": "campaign",
+     "oldfieldtype": "Link",
+     "options": "Campaign",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "col_break23",
+     "fieldtype": "Column Break",
+     "width": "50%"
+    },
+    {
+     "default": "Draft",
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "in_standard_filter": 1,
+     "label": "Status",
+     "no_copy": 1,
+     "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "source",
+     "fieldtype": "Link",
+     "label": "Source",
+     "oldfieldname": "source",
+     "oldfieldtype": "Select",
+     "options": "Lead Source",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "more_info",
+     "fieldtype": "Section Break",
+     "label": "Accounting Details",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-file-text",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "debit_to",
+     "fieldtype": "Link",
+     "label": "Debit To",
+     "oldfieldname": "debit_to",
+     "oldfieldtype": "Link",
+     "options": "Account",
+     "print_hide": 1,
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "party_account_currency",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Party Account Currency",
+     "no_copy": 1,
+     "options": "Currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "No",
+     "fieldname": "is_opening",
+     "fieldtype": "Select",
+     "label": "Is Opening Entry",
+     "oldfieldname": "is_opening",
+     "oldfieldtype": "Select",
+     "options": "No\nYes",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "c_form_applicable",
+     "fieldtype": "Select",
+     "label": "C-Form Applicable",
+     "no_copy": 1,
+     "options": "No\nYes",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "c_form_no",
+     "fieldtype": "Link",
+     "label": "C-Form No",
+     "no_copy": 1,
+     "options": "C-Form",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break8",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "remarks",
+     "fieldtype": "Small Text",
+     "label": "Remarks",
+     "no_copy": 1,
+     "oldfieldname": "remarks",
+     "oldfieldtype": "Text",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "sales_partner",
+     "fieldname": "sales_team_section_break",
+     "fieldtype": "Section Break",
+     "label": "Commission",
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-group",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "sales_partner",
+     "fieldtype": "Link",
+     "label": "Sales Partner",
+     "oldfieldname": "sales_partner",
+     "oldfieldtype": "Link",
+     "options": "Sales Partner",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break10",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break",
+     "print_hide": 1,
+     "width": "50%"
+    },
+    {
+     "fieldname": "commission_rate",
+     "fieldtype": "Float",
+     "label": "Commission Rate (%)",
+     "oldfieldname": "commission_rate",
+     "oldfieldtype": "Currency",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "total_commission",
+     "fieldtype": "Currency",
+     "label": "Total Commission",
+     "oldfieldname": "total_commission",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1
+    },
+    {
+     "collapsible": 1,
+     "collapsible_depends_on": "sales_team",
+     "fieldname": "section_break2",
+     "fieldtype": "Section Break",
+     "label": "Sales Team",
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "sales_team",
+     "fieldtype": "Table",
+     "label": "Sales Team1",
+     "oldfieldname": "sales_team",
+     "oldfieldtype": "Table",
+     "options": "Sales Team",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "subscription_section",
+     "fieldtype": "Section Break",
+     "label": "Subscription Section"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "from_date",
+     "fieldtype": "Date",
+     "label": "From Date",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "to_date",
+     "fieldtype": "Date",
+     "label": "To Date",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_140",
+     "fieldtype": "Column Break"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "auto_repeat",
+     "fieldtype": "Link",
+     "label": "Auto Repeat",
+     "no_copy": 1,
+     "options": "Auto Repeat",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "depends_on": "eval: doc.auto_repeat",
+     "fieldname": "update_auto_repeat_reference",
+     "fieldtype": "Button",
+     "label": "Update Auto Repeat Reference"
+    },
+    {
+     "fieldname": "against_income_account",
+     "fieldtype": "Small Text",
+     "hidden": 1,
+     "label": "Against Income Account",
+     "no_copy": 1,
+     "oldfieldname": "against_income_account",
+     "oldfieldtype": "Small Text",
+     "print_hide": 1,
+     "report_hide": 1
+    },
+    {
+     "fieldname": "pos_total_qty",
+     "fieldtype": "Float",
+     "hidden": 1,
+     "label": "Total Qty",
+     "print_hide": 1,
+     "print_hide_if_no_value": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "accounting_dimensions_section",
+     "fieldtype": "Section Break",
+     "label": "Accounting Dimensions"
+    },
+    {
+     "fieldname": "dimension_col_break",
+     "fieldtype": "Column Break"
+    }
+   ],
+   "icon": "fa fa-file-text",
+   "idx": 181,
+   "is_submittable": 1,
+   "modified": "2019-05-25 22:05:03.474745",
+   "modified_by": "Administrator",
+   "module": "Accounts",
+   "name": "Sales Invoice",
+   "name_case": "Title Case",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Accounts Manager",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "create": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Accounts User",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "permlevel": 1,
+     "read": 1,
+     "role": "Accounts Manager",
+     "write": 1
+    },
+    {
+     "permlevel": 1,
+     "read": 1,
+     "role": "All"
+    }
+   ],
+   "quick_entry": 1,
+   "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount",
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "timeline_field": "customer",
+   "title_field": "title",
+   "track_changes": 1,
+   "track_seen": 1
+  }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index e166fa2..b725c73 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -54,8 +54,8 @@
 
 	def set_indicator(self):
 		"""Set indicator for portal"""
-		if cint(self.is_return) == 1:
-			self.indicator_title = _("Return")
+		if self.outstanding_amount < 0:
+			self.indicator_title = _("Credit Note Issued")
 			self.indicator_color = "darkgrey"
 		elif self.outstanding_amount > 0 and getdate(self.due_date) >= getdate(nowdate()):
 			self.indicator_color = "orange"
@@ -63,8 +63,8 @@
 		elif self.outstanding_amount > 0 and getdate(self.due_date) < getdate(nowdate()):
 			self.indicator_color = "red"
 			self.indicator_title = _("Overdue")
-		elif self.outstanding_amount < 0:
-			self.indicator_title = _("Credit Note Issued")
+		elif cint(self.is_return) == 1:
+			self.indicator_title = _("Return")
 			self.indicator_color = "darkgrey"
 		else:
 			self.indicator_color = "green"
@@ -508,8 +508,8 @@
 			if frappe.db.get_single_value('Selling Settings', dic[i][0]) == 'Yes':
 				for d in self.get('items'):
 					is_stock_item = frappe.get_cached_value('Item', d.item_code, 'is_stock_item')
-					if d.item_code and is_stock_item == 1\
-						and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1]):
+					if  (d.item_code and is_stock_item == 1\
+						and not d.get(i.lower().replace(' ','_')) and not self.get(dic[i][1])):
 						msgprint(_("{0} is mandatory for Item {1}").format(i,d.item_code), raise_exception=1)
 
 
@@ -768,7 +768,14 @@
 				if item.is_fixed_asset:
 					asset = frappe.get_doc("Asset", item.asset)
 
-					fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(asset, item.base_net_amount)
+					if (len(asset.finance_books) > 1 and not item.finance_book
+						and asset.finance_books[0].finance_book):
+						frappe.throw(_("Select finance book for the item {0} at row {1}")
+							.format(item.item_code, item.idx))
+
+					fixed_asset_gl_entries = get_gl_entries_on_asset_disposal(asset,
+						item.base_net_amount, item.finance_book)
+
 					for gle in fixed_asset_gl_entries:
 						gle["against"] = self.customer
 						gl_entries.append(self.get_gl_dict(gle))
@@ -1022,9 +1029,8 @@
 	def update_project(self):
 		if self.project:
 			project = frappe.get_doc("Project", self.project)
-			project.flags.dont_sync_tasks = True
 			project.update_billed_amount()
-			project.save()
+			project.db_update()
 
 
 	def verify_payment_amount_is_positive(self):
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
index 3c9c4b4..52d2924 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -6,16 +6,16 @@
 	add_fields: ["customer", "customer_name", "base_grand_total", "outstanding_amount", "due_date", "company",
 		"currency", "is_return"],
 	get_indicator: function(doc) {
-		if(cint(doc.is_return)==1) {
-			return [__("Return"), "darkgrey", "is_return,=,Yes"];
-		} else if(flt(doc.outstanding_amount)==0) {
-			return [__("Paid"), "green", "outstanding_amount,=,0"]
-		} else if(flt(doc.outstanding_amount) < 0) {
+		if(flt(doc.outstanding_amount) < 0) {
 			return [__("Credit Note Issued"), "darkgrey", "outstanding_amount,<,0"]
-		}else if (flt(doc.outstanding_amount) > 0 && doc.due_date >= frappe.datetime.get_today()) {
+		} else if (flt(doc.outstanding_amount) > 0 && doc.due_date >= frappe.datetime.get_today()) {
 			return [__("Unpaid"), "orange", "outstanding_amount,>,0|due_date,>,Today"]
 		} else if (flt(doc.outstanding_amount) > 0 && doc.due_date < frappe.datetime.get_today()) {
 			return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<=,Today"]
+		} else if(cint(doc.is_return)) {
+			return [__("Return"), "darkgrey", "is_return,=,Yes"];
+		} else if(flt(doc.outstanding_amount)==0) {
+			return [__("Paid"), "green", "outstanding_amount,=,0"]
 		}
 	},
 	right_column: "grand_total"
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 47c6083..52470fd 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -19,6 +19,8 @@
 from erpnext.stock.doctype.item.test_item import create_item
 from six import iteritems
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction
+from erpnext.regional.india.utils import get_ewb_data
+
 class TestSalesInvoice(unittest.TestCase):
 	def make(self):
 		w = frappe.copy_doc(test_records[0])
@@ -1421,7 +1423,7 @@
 				"included_in_print_rate": 1
 			})
 		si.save()
-
+		si.submit()
 		self.assertEqual(si.net_total, 19453.13)
 		self.assertEqual(si.grand_total, 24900)
 		self.assertEqual(si.total_taxes_and_charges, 5446.88)
@@ -1443,6 +1445,50 @@
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
 
+	def test_rounding_adjustment_2(self):
+		si = create_sales_invoice(rate=400, do_not_save=True)
+		for rate in [400, 600, 100]:
+			si.append("items", {
+				"item_code": "_Test Item",
+				"gst_hsn_code": "999800",
+				"warehouse": "_Test Warehouse - _TC",
+				"qty": 1,
+				"rate": rate,
+				"income_account": "Sales - _TC",
+				"cost_center": "_Test Cost Center - _TC"
+			})
+		for tax_account in ["_Test Account VAT - _TC", "_Test Account Service Tax - _TC"]:
+			si.append("taxes", {
+				"charge_type": "On Net Total",
+				"account_head": tax_account,
+				"description": tax_account,
+				"rate": 9,
+				"cost_center": "_Test Cost Center - _TC",
+				"included_in_print_rate": 1
+			})
+		si.save()
+		si.submit()
+		self.assertEqual(si.net_total, 1271.19)
+		self.assertEqual(si.grand_total, 1500)
+		self.assertEqual(si.total_taxes_and_charges, 228.82)
+		self.assertEqual(si.rounding_adjustment, -0.01)
+
+		expected_values = dict((d[0], d) for d in [
+			[si.debit_to, 1500, 0.0],
+			["_Test Account Service Tax - _TC", 0.0, 114.41],
+			["_Test Account VAT - _TC", 0.0, 114.41],
+			["Sales - _TC", 0.0, 1271.18]
+		])
+
+		gl_entries = frappe.db.sql("""select account, debit, credit
+			from `tabGL Entry` where voucher_type='Sales Invoice' and voucher_no=%s
+			order by account asc""", si.name, as_dict=1)
+
+		for gle in gl_entries:
+			self.assertEqual(expected_values[gle.account][0], gle.account)
+			self.assertEqual(expected_values[gle.account][1], gle.debit)
+			self.assertEqual(expected_values[gle.account][2], gle.credit)
+
 	def test_sales_invoice_with_shipping_rule(self):
 		from erpnext.accounts.doctype.shipping_rule.test_shipping_rule \
 			import create_shipping_rule
@@ -1681,6 +1727,111 @@
 		self.assertEqual(target_doc.company, "_Test Company 1")
 		self.assertEqual(target_doc.supplier, "_Test Internal Supplier")
 
+	def test_eway_bill_json(self):
+		if not frappe.db.exists('Address', '_Test Address for Eway bill-Billing'):
+			address = frappe.get_doc({
+				"address_line1": "_Test Address Line 1",
+				"address_title": "_Test Address for Eway bill",
+				"address_type": "Billing",
+				"city": "_Test City",
+				"state": "Test State",
+				"country": "India",
+				"doctype": "Address",
+				"is_primary_address": 1,
+				"phone": "+91 0000000000",
+				"gstin": "27AAECE4835E1ZR",
+				"gst_state": "Maharashtra",
+				"gst_state_number": "27",
+				"pincode": "401108"
+			}).insert()
+
+			address.append("links", {
+				"link_doctype": "Company",
+				"link_name": "_Test Company"
+			})
+
+			address.save()
+
+		if not frappe.db.exists('Address', '_Test Customer-Address for Eway bill-Shipping'):
+			address = frappe.get_doc({
+				"address_line1": "_Test Address Line 1",
+				"address_title": "_Test Customer-Address for Eway bill",
+				"address_type": "Shipping",
+				"city": "_Test City",
+				"state": "Test State",
+				"country": "India",
+				"doctype": "Address",
+				"is_primary_address": 1,
+				"phone": "+91 0000000000",
+				"gst_state": "Maharashtra",
+				"gst_state_number": "27",
+				"pincode": "410038"
+			}).insert()
+
+			address.append("links", {
+				"link_doctype": "Customer",
+				"link_name": "_Test Customer"
+			})
+
+			address.save()
+
+		gst_settings = frappe.get_doc("GST Settings")
+
+		gst_account = frappe.get_all(
+			"GST Account",
+			fields=["cgst_account", "sgst_account", "igst_account"],
+			filters = {"company": "_Test Company"})
+
+		if not gst_account:
+			gst_settings.append("gst_accounts", {
+				"company": "_Test Company",
+				"cgst_account": "CGST - _TC",
+				"sgst_account": "SGST - _TC",
+				"igst_account": "IGST - _TC",
+			})
+
+		gst_settings.save()
+
+		si = create_sales_invoice(do_not_save =1, rate = '60000')
+
+		si.distance = 2000
+		si.company_address = "_Test Address for Eway bill-Billing"
+		si.customer_address = "_Test Customer-Address for Eway bill-Shipping"
+		si.vehicle_no = "KA12KA1234"
+		si.gst_category = "Registered Regular"
+
+		si.append("taxes", {
+			"charge_type": "On Net Total",
+			"account_head": "CGST - _TC",
+			"cost_center": "Main - _TC",
+			"description": "CGST @ 9.0",
+			"rate": 9
+		})
+
+		si.append("taxes", {
+			"charge_type": "On Net Total",
+			"account_head": "SGST - _TC",
+			"cost_center": "Main - _TC",
+			"description": "SGST @ 9.0",
+			"rate": 9
+		})
+
+		si.submit()
+
+		data = get_ewb_data("Sales Invoice", si.name)
+
+		self.assertEqual(data['version'], '1.0.1118')
+		self.assertEqual(data['billLists'][0]['fromGstin'], '27AAECE4835E1ZR')
+		self.assertEqual(data['billLists'][0]['fromTrdName'], '_Test Company')
+		self.assertEqual(data['billLists'][0]['toTrdName'], '_Test Customer')
+		self.assertEqual(data['billLists'][0]['vehicleType'], 'R')
+		self.assertEqual(data['billLists'][0]['totalValue'], 60000)
+		self.assertEqual(data['billLists'][0]['cgstValue'], 5400)
+		self.assertEqual(data['billLists'][0]['sgstValue'], 5400)
+		self.assertEqual(data['billLists'][0]['vehicleNo'], 'KA12KA1234')
+		self.assertEqual(data['billLists'][0]['itemList'][0]['taxableAmount'], 60000)
+
+
 def create_sales_invoice(**args):
 	si = frappe.new_doc("Sales Invoice")
 	args = frappe._dict(args)
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index d7eb8ed..465df27 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -57,6 +57,7 @@
   "income_account",
   "is_fixed_asset",
   "asset",
+  "finance_book",
   "col_break4",
   "expense_account",
   "deferred_revenue",
@@ -770,11 +771,18 @@
   {
    "fieldname": "dimension_col_break",
    "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "asset",
+   "fieldname": "finance_book",
+   "fieldtype": "Link",
+   "label": "Finance Book",
+   "options": "Finance Book"
   }
  ],
  "idx": 1,
  "istable": 1,
- "modified": "2019-05-25 22:05:59.971263",
+ "modified": "2019-06-28 17:30:12.156086",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
index 1c5962a..52cf810 100644
--- a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+++ b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
@@ -295,7 +295,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2019-03-06 15:58:37.839241", 
+ "modified": "2019-03-19 14:54:56.524556", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Payment", 
diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py
index d3fef60..625979b 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.py
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.py
@@ -4,6 +4,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.model.document import Document
 from erpnext.utilities.product import get_price
 
@@ -13,7 +14,7 @@
 
 	def validate_interval_count(self):
 		if self.billing_interval_count < 1:
-			frappe.throw('Billing Interval Count cannot be less than 1')
+			frappe.throw(_('Billing Interval Count cannot be less than 1'))
 
 @frappe.whitelist()
 def get_plan_rate(plan, quantity=1, customer=None):
@@ -26,7 +27,7 @@
 			customer_group = frappe.db.get_value("Customer", customer, "customer_group")
 		else:
 			customer_group = None
-		
+
 		price = get_price(item_code=plan.item, price_list=plan.price_list, customer_group=customer_group, company=None, qty=quantity)
 		if not price:
 			return 0
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index e15dd2a..9a01484 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -145,9 +145,9 @@
 			.format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))
 
 	elif abs(debit_credit_diff) >= (1.0 / (10**precision)):
-		make_round_off_gle(gl_map, debit_credit_diff)
+		make_round_off_gle(gl_map, debit_credit_diff, precision)
 
-def make_round_off_gle(gl_map, debit_credit_diff):
+def make_round_off_gle(gl_map, debit_credit_diff, precision):
 	round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(gl_map[0].company)
 	round_off_account_exists = False
 	round_off_gle = frappe._dict()
@@ -160,6 +160,10 @@
 				debit_credit_diff += flt(d.credit_in_account_currency)
 			round_off_account_exists = True
 
+	if round_off_account_exists and abs(debit_credit_diff) <= (1.0 / (10**precision)):
+		gl_map.remove(round_off_gle)
+		return
+
 	if not round_off_gle:
 		for k in ["voucher_type", "voucher_no", "company",
 			"posting_date", "remarks", "is_opening"]:
diff --git a/erpnext/accounts/page/bank_reconciliation/__init__.py b/erpnext/accounts/page/bank_reconciliation/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/__init__.py
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js
new file mode 100644
index 0000000..6eafa0d
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js
@@ -0,0 +1,578 @@
+frappe.provide("erpnext.accounts");
+
+frappe.pages['bank-reconciliation'].on_page_load = function(wrapper) {
+	new erpnext.accounts.bankReconciliation(wrapper);
+}
+
+erpnext.accounts.bankReconciliation = class BankReconciliation {
+	constructor(wrapper) {
+		this.page = frappe.ui.make_app_page({
+			parent: wrapper,
+			title: __("Bank Reconciliation"),
+			single_column: true
+		});
+		this.parent = wrapper;
+		this.page = this.parent.page;
+
+		this.check_plaid_status();
+		this.make();
+	}
+
+	make() {
+		const me = this;
+
+		me.$main_section = $(`<div class="reconciliation page-main-content"></div>`).appendTo(me.page.main);
+		const empty_state = __("Upload a bank statement, link or reconcile a bank account")
+		me.$main_section.append(`<div class="flex justify-center align-center text-muted"
+			style="height: 50vh; display: flex;"><h5 class="text-muted">${empty_state}</h5></div>`)
+
+		me.page.add_field({
+			fieldtype: 'Link',
+			label: __('Company'),
+			fieldname: 'company',
+			options: "Company",
+			onchange: function() {
+				if (this.value) {
+					me.company = this.value;
+				} else {
+					me.company = null;
+					me.bank_account = null;
+				}
+			}
+		})
+		me.page.add_field({
+			fieldtype: 'Link',
+			label: __('Bank Account'),
+			fieldname: 'bank_account',
+			options: "Bank Account",
+			get_query: function() {
+				if(!me.company) {
+					frappe.throw(__("Please select company first"));
+					return
+				}
+
+				return {
+					filters: {
+						"company": me.company
+					}
+				}
+			},
+			onchange: function() {
+				if (this.value) {
+					me.bank_account = this.value;
+					me.add_actions();
+				} else {
+					me.bank_account = null;
+					me.page.hide_actions_menu();
+				}
+			}
+		})
+	}
+
+	check_plaid_status() {
+		const me = this;
+		frappe.db.get_value("Plaid Settings", "Plaid Settings", "enabled", (r) => {
+			if (r && r.enabled == "1") {
+				me.plaid_status = "active"
+			} else {
+				me.plaid_status = "inactive"
+			}
+		})
+	}
+
+	add_actions() {
+		const me = this;
+
+		me.page.show_menu()
+
+		me.page.add_menu_item(__("Upload a statement"), function() {
+			me.clear_page_content();
+			new erpnext.accounts.bankTransactionUpload(me);
+		}, true)
+
+		if (me.plaid_status==="active") {
+			me.page.add_menu_item(__("Synchronize this account"), function() {
+				me.clear_page_content();
+				new erpnext.accounts.bankTransactionSync(me);
+			}, true)
+		}
+
+		me.page.add_menu_item(__("Reconcile this account"), function() {
+			me.clear_page_content();
+			me.make_reconciliation_tool();
+		}, true)
+	}
+
+	clear_page_content() {
+		const me = this;
+		$(me.page.body).find('.frappe-list').remove();
+		me.$main_section.empty();
+	}
+
+	make_reconciliation_tool() {
+		const me = this;
+		frappe.model.with_doctype("Bank Transaction", () => {
+			erpnext.accounts.ReconciliationList = new erpnext.accounts.ReconciliationTool({
+				parent: me.parent,
+				doctype: "Bank Transaction"
+			});
+		})
+	}
+}
+
+
+erpnext.accounts.bankTransactionUpload = class bankTransactionUpload {
+	constructor(parent) {
+		this.parent = parent;
+		this.data = [];
+
+		const assets = [
+			"/assets/frappe/css/frappe-datatable.css",
+			"/assets/frappe/js/lib/clusterize.min.js",
+			"/assets/frappe/js/lib/Sortable.min.js",
+			"/assets/frappe/js/lib/frappe-datatable.js"
+		];
+
+		frappe.require(assets, () => {
+			this.make();
+		});
+	}
+
+	make() {
+		const me = this;
+		frappe.upload.make({
+			args: {
+				method: 'erpnext.accounts.doctype.bank_transaction.bank_transaction_upload.upload_bank_statement',
+				allow_multiple: 0
+			},
+			no_socketio: true,
+			sample_url: "e.g. http://example.com/somefile.csv",
+			callback: function(attachment, r) {
+				if (!r.exc && r.message) {
+					me.data = r.message;
+					me.setup_transactions_dom();
+					me.create_datatable();
+					me.add_primary_action();
+				}
+			}
+		})
+	}
+
+	setup_transactions_dom() {
+		const me = this;
+		me.parent.$main_section.append(`<div class="transactions-table"></div>`)
+	}
+
+	create_datatable() {
+		try {
+			this.datatable = new DataTable('.transactions-table', {
+				columns: this.data.columns,
+				data: this.data.data
+			})
+		}
+		catch(err) {
+			let msg = __(`Your file could not be processed by ERPNext.
+						<br>It should be a standard CSV or XLSX file.
+						<br>The headers should be in the first row.`)
+			frappe.throw(msg)
+		}
+
+	}
+
+	add_primary_action() {
+		const me = this;
+		me.parent.page.set_primary_action(__("Submit"), function() {
+			me.add_bank_entries()
+		}, null, __("Creating bank entries..."))
+	}
+
+	add_bank_entries() {
+		const me = this;
+		frappe.xcall('erpnext.accounts.doctype.bank_transaction.bank_transaction_upload.create_bank_entries',
+			{columns: this.datatable.datamanager.columns, data: this.datatable.datamanager.data, bank_account: me.parent.bank_account}
+		).then((result) => {
+			let result_title = result.errors == 0 ? __("{0} bank transaction(s) created", [result.success]) : __("{0} bank transaction(s) created and {1} errors", [result.success, result.errors])
+			let result_msg = `
+				<div class="flex justify-center align-center text-muted" style="height: 50vh; display: flex;">
+					<h5 class="text-muted">${result_title}</h5>
+				</div>`
+			me.parent.page.clear_primary_action();
+			me.parent.$main_section.empty();
+			me.parent.$main_section.append(result_msg);
+			if (result.errors == 0) {
+				frappe.show_alert({message:__("All bank transactions have been created"), indicator:'green'});
+			} else {
+				frappe.show_alert({message:__("Please check the error log for details about the import errors"), indicator:'red'});
+			}
+		})
+	}
+}
+
+erpnext.accounts.bankTransactionSync = class bankTransactionSync {
+	constructor(parent) {
+		this.parent = parent;
+		this.data = [];
+
+		this.init_config()
+	}
+
+	init_config() {
+		const me = this;
+		frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.plaid_configuration')
+		.then(result => {
+			me.plaid_env = result.plaid_env;
+			me.plaid_public_key = result.plaid_public_key;
+			me.client_name = result.client_name;
+			me.sync_transactions()
+		})
+	}
+
+	sync_transactions() {
+		const me = this;
+		frappe.db.get_value("Bank Account", me.parent.bank_account, "bank", (v) => {
+			frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.sync_transactions', {
+				bank: v['bank'],
+				bank_account: me.parent.bank_account,
+				freeze: true
+			})
+			.then((result) => {
+				let result_title = (result.length > 0) ? __("{0} bank transaction(s) created", [result.length]) : __("This bank account is already synchronized")
+				let result_msg = `
+					<div class="flex justify-center align-center text-muted" style="height: 50vh; display: flex;">
+						<h5 class="text-muted">${result_title}</h5>
+					</div>`
+				this.parent.$main_section.append(result_msg)
+				frappe.show_alert({message:__("Bank account '{0}' has been synchronized", [me.parent.bank_account]), indicator:'green'});
+			})
+		})
+	}
+}
+
+
+erpnext.accounts.ReconciliationTool = class ReconciliationTool extends frappe.views.BaseList {
+	constructor(opts) {
+		super(opts);
+		this.show();
+	}
+
+	setup_defaults() {
+		super.setup_defaults();
+
+		this.page_title = __("Bank Reconciliation");
+		this.doctype = 'Bank Transaction';
+		this.fields = ['date', 'description', 'debit', 'credit', 'currency']
+
+	}
+
+	setup_view() {
+		this.render_header();
+	}
+
+	setup_side_bar() {
+		//
+	}
+
+	make_standard_filters() {
+		//
+	}
+
+	freeze() {
+		this.$result.find('.list-count').html(`<span>${__('Refreshing')}...</span>`);
+	}
+
+	get_args() {
+		const args = super.get_args();
+
+		return Object.assign({}, args, {
+			...args.filters.push(["Bank Transaction", "docstatus", "=", 1],
+				["Bank Transaction", "unallocated_amount", ">", 0])
+		});
+
+	}
+
+	update_data(r) {
+		let data = r.message || [];
+
+		if (this.start === 0) {
+			this.data = data;
+		} else {
+			this.data = this.data.concat(data);
+		}
+	}
+
+	render() {
+		const me = this;
+		this.$result.find('.list-row-container').remove();
+		$('[data-fieldname="name"]').remove();
+		me.data.map((value) => {
+			const row = $('<div class="list-row-container">').data("data", value).appendTo(me.$result).get(0);
+			new erpnext.accounts.ReconciliationRow(row, value);
+		})
+	}
+
+	render_header() {
+		const me = this;
+		if ($(this.wrapper).find('.transaction-header').length === 0) {
+			me.$result.append(frappe.render_template("bank_transaction_header"));
+		}
+	}
+}
+
+erpnext.accounts.ReconciliationRow = class ReconciliationRow {
+	constructor(row, data) {
+		this.data = data;
+		this.row = row;
+		this.make();
+		this.bind_events();
+	}
+
+	make() {
+		$(this.row).append(frappe.render_template("bank_transaction_row", this.data))
+	}
+
+	bind_events() {
+		const me = this;
+		$(me.row).on('click', '.clickable-section', function() {
+			me.bank_entry = $(this).attr("data-name");
+			me.show_dialog($(this).attr("data-name"));
+		})
+
+		$(me.row).on('click', '.new-reconciliation', function() {
+			me.bank_entry = $(this).attr("data-name");
+			me.show_dialog($(this).attr("data-name"));
+		})
+
+		$(me.row).on('click', '.new-payment', function() {
+			me.bank_entry = $(this).attr("data-name");
+			me.new_payment();
+		})
+
+		$(me.row).on('click', '.new-invoice', function() {
+			me.bank_entry = $(this).attr("data-name");
+			me.new_invoice();
+		})
+
+		$(me.row).on('click', '.new-expense', function() {
+			me.bank_entry = $(this).attr("data-name");
+			me.new_expense();
+		})
+	}
+
+	new_payment() {
+		const me = this;
+		const paid_amount = me.data.credit > 0 ? me.data.credit : me.data.debit;
+		const payment_type = me.data.credit > 0 ? "Receive": "Pay";
+		const party_type = me.data.credit > 0 ? "Customer": "Supplier";
+
+		frappe.new_doc("Payment Entry", {"payment_type": payment_type, "paid_amount": paid_amount,
+			"party_type": party_type, "paid_from": me.data.bank_account})
+	}
+
+	new_invoice() {
+		const me = this;
+		const invoice_type = me.data.credit > 0 ? "Sales Invoice" : "Purchase Invoice";
+
+		frappe.new_doc(invoice_type)
+	}
+
+	new_expense() {
+		frappe.new_doc("Expense Claim")
+	}
+
+
+	show_dialog(data) {
+		const me = this;
+
+		frappe.db.get_value("Bank Account", me.data.bank_account, "account", (r) => {
+			me.gl_account = r.account;
+		})
+
+		frappe.xcall('erpnext.accounts.page.bank_reconciliation.bank_reconciliation.get_linked_payments',
+			{bank_transaction: data, freeze:true, freeze_message:__("Finding linked payments")}
+		).then((result) => {
+			me.make_dialog(result)
+		})
+	}
+
+	make_dialog(data) {
+		const me = this;
+		me.selected_payment = null;
+
+		const fields = [
+			{
+				fieldtype: 'Section Break',
+				fieldname: 'section_break_1',
+				label: __('Automatic Reconciliation')
+			},
+			{
+				fieldtype: 'HTML',
+				fieldname: 'payment_proposals'
+			},
+			{
+				fieldtype: 'Section Break',
+				fieldname: 'section_break_2',
+				label: __('Search for a payment')
+			},
+			{
+				fieldtype: 'Link',
+				fieldname: 'payment_doctype',
+				options: 'DocType',
+				label: 'Payment DocType',
+				get_query: () => {
+					return {
+						filters : {
+							"name": ["in", ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Expense Claim"]]
+						}
+					}
+				},
+			},
+			{
+				fieldtype: 'Column Break',
+				fieldname: 'column_break_1',
+			},
+			{
+				fieldtype: 'Dynamic Link',
+				fieldname: 'payment_entry',
+				options: 'payment_doctype',
+				label: 'Payment Document',
+				get_query: () => {
+					let dt = this.dialog.fields_dict.payment_doctype.value;
+					if (dt === "Payment Entry") {
+						return {
+							query: "erpnext.accounts.page.bank_reconciliation.bank_reconciliation.payment_entry_query",
+							filters : {
+								"bank_account": this.data.bank_account,
+								"company": this.data.company
+							}
+						}
+					} else if (dt === "Journal Entry") {
+						return {
+							query: "erpnext.accounts.page.bank_reconciliation.bank_reconciliation.journal_entry_query",
+							filters : {
+								"bank_account": this.data.bank_account,
+								"company": this.data.company
+							}
+						}
+					} else if (dt === "Sales Invoice") {
+						return {
+							query: "erpnext.accounts.page.bank_reconciliation.bank_reconciliation.sales_invoices_query"
+						}
+					} else if (dt === "Purchase Invoice") {
+						return {
+							filters : [
+								["Purchase Invoice", "ifnull(clearance_date, '')", "=", ""],
+								["Purchase Invoice", "docstatus", "=", 1],
+								["Purchase Invoice", "company", "=", this.data.company]
+							]
+						}
+					} else if (dt === "Expense Claim") {
+						return {
+							filters : [
+								["Expense Claim", "ifnull(clearance_date, '')", "=", ""],
+								["Expense Claim", "docstatus", "=", 1],
+								["Expense Claim", "company", "=", this.data.company]
+							]
+						}
+					}
+				},
+				onchange: function() {
+					if (me.selected_payment !== this.value) {
+						me.selected_payment = this.value;
+						me.display_payment_details(this);
+					}
+				}
+			},
+			{
+				fieldtype: 'Section Break',
+				fieldname: 'section_break_3'
+			},
+			{
+				fieldtype: 'HTML',
+				fieldname: 'payment_details'
+			},
+		];
+
+		me.dialog = new frappe.ui.Dialog({
+			title: __("Choose a corresponding payment"),
+			fields: fields,
+			size: "large"
+		});
+
+		const proposals_wrapper = me.dialog.fields_dict.payment_proposals.$wrapper;
+		if (data && data.length > 0) {
+			proposals_wrapper.append(frappe.render_template("linked_payment_header"));
+			data.map(value => {
+				proposals_wrapper.append(frappe.render_template("linked_payment_row", value))
+			})
+		} else {
+			const empty_data_msg = __("ERPNext could not find any matching payment entry")
+			proposals_wrapper.append(`<div class="text-center"><h5 class="text-muted">${empty_data_msg}</h5></div>`)
+		}
+
+		$(me.dialog.body).on('click', '.reconciliation-btn', (e) => {
+			const payment_entry = $(e.target).attr('data-name');
+			const payment_doctype = $(e.target).attr('data-doctype');
+			frappe.xcall('erpnext.accounts.page.bank_reconciliation.bank_reconciliation.reconcile',
+				{bank_transaction: me.bank_entry, payment_doctype: payment_doctype, payment_name: payment_entry})
+			.then((result) => {
+				setTimeout(function(){
+					erpnext.accounts.ReconciliationList.refresh();
+				}, 2000);
+				me.dialog.hide();
+			})
+		})
+
+		me.dialog.show();
+	}
+
+	display_payment_details(event) {
+		const me = this;
+		if (event.value) {
+			let dt = me.dialog.fields_dict.payment_doctype.value;
+			me.dialog.fields_dict['payment_details'].$wrapper.empty();
+			frappe.db.get_doc(dt, event.value)
+			.then(doc => {
+				let displayed_docs = []
+				if (dt === "Payment Entry") {
+					payment.currency = doc.payment_type == "Receive" ? doc.paid_to_account_currency : doc.paid_from_account_currency;
+					payment.doctype = dt
+					displayed_docs.push(payment);
+				} else if (dt === "Journal Entry") {
+					doc.accounts.forEach(payment => {
+						if (payment.account === me.gl_account) {
+							payment.doctype = dt;
+							payment.posting_date = doc.posting_date;
+							payment.party = doc.pay_to_recd_from;
+							payment.reference_no = doc.cheque_no;
+							payment.reference_date = doc.cheque_date;
+							payment.currency = payment.account_currency;
+							payment.paid_amount = payment.credit > 0 ? payment.credit : payment.debit;
+							payment.name = doc.name;
+							displayed_docs.push(payment);
+						}
+					})
+				} else if (dt === "Sales Invoice") {
+					doc.payments.forEach(payment => {
+						if (payment.clearance_date === null || payment.clearance_date === "") {
+							payment.doctype = dt;
+							payment.posting_date = doc.posting_date;
+							payment.party = doc.customer;
+							payment.reference_no = doc.remarks;
+							payment.currency = doc.currency;
+							payment.paid_amount = payment.amount;
+							payment.name = doc.name;
+							displayed_docs.push(payment);
+						}
+					})
+				}
+
+				const details_wrapper = me.dialog.fields_dict.payment_details.$wrapper;
+				details_wrapper.append(frappe.render_template("linked_payment_header"));
+				displayed_docs.forEach(values => {
+					details_wrapper.append(frappe.render_template("linked_payment_row", values));
+				})
+			})
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.json
new file mode 100644
index 0000000..feea368
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.json
@@ -0,0 +1,29 @@
+{
+ "content": null, 
+ "creation": "2018-11-24 12:03:14.646669", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "idx": 0, 
+ "modified": "2018-11-24 12:03:14.646669", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "bank-reconciliation", 
+ "owner": "Administrator", 
+ "page_name": "bank-reconciliation", 
+ "roles": [
+  {
+   "role": "System Manager"
+  }, 
+  {
+   "role": "Accounts Manager"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ], 
+ "script": null, 
+ "standard": "Yes", 
+ "style": null, 
+ "system_page": 0, 
+ "title": "Bank Reconciliation"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
new file mode 100644
index 0000000..36c9399
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
@@ -0,0 +1,378 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+import difflib
+from frappe.utils import flt
+from six import iteritems
+from erpnext import get_company_currency
+
+@frappe.whitelist()
+def reconcile(bank_transaction, payment_doctype, payment_name):
+	transaction = frappe.get_doc("Bank Transaction", bank_transaction)
+	payment_entry = frappe.get_doc(payment_doctype, payment_name)
+
+	account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
+	gl_entry = frappe.get_doc("GL Entry", dict(account=account, voucher_type=payment_doctype, voucher_no=payment_name))
+
+	if transaction.unallocated_amount == 0:
+		frappe.throw(_("This bank transaction is already fully reconciled"))
+
+	if transaction.credit > 0 and gl_entry.credit > 0:
+		frappe.throw(_("The selected payment entry should be linked with a debtor bank transaction"))
+
+	if transaction.debit > 0 and gl_entry.debit > 0:
+		frappe.throw(_("The selected payment entry should be linked with a creditor bank transaction"))
+
+	add_payment_to_transaction(transaction, payment_entry, gl_entry)
+
+	return 'reconciled'
+
+def add_payment_to_transaction(transaction, payment_entry, gl_entry):
+	gl_amount, transaction_amount = (gl_entry.credit, transaction.debit) if gl_entry.credit > 0 else (gl_entry.debit, transaction.credit)
+	allocated_amount = gl_amount if gl_amount <= transaction_amount else transaction_amount
+	transaction.append("payment_entries", {
+		"payment_document": payment_entry.doctype,
+		"payment_entry": payment_entry.name,
+		"allocated_amount": allocated_amount
+	})
+
+	transaction.save()
+	transaction.update_allocations()
+
+@frappe.whitelist()
+def get_linked_payments(bank_transaction):
+	transaction = frappe.get_doc("Bank Transaction", bank_transaction)
+	bank_account = frappe.db.get_values("Bank Account", transaction.bank_account, ["account", "company"], as_dict=True)
+
+	# Get all payment entries with a matching amount
+	amount_matching = check_matching_amount(bank_account[0].account, bank_account[0].company, transaction)
+
+	# Get some data from payment entries linked to a corresponding bank transaction
+	description_matching = get_matching_descriptions_data(bank_account[0].company, transaction)
+
+	if amount_matching:
+		return check_amount_vs_description(amount_matching, description_matching)
+
+	elif description_matching:
+		description_matching = filter(lambda x: not x.get('clearance_date'), description_matching)
+		if not description_matching:
+			return []
+
+		return sorted(list(description_matching), key = lambda x: x["posting_date"], reverse=True)
+
+	else:
+		return []
+
+def check_matching_amount(bank_account, company, transaction):
+	payments = []
+	amount = transaction.credit if transaction.credit > 0 else transaction.debit
+
+	payment_type = "Receive" if transaction.credit > 0 else "Pay"
+	account_from_to = "paid_to" if transaction.credit > 0 else "paid_from"
+	currency_field = "paid_to_account_currency as currency" if transaction.credit > 0 else "paid_from_account_currency as currency"
+
+	payment_entries = frappe.get_all("Payment Entry", fields=["'Payment Entry' as doctype", "name", "paid_amount", "payment_type", "reference_no", "reference_date",
+		"party", "party_type", "posting_date", "{0}".format(currency_field)], filters=[["paid_amount", "like", "{0}%".format(amount)],
+		["docstatus", "=", "1"], ["payment_type", "=", [payment_type, "Internal Transfer"]], ["ifnull(clearance_date, '')", "=", ""], ["{0}".format(account_from_to), "=", "{0}".format(bank_account)]])
+
+	if transaction.credit > 0:
+		journal_entries = frappe.db.sql("""
+			SELECT
+				'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
+				je.pay_to_recd_from as party, je.cheque_date as reference_date, jea.debit_in_account_currency as paid_amount
+			FROM
+				`tabJournal Entry Account` as jea
+			JOIN
+				`tabJournal Entry` as je
+			ON
+				jea.parent = je.name
+			WHERE
+				(je.clearance_date is null or je.clearance_date='0000-00-00')
+			AND
+				jea.account = %s
+			AND
+				jea.debit_in_account_currency like %s
+			AND
+				je.docstatus = 1
+		""", (bank_account, amount), as_dict=True)
+	else:
+		journal_entries = frappe.db.sql("""
+			SELECT
+				'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
+				jea.account_currency as currency, je.pay_to_recd_from as party, je.cheque_date as reference_date,
+				jea.credit_in_account_currency as paid_amount
+			FROM
+				`tabJournal Entry Account` as jea
+			JOIN
+				`tabJournal Entry` as je
+			ON
+				jea.parent = je.name
+			WHERE
+				(je.clearance_date is null or je.clearance_date='0000-00-00')
+			AND
+				jea.account = %(bank_account)s
+			AND
+				jea.credit_in_account_currency like %(txt)s
+			AND
+				je.docstatus = 1
+		""", {
+			'bank_account': bank_account,
+			'txt': '%%%s%%' % amount
+		}, as_dict=True)
+
+		frappe.errprint(journal_entries)
+
+	if transaction.credit > 0:
+		sales_invoices = frappe.db.sql("""
+			SELECT
+				'Sales Invoice' as doctype, si.name, si.customer as party,
+				si.posting_date, sip.amount as paid_amount
+			FROM
+				`tabSales Invoice Payment` as sip
+			JOIN
+				`tabSales Invoice` as si
+			ON
+				sip.parent = si.name
+			WHERE
+				(sip.clearance_date is null or sip.clearance_date='0000-00-00')
+			AND
+				sip.account = %s
+			AND
+				sip.amount like %s
+			AND
+				si.docstatus = 1
+		""", (bank_account, amount), as_dict=True)
+	else:
+		sales_invoices = []
+
+	if transaction.debit > 0:
+		purchase_invoices = frappe.get_all("Purchase Invoice",
+			fields = ["'Purchase Invoice' as doctype", "name", "paid_amount", "supplier as party", "posting_date", "currency"],
+			filters=[
+				["paid_amount", "like", "{0}%".format(amount)],
+				["docstatus", "=", "1"],
+				["is_paid", "=", "1"],
+				["ifnull(clearance_date, '')", "=", ""],
+				["cash_bank_account", "=", "{0}".format(bank_account)]
+			]
+		)
+
+		mode_of_payments = [x["parent"] for x in frappe.db.get_list("Mode of Payment Account",
+			filters={"default_account": bank_account}, fields=["parent"])]
+
+		company_currency = get_company_currency(company)
+
+		expense_claims = frappe.get_all("Expense Claim",
+			fields=["'Expense Claim' as doctype", "name", "total_sanctioned_amount as paid_amount",
+				"employee as party", "posting_date", "'{0}' as currency".format(company_currency)],
+			filters=[
+				["total_sanctioned_amount", "like", "{0}%".format(amount)],
+				["docstatus", "=", "1"],
+				["is_paid", "=", "1"],
+				["ifnull(clearance_date, '')", "=", ""],
+				["mode_of_payment", "in", "{0}".format(tuple(mode_of_payments))]
+			]
+		)
+	else:
+		purchase_invoices = expense_claims = []
+
+	for data in [payment_entries, journal_entries, sales_invoices, purchase_invoices, expense_claims]:
+		if data:
+			payments.extend(data)
+
+	return payments
+
+def get_matching_descriptions_data(company, transaction):
+	if not transaction.description :
+		return []
+
+	bank_transactions = frappe.db.sql("""
+		SELECT
+			bt.name, bt.description, bt.date, btp.payment_document, btp.payment_entry
+		FROM
+			`tabBank Transaction` as bt
+		LEFT JOIN
+			`tabBank Transaction Payments` as btp
+		ON
+			bt.name = btp.parent
+		WHERE
+			bt.allocated_amount > 0
+		AND
+			bt.docstatus = 1
+		""", as_dict=True)
+
+	selection = []
+	for bank_transaction in bank_transactions:
+		if bank_transaction.description:
+			seq=difflib.SequenceMatcher(lambda x: x == " ", transaction.description, bank_transaction.description)
+
+			if seq.ratio() > 0.6:
+				bank_transaction["ratio"] = seq.ratio()
+				selection.append(bank_transaction)
+
+	document_types = set([x["payment_document"] for x in selection])
+
+	links = {}
+	for document_type in document_types:
+		links[document_type] = [x["payment_entry"] for x in selection if x["payment_document"]==document_type]
+
+
+	data = []
+	company_currency = get_company_currency(company)
+	for key, value in iteritems(links):
+		if key == "Payment Entry":
+			data.extend(frappe.get_all("Payment Entry", filters=[["name", "in", value]],
+				fields=["'Payment Entry' as doctype", "posting_date", "party", "reference_no",
+					"reference_date", "paid_amount", "paid_to_account_currency as currency", "clearance_date"]))
+		if key == "Journal Entry":
+			journal_entries = frappe.get_all("Journal Entry", filters=[["name", "in", value]],
+				fields=["name", "'Journal Entry' as doctype", "posting_date",
+					"pay_to_recd_from as party", "cheque_no as reference_no", "cheque_date as reference_date",
+					"total_credit as paid_amount", "clearance_date"])
+			for journal_entry in journal_entries:
+				journal_entry_accounts = frappe.get_all("Journal Entry Account", filters={"parenttype": journal_entry["doctype"], "parent": journal_entry["name"]}, fields=["account_currency"])
+				journal_entry["currency"] = journal_entry_accounts[0]["account_currency"] if journal_entry_accounts else company_currency
+			data.extend(journal_entries)
+		if key == "Sales Invoice":
+			data.extend(frappe.get_all("Sales Invoice", filters=[["name", "in", value]], fields=["'Sales Invoice' as doctype", "posting_date", "customer_name as party", "paid_amount", "currency"]))
+		if key == "Purchase Invoice":
+			data.extend(frappe.get_all("Purchase Invoice", filters=[["name", "in", value]], fields=["'Purchase Invoice' as doctype", "posting_date", "supplier_name as party", "paid_amount", "currency"]))
+		if key == "Expense Claim":
+			expense_claims = frappe.get_all("Expense Claim", filters=[["name", "in", value]], fields=["'Expense Claim' as doctype", "posting_date", "employee_name as party", "total_amount_reimbursed as paid_amount"])
+			data.extend([dict(x,**{"currency": company_currency}) for x in expense_claims])
+
+	return data
+
+def check_amount_vs_description(amount_matching, description_matching):
+	result = []
+
+	if description_matching:
+		for am_match in amount_matching:
+			for des_match in description_matching:
+				if des_match.get("clearance_date"):
+					continue
+
+				if am_match["party"] == des_match["party"]:
+					if am_match not in result:
+						result.append(am_match)
+						continue
+
+				if "reference_no" in am_match and "reference_no" in des_match:
+					if difflib.SequenceMatcher(lambda x: x == " ", am_match["reference_no"], des_match["reference_no"]).ratio() > 70:
+						if am_match not in result:
+							result.append(am_match)
+		if result:
+			return sorted(result, key = lambda x: x["posting_date"], reverse=True)
+		else:
+			return sorted(amount_matching, key = lambda x: x["posting_date"], reverse=True)
+
+	else:
+		return sorted(amount_matching, key = lambda x: x["posting_date"], reverse=True)
+
+def get_matching_transactions_payments(description_matching):
+	payments = [x["payment_entry"] for x in description_matching]
+
+	payment_by_ratio = {x["payment_entry"]: x["ratio"] for x in description_matching}
+
+	if payments:
+		reference_payment_list = frappe.get_all("Payment Entry", fields=["name", "paid_amount", "payment_type", "reference_no", "reference_date",
+			"party", "party_type", "posting_date", "paid_to_account_currency"], filters=[["name", "in", payments]])
+
+		return sorted(reference_payment_list, key=lambda x: payment_by_ratio[x["name"]])
+
+	else:
+		return []
+
+def payment_entry_query(doctype, txt, searchfield, start, page_len, filters):
+	account = frappe.db.get_value("Bank Account", filters.get("bank_account"), "account")
+	if not account:
+		return
+
+	return frappe.db.sql("""
+		SELECT
+			name, party, paid_amount, received_amount, reference_no
+		FROM
+			`tabPayment Entry`
+		WHERE
+			(clearance_date is null or clearance_date='0000-00-00')
+			AND (paid_from = %(account)s or paid_to = %(account)s)
+			AND (name like %(txt)s or party like %(txt)s)
+			AND docstatus = 1
+		ORDER BY
+			if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999), name
+		LIMIT
+			%(start)s, %(page_len)s""",
+		{
+			'txt': "%%%s%%" % txt,
+			'_txt': txt.replace("%", ""),
+			'start': start,
+			'page_len': page_len,
+			'account': account
+		}
+	)
+
+def journal_entry_query(doctype, txt, searchfield, start, page_len, filters):
+	account = frappe.db.get_value("Bank Account", filters.get("bank_account"), "account")
+
+	return frappe.db.sql("""
+		SELECT
+			jea.parent, je.pay_to_recd_from,
+			if(jea.debit_in_account_currency > 0, jea.debit_in_account_currency, jea.credit_in_account_currency)
+		FROM
+			`tabJournal Entry Account` as jea
+		LEFT JOIN
+			`tabJournal Entry` as je
+		ON
+			jea.parent = je.name
+		WHERE
+			(je.clearance_date is null or je.clearance_date='0000-00-00')
+		AND
+			jea.account = %(account)s
+		AND
+			(jea.parent like %(txt)s or je.pay_to_recd_from like %(txt)s)
+		AND
+			je.docstatus = 1
+		ORDER BY
+			if(locate(%(_txt)s, jea.parent), locate(%(_txt)s, jea.parent), 99999),
+			jea.parent
+		LIMIT
+			%(start)s, %(page_len)s""",
+		{
+			'txt': "%%%s%%" % txt,
+			'_txt': txt.replace("%", ""),
+			'start': start,
+			'page_len': page_len,
+			'account': account
+		}
+	)
+
+def sales_invoices_query(doctype, txt, searchfield, start, page_len, filters):
+	return frappe.db.sql("""
+		SELECT
+			sip.parent, si.customer, sip.amount, sip.mode_of_payment
+		FROM
+			`tabSales Invoice Payment` as sip
+		LEFT JOIN
+			`tabSales Invoice` as si
+		ON
+			sip.parent = si.name
+		WHERE
+			(sip.clearance_date is null or sip.clearance_date='0000-00-00')
+		AND
+			(sip.parent like %(txt)s or si.customer like %(txt)s)
+		ORDER BY
+			if(locate(%(_txt)s, sip.parent), locate(%(_txt)s, sip.parent), 99999),
+			sip.parent
+		LIMIT
+			%(start)s, %(page_len)s""",
+		{
+			'txt': "%%%s%%" % txt,
+			'_txt': txt.replace("%", ""),
+			'start': start,
+			'page_len': page_len
+		}
+	)
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_transaction_header.html b/erpnext/accounts/page/bank_reconciliation/bank_transaction_header.html
new file mode 100644
index 0000000..94f183b
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_transaction_header.html
@@ -0,0 +1,21 @@
+<div class="transaction-header">
+	<div class="level list-row list-row-head text-muted small">
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{{ __("Date") }}
+		</div>
+		<div class="col-xs-11 col-sm-4 ellipsis list-subject">
+			{{ __("Description") }}
+		</div>
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{{ __("Debit") }}
+		</div>
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{{ __("Credit") }}
+		</div>
+		<div class="col-sm-1 ellipsis hidden-xs">
+			{{ __("Currency") }}
+		</div>
+		<div class="col-sm-1 ellipsis">
+		</div>
+	</div>
+</div>
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html b/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html
new file mode 100644
index 0000000..742b84c
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html
@@ -0,0 +1,36 @@
+<div class="list-row transaction-item">
+	<div>
+		<div class="clickable-section" data-name={{ name }}>
+			<div class="col-sm-2 ellipsis hidden-xs">
+				{%= frappe.datetime.str_to_user(date) %}
+			</div>
+			<div class="col-xs-8 col-sm-4 ellipsis list-subject">
+				{{ description }}
+			</div>
+			<div class="col-sm-2 ellipsis hidden-xs">
+				{%= format_currency(debit, currency) %}
+			</div>
+			<div class="col-sm-2 ellipsis hidden-xs">
+				{%= format_currency(credit, currency) %}
+			</div>
+			<div class="col-sm-1 ellipsis hidden-xs">
+				{{ currency }}
+			</div>
+		</div>
+		<div class="col-xs-3 col-sm-1">
+			<div class="btn-group">
+				<a class="dropdown-toggle btn btn-default btn-xs" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<span>Actions </span>
+					<span class="caret"></span>
+				</a>
+				<ul class="dropdown-menu reports-dropdown" style="max-height: 300px; overflow-y: auto; right: 0px; left: auto;">
+					<li><a class="new-reconciliation" data-name={{ name }}>{{ __("Reconcile") }}</a></li>
+					<li class="divider"></li>
+					<li><a class="new-payment" data-name={{ name }}>{{ __("New Payment") }}</a></li>
+					<li><a class="new-invoice" data-name={{ name }}>{{ __("New Invoice") }}</a></li>
+					<li><a class="new-expense" data-name={{ name }}>{{ __("New Expense") }}</a></li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/erpnext/accounts/page/bank_reconciliation/linked_payment_header.html b/erpnext/accounts/page/bank_reconciliation/linked_payment_header.html
new file mode 100644
index 0000000..4542c36
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/linked_payment_header.html
@@ -0,0 +1,21 @@
+<div class="transaction-header">
+	<div class="level list-row list-row-head text-muted small">
+		<div class="col-xs-3 col-sm-2 ellipsis">
+			{{ __("Payment Name") }}
+		</div>
+		<div class="col-xs-3 col-sm-2 ellipsis">
+			{{ __("Reference Date") }}
+		</div>
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{{ __("Amount") }}
+		</div>
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{{ __("Party") }}
+		</div>
+		<div class="col-xs-3 col-sm-2 ellipsis">
+			{{ __("Reference Number") }}
+		</div>
+		<div class="col-xs-2 col-sm-2">
+		</div>
+	</div>
+</div>
diff --git a/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html b/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html
new file mode 100644
index 0000000..bdbc9fc
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html
@@ -0,0 +1,36 @@
+<div class="list-row">
+	<div>
+		<div class="col-xs-3 col-sm-2 ellipsis">
+			{{ name }}
+		</div>
+		<div class="col-xs-3 col-sm-2 ellipsis">
+			{% if (typeof reference_date !== "undefined") %}
+				{%= frappe.datetime.str_to_user(reference_date) %}
+			{% else %}
+				{% if (typeof posting_date !== "undefined") %}
+					{%= frappe.datetime.str_to_user(posting_date) %}
+				{% endif %}
+			{% endif %}
+		</div>
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{{ format_currency(paid_amount, currency) }}
+		</div>
+		<div class="col-sm-2 ellipsis hidden-xs">
+			{% if (typeof party !== "undefined") %}
+				{{ party }}
+			{% endif %}
+		</div>
+		<div class="col-xs-3 col-sm-2 ellipsis">
+			{% if (typeof reference_no !== "undefined") %}
+				{{ reference_no }}
+			{% else %}
+				{{ "" }}
+			{% endif %}
+		</div>
+		<div class="col-xs-2 col-sm-2">
+			<div class="text-right margin-bottom">
+				<button class="btn btn-primary btn-xs reconciliation-btn" data-doctype="{{ doctype }}" data-name="{{ name }}">{{ __("Reconcile") }}</button>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 4550ded..3834c96 100755
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -1957,6 +1957,12 @@
 			}],
 			function(values){
 				me.item_batch_no[me.items[0].item_code] = values.batch;
+				const item = me.frm.doc.items.find(
+					({ item_code }) => item_code === me.items[0].item_code
+				);
+				if (item) {
+					item.batch_no = values.batch;
+				}
 			},
 			__('Select Batch No'))
 		}
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 26e445b..cb94722 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -44,7 +44,7 @@
 		frappe.throw(_("Not permitted for {0}").format(party), frappe.PermissionError)
 
 	party = frappe.get_doc(party_type, party)
-	currency = party.default_currency if party.default_currency else get_company_currency(company)
+	currency = party.default_currency if party.get("default_currency") else get_company_currency(company)
 
 	party_address, shipping_address = set_address_details(out, party, party_type, doctype, company, party_address, shipping_address)
 	set_contact_details(out, party, party_type)
@@ -144,7 +144,7 @@
 
 def get_default_price_list(party):
 	"""Return default price list for party (Document object)"""
-	if party.default_price_list:
+	if party.get("default_price_list"):
 		return party.default_price_list
 
 	if party.doctype == "Customer":
diff --git a/erpnext/accounts/print_format/credit_note/credit_note.json b/erpnext/accounts/print_format/credit_note/credit_note.json
index 863d4aa..c5a11cf 100644
--- a/erpnext/accounts/print_format/credit_note/credit_note.json
+++ b/erpnext/accounts/print_format/credit_note/credit_note.json
@@ -1,19 +1,23 @@
 {
- "creation": "2014-08-28 11:11:39.796473", 
- "custom_format": 0, 
- "disabled": 0, 
- "doc_type": "Journal Entry", 
- "docstatus": 0, 
- "doctype": "Print Format", 
- "html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Credit Note\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n    {%- for label, value in (\n        (_(\"Credit To\"), doc.pay_to_recd_from),\n        (_(\"Date\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"Remarks\"), doc.remark)\n    ) -%}\n\n    <div class=\"row\">\n        <div class=\"col-xs-3\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-9\">{{ value }}</div>\n    </div>\n\n    {%- endfor -%}\n\n    <hr>\n    <br>\n    <p class=\"strong\">\n        {{ _(\"For\") }} {{ doc.company }},<br>\n        <br>\n        <br>\n        <br>\n        {{ _(\"Authorized Signatory\") }}\n    </p>\n</div>\n\n\n", 
- "idx": 2, 
- "modified": "2015-07-22 17:42:01.560817", 
- "modified_by": "Administrator", 
- "name": "Credit Note", 
- "owner": "Administrator", 
- "parent": "Journal Entry", 
- "parentfield": "__print_formats", 
- "parenttype": "DocType", 
- "print_format_type": "Server", 
+ "align_labels_right": 0,
+ "creation": "2014-08-28 11:11:39.796473",
+ "custom_format": 0,
+ "disabled": 0,
+ "doc_type": "Journal Entry",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"<div class=\\\"print-heading\\\">\\t\\t\\t\\t<h2>Journal Entry<br><small>{{ doc.name }}</small>\\t\\t\\t\\t</h2></div>\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"voucher_type\", \"print_hide\": 0, \"label\": \"Entry Type\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"posting_date\", \"print_hide\": 0, \"label\": \"Posting Date\"}, {\"fieldname\": \"finance_book\", \"print_hide\": 0, \"label\": \"Finance Book\"}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"accounts\", \"print_hide\": 0, \"label\": \"Accounting Entries\", \"visible_columns\": [{\"fieldname\": \"account\", \"print_width\": \"250px\", \"print_hide\": 0}, {\"fieldname\": \"bank_account_no\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"party_type\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"party\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"debit_in_account_currency\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"credit_in_account_currency\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"reference_type\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"reference_name\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"reference_due_date\", \"print_width\": \"\", \"print_hide\": 0}, {\"fieldname\": \"project\", \"print_width\": \"\", \"print_hide\": 0}]}, {\"fieldtype\": \"Section Break\", \"label\": \"\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"cheque_no\", \"print_hide\": 0, \"label\": \"Reference Number\"}, {\"fieldname\": \"cheque_date\", \"print_hide\": 0, \"label\": \"Reference Date\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"get_balance\", \"print_hide\": 0, \"label\": \"Make Difference Entry\"}, {\"fieldname\": \"total_amount\", \"print_hide\": 0, \"label\": \"Total Amount\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Reference\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"clearance_date\", \"print_hide\": 0, \"label\": \"Clearance Date\"}, {\"fieldname\": \"remark\", \"print_hide\": 0, \"label\": \"Remark\"}, {\"fieldname\": \"inter_company_journal_entry_reference\", \"print_hide\": 0, \"label\": \"Inter Company Journal Entry Reference\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"due_date\", \"print_hide\": 0, \"label\": \"Due Date\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Printing Settings\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"pay_to_recd_from\", \"print_hide\": 0, \"label\": \"Pay To / Recd From\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"letter_head\", \"print_hide\": 0, \"label\": \"Letter Head\"}, {\"fieldtype\": \"Section Break\", \"label\": \"More Information\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"mode_of_payment\", \"print_hide\": 0, \"label\": \"Mode of Payment\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"stock_entry\", \"print_hide\": 0, \"label\": \"Stock Entry\"}]",
+ "html": "{%- from \"templates/print_formats/standard_macros.html\" import add_header -%}\n\n<div class=\"page-break\">\n    {%- if not doc.get(\"print_heading\") and not doc.get(\"select_print_heading\") \n        and doc.set(\"select_print_heading\", _(\"Credit Note\")) -%}{%- endif -%}\n    {{ add_header(0, 1, doc, letter_head, no_letterhead) }}\n\n    {%- for label, value in (\n        (_(\"Credit To\"), doc.pay_to_recd_from),\n        (_(\"Date\"), frappe.utils.formatdate(doc.voucher_date)),\n        (_(\"Amount\"), \"<strong>\" + doc.get_formatted(\"total_amount\") + \"</strong><br>\" + (doc.total_amount_in_words or \"\") + \"<br>\"),\n        (_(\"Remarks\"), doc.remark)\n    ) -%}\n\n    <div class=\"row\">\n        <div class=\"col-xs-3\"><label class=\"text-right\">{{ label }}</label></div>\n        <div class=\"col-xs-9\">{{ value }}</div>\n    </div>\n\n    {%- endfor -%}\n\n    <hr>\n    <br>\n    <p class=\"strong\">\n        {{ _(\"For\") }} {{ doc.company }},<br>\n        <br>\n        <br>\n        <br>\n        {{ _(\"Authorized Signatory\") }}\n    </p>\n</div>\n\n\n",
+ "idx": 2,
+ "line_breaks": 0,
+ "modified": "2019-04-18 12:10:14.732269",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Credit Note",
+ "owner": "Administrator",
+ "parentfield": "__print_formats",
+ "print_format_builder": 0,
+ "print_format_type": "Server",
+ "show_section_headings": 0,
  "standard": "Yes"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index 9560b2a..70f193e 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -8,6 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
+			"reqd": 1,
 			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index 27c7993..3661afe 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -8,6 +8,7 @@
 			"label": __("Company"),
 			"fieldtype": "Link",
 			"options": "Company",
+			"reqd": 1,
 			"default": frappe.defaults.get_user_default("Company")
 		},
 		{
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 7127663..2973748 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -197,10 +197,9 @@
 			self.payment_term_map = self.get_payment_term_detail(voucher_nos)
 
 		for gle in gl_entries_data:
-			if self.is_receivable_or_payable(gle, self.dr_or_cr, future_vouchers):
+			if self.is_receivable_or_payable(gle, self.dr_or_cr, future_vouchers, return_entries):
 				outstanding_amount, credit_note_amount, payment_amount = self.get_outstanding_amount(
 					gle,self.filters.report_date, self.dr_or_cr, return_entries)
-
 				temp_outstanding_amt = outstanding_amount
 				temp_credit_note_amt = credit_note_amount
 
@@ -379,7 +378,7 @@
 		# returns a generator
 		return self.get_gl_entries(party_type, report_date)
 
-	def is_receivable_or_payable(self, gle, dr_or_cr, future_vouchers):
+	def is_receivable_or_payable(self, gle, dr_or_cr, future_vouchers, return_entries):
 		return (
 			# advance
 			(not gle.against_voucher) or
@@ -390,30 +389,37 @@
 			# sales invoice/purchase invoice
 			(gle.against_voucher==gle.voucher_no and gle.get(dr_or_cr) > 0) or
 
+			# standalone credit notes
+			(gle.against_voucher==gle.voucher_no and gle.voucher_no in return_entries and not return_entries.get(gle.voucher_no)) or
+
 			# entries adjusted with future vouchers
 			((gle.against_voucher_type, gle.against_voucher) in future_vouchers)
 		)
 
 	def get_return_entries(self, party_type):
 		doctype = "Sales Invoice" if party_type=="Customer" else "Purchase Invoice"
-		return [d.name for d in frappe.get_all(doctype, filters={"is_return": 1, "docstatus": 1})]
+		return_entries = frappe._dict(frappe.get_all(doctype,
+			filters={"is_return": 1, "docstatus": 1}, fields=["name", "return_against"], as_list=1))
+		return return_entries
 
 	def get_outstanding_amount(self, gle, report_date, dr_or_cr, return_entries):
 		payment_amount, credit_note_amount = 0.0, 0.0
 		reverse_dr_or_cr = "credit" if dr_or_cr=="debit" else "debit"
-
 		for e in self.get_gl_entries_for(gle.party, gle.party_type, gle.voucher_type, gle.voucher_no):
-			if getdate(e.posting_date) <= report_date and e.name!=gle.name:
+			if getdate(e.posting_date) <= report_date \
+				and (e.name!=gle.name or (e.voucher_no in return_entries and not return_entries.get(e.voucher_no))):
+
 				amount = flt(e.get(reverse_dr_or_cr), self.currency_precision) - flt(e.get(dr_or_cr), self.currency_precision)
 				if e.voucher_no not in return_entries:
 					payment_amount += amount
 				else:
 					credit_note_amount += amount
 
-		outstanding_amount = (flt((flt(gle.get(dr_or_cr), self.currency_precision)
-			- flt(gle.get(reverse_dr_or_cr), self.currency_precision)
-			- payment_amount - credit_note_amount), self.currency_precision))
+		voucher_amount = flt(gle.get(dr_or_cr), self.currency_precision) - flt(gle.get(reverse_dr_or_cr), self.currency_precision)
+		if gle.voucher_no in return_entries and not return_entries.get(gle.voucher_no):
+			voucher_amount = 0
 
+		outstanding_amount = flt((voucher_amount - payment_amount - credit_note_amount), self.currency_precision)
 		credit_note_amount = flt(credit_note_amount, self.currency_precision)
 
 		return outstanding_amount, credit_note_amount, payment_amount
@@ -541,10 +547,11 @@
 			conditions.append("""cost_center in (select name from `tabCost Center` where
 				lft >= {0} and rgt <= {1})""".format(lft, rgt))
 
-		accounts = [d.name for d in frappe.get_all("Account",
-			filters={"account_type": account_type, "company": self.filters.company})]
-		conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts)))
-		values += accounts
+		if self.filters.company:
+			accounts = [d.name for d in frappe.get_all("Account",
+				filters={"account_type": account_type, "company": self.filters.company})]
+			conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts)))
+			values += accounts
 
 		return " and ".join(conditions), values
 
@@ -592,9 +599,12 @@
 
 		rows = []
 		for d in data:
+			values = d[self.ageing_col_idx_start : self.ageing_col_idx_start+5]
+			precision = cint(frappe.db.get_default("float_precision")) or 2
+			formatted_values = [frappe.utils.rounded(val, precision) for val in values]
 			rows.append(
 				{
-					'values': d[self.ageing_col_idx_start : self.ageing_col_idx_start+5]
+					'values': formatted_values
 				}
 			)
 
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.js b/erpnext/accounts/report/balance_sheet/balance_sheet.js
index f22f3a1..4bc29da 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.js
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.js
@@ -10,4 +10,10 @@
 		"fieldtype": "Check",
 		"default": 1
 	});
+
+	frappe.query_reports["Balance Sheet"]["filters"].push({
+		"fieldname": "include_default_book_entries",
+		"label": __("Include Default Book Entries"),
+		"fieldtype": "Check"
+	});
 });
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.js b/erpnext/accounts/report/cash_flow/cash_flow.js
index 391f57b..0422111 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.js
+++ b/erpnext/accounts/report/cash_flow/cash_flow.js
@@ -15,4 +15,10 @@
 		"label": __("Accumulated Values"),
 		"fieldtype": "Check"
 	});
+
+	frappe.query_reports["Cash Flow"]["filters"].push({
+		"fieldname": "include_default_book_entries",
+		"label": __("Include Default Book Entries"),
+		"fieldtype": "Check"
+	});
 });
\ No newline at end of file
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index f048c1a..75d99e7 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -14,8 +14,8 @@
 	if cint(frappe.db.get_single_value('Accounts Settings', 'use_custom_cash_flow')):
 		from erpnext.accounts.report.cash_flow.custom_cash_flow import execute as execute_custom
 		return execute_custom(filters=filters)
-		
-	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year, 
+
+	period_list = get_period_list(filters.from_fiscal_year, filters.to_fiscal_year,
 		filters.periodicity, filters.accumulated_values, filters.company)
 
 	cash_flow_accounts = get_cash_flow_accounts()
@@ -25,18 +25,18 @@
 		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
 	expense = get_data(filters.company, "Expense", "Debit", period_list, filters=filters,
 		accumulated_values=filters.accumulated_values, ignore_closing_entries=True, ignore_accumulated_values_for_fy= True)
-		
+
 	net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company)
 
 	data = []
 	company_currency = frappe.get_cached_value('Company',  filters.company,  "default_currency")
-	
+
 	for cash_flow_account in cash_flow_accounts:
 		section_data = []
 		data.append({
-			"account_name": cash_flow_account['section_header'], 
+			"account_name": cash_flow_account['section_header'],
 			"parent_account": None,
-			"indent": 0.0, 
+			"indent": 0.0,
 			"account": cash_flow_account['section_header']
 		})
 
@@ -44,18 +44,18 @@
 			# add first net income in operations section
 			if net_profit_loss:
 				net_profit_loss.update({
-					"indent": 1, 
+					"indent": 1,
 					"parent_account": cash_flow_accounts[0]['section_header']
 				})
 				data.append(net_profit_loss)
 				section_data.append(net_profit_loss)
 
 		for account in cash_flow_account['account_types']:
-			account_data = get_account_type_based_data(filters.company, 
-				account['account_type'], period_list, filters.accumulated_values)
+			account_data = get_account_type_based_data(filters.company,
+				account['account_type'], period_list, filters.accumulated_values, filters)
 			account_data.update({
 				"account_name": account['label'],
-				"account": account['label'], 
+				"account": account['label'],
 				"indent": 1,
 				"parent_account": cash_flow_account['section_header'],
 				"currency": company_currency
@@ -63,7 +63,7 @@
 			data.append(account_data)
 			section_data.append(account_data)
 
-		add_total_row_account(data, section_data, cash_flow_account['section_footer'], 
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'],
 			period_list, company_currency)
 
 	add_total_row_account(data, data, _("Net Change in Cash"), period_list, company_currency)
@@ -105,13 +105,15 @@
 	# combine all cash flow accounts for iteration
 	return [operation_accounts, investing_accounts, financing_accounts]
 
-def get_account_type_based_data(company, account_type, period_list, accumulated_values):
+def get_account_type_based_data(company, account_type, period_list, accumulated_values, filters):
 	data = {}
 	total = 0
 	for period in period_list:
 		start_date = get_start_date(period, accumulated_values, company)
 
-		amount = get_account_type_based_gl_data(company, start_date, period['to_date'], account_type)
+		amount = get_account_type_based_gl_data(company, start_date,
+			period['to_date'], account_type, filters)
+
 		if amount and account_type == "Depreciation":
 			amount *= -1
 
@@ -121,14 +123,24 @@
 	data["total"] = total
 	return data
 
-def get_account_type_based_gl_data(company, start_date, end_date, account_type):
+def get_account_type_based_gl_data(company, start_date, end_date, account_type, filters):
+	cond = ""
+
+	if filters.finance_book:
+		cond = " and finance_book = %s" %(frappe.db.escape(filters.finance_book))
+		if filters.include_default_book_entries:
+			company_fb = frappe.db.get_value("Company", company, 'default_finance_book')
+
+			cond = """ and finance_book in (%s, %s)
+				""" %(frappe.db.escape(filters.finance_book), frappe.db.escape(company_fb))
+
 	gl_sum = frappe.db.sql_list("""
 		select sum(credit) - sum(debit)
 		from `tabGL Entry`
 		where company=%s and posting_date >= %s and posting_date <= %s
 			and voucher_type != 'Period Closing Voucher'
-			and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
-	""", (company, start_date, end_date, account_type))
+			and account in ( SELECT name FROM tabAccount WHERE account_type = %s) {cond}
+	""".format(cond=cond), (company, start_date, end_date, account_type))
 
 	return gl_sum[0] if gl_sum and gl_sum[0] else 0
 
@@ -154,7 +166,7 @@
 				key = period if consolidated else period['key']
 				total_row.setdefault(key, 0.0)
 				total_row[key] += row.get(key, 0.0)
-			
+
 			total_row.setdefault("total", 0.0)
 			total_row["total"] += row["total"]
 
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
index 7b373f0..e69a993 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js
@@ -55,5 +55,10 @@
 			"fieldtype": "Check",
 			"default": 0
 		},
+		{
+			"fieldname": "include_default_book_entries",
+			"label": __("Include Default Book Entries"),
+			"fieldtype": "Check"
+		}
 	]
 }
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
index 0024931..c40310b 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -356,7 +356,8 @@
 				"lft": root_lft,
 				"rgt": root_rgt,
 				"company": d.name,
-				"finance_book": filters.get("finance_book")
+				"finance_book": filters.get("finance_book"),
+				"company_fb": frappe.db.get_value("Company", d.name, 'default_finance_book')
 			},
 			as_dict=True)
 
@@ -387,7 +388,10 @@
 		additional_conditions.append("gl.posting_date >= %(from_date)s")
 
 	if filters.get("finance_book"):
-		additional_conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
+		if filters.get("include_default_book_entries"):
+			additional_conditions.append("finance_book in (%(finance_book)s, %(company_fb)s)")
+		else:
+			additional_conditions.append("finance_book in (%(finance_book)s)")
 
 	return " and {}".format(" and ".join(additional_conditions)) if additional_conditions else ""
 
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index c06856a..7b9c939 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -322,7 +322,10 @@
 	"""Sort root types as Asset, Liability, Equity, Income, Expense"""
 
 	def compare_accounts(a, b):
-		if is_root:
+		if re.split('\W+', a[key])[0].isdigit():
+			# if chart of accounts is numbered, then sort by number
+			return cmp(a[key], b[key])
+		elif is_root:
 			if a.report_type != b.report_type and a.report_type == "Balance Sheet":
 				return -1
 			if a.root_type != b.root_type and a.root_type == "Asset":
@@ -353,8 +356,13 @@
 		"company": company,
 		"from_date": from_date,
 		"to_date": to_date,
+		"finance_book": filters.get("finance_book")
 	}
 
+	if filters.get("include_default_book_entries"):
+		gl_filters["company_fb"] = frappe.db.get_value("Company",
+			company, 'default_finance_book')
+
 	for key, value in filters.items():
 		if value:
 			gl_filters.update({
@@ -399,7 +407,10 @@
 			additional_conditions.append("cost_center in %(cost_center)s")
 
 		if filters.get("finance_book"):
-			additional_conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
+			if filters.get("include_default_book_entries"):
+				additional_conditions.append("finance_book in (%(finance_book)s, %(company_fb)s)")
+			else:
+				additional_conditions.append("finance_book in (%(finance_book)s)")
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 5c98b24..32af644 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -151,6 +151,11 @@
 			"label": __("Show Opening Entries"),
 			"fieldtype": "Check"
 		},
+		{
+			"fieldname": "include_default_book_entries",
+			"label": __("Include Default Book Entries"),
+			"fieldtype": "Check"
+		}
 	]
 }
 
@@ -166,4 +171,3 @@
 		});
 	});
 });
-
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 1c5e089..f7c0250 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -131,6 +131,10 @@
 			sum(debit_in_account_currency) as debit_in_account_currency,
 			sum(credit_in_account_currency) as  credit_in_account_currency"""
 
+	if filters.get("include_default_book_entries"):
+		filters['company_fb'] = frappe.db.get_value("Company",
+			filters.get("company"), 'default_finance_book')
+
 	gl_entries = frappe.db.sql(
 		"""
 		select
@@ -186,7 +190,10 @@
 		conditions.append("project in %(project)s")
 
 	if filters.get("finance_book"):
-		conditions.append("ifnull(finance_book, '') in (%(finance_book)s, '')")
+		if filters.get("include_default_book_entries"):
+			conditions.append("finance_book in (%(finance_book)s, %(company_fb)s)")
+		else:
+			conditions.append("finance_book in (%(finance_book)s)")
 
 	from frappe.desk.reportview import build_match_conditions
 	match_conditions = build_match_conditions("GL Entry")
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 9a02d1b..6ef6d6e 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -65,7 +65,7 @@
 		"warehouse": _("Warehouse") + ":Link/Warehouse",
 		"qty": _("Qty") + ":Float",
 		"base_rate": _("Avg. Selling Rate") + ":Currency/currency",
-		"buying_rate": _("Avg. Buying Rate") + ":Currency/currency",
+		"buying_rate": _("Valuation Rate") + ":Currency/currency",
 		"base_amount": _("Selling Amount") + ":Currency/currency",
 		"buying_amount": _("Buying Amount") + ":Currency/currency",
 		"gross_profit": _("Gross Profit") + ":Currency/currency",
diff --git a/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.json b/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.json
index c97f824..a9f79b7 100644
--- a/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.json
+++ b/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.json
@@ -1,14 +1,13 @@
 {
  "add_total_row": 0,
- "creation": "2019-05-01 13:46:23.044979",
+ "creation": "2019-05-01 12:59:52.018850",
  "disable_prepared_report": 0,
  "disabled": 0,
  "docstatus": 0,
  "doctype": "Report",
  "idx": 0,
  "is_standard": "Yes",
- "letter_head": "Test Letter Head 1",
- "modified": "2019-05-01 13:46:23.044979",
+ "modified": "2019-05-01 13:00:26.545278",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Inactive Sales Items",
@@ -17,5 +16,15 @@
  "ref_doctype": "Sales Invoice",
  "report_name": "Inactive Sales Items",
  "report_type": "Script Report",
- "roles": []
+ "roles": [
+  {
+   "role": "Accounts User"
+  },
+  {
+   "role": "Accounts Manager"
+  },
+  {
+   "role": "Auditor"
+  }
+ ]
 }
\ No newline at end of file
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 5d3253a..e8b19b4 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
@@ -102,9 +102,7 @@
 		("customer", " and `tabSales Invoice`.customer = %(customer)s"),
 		("item_code", " and `tabSales Invoice Item`.item_code = %(item_code)s"),
 		("from_date", " and `tabSales Invoice`.posting_date>=%(from_date)s"),
-		("to_date", " and `tabSales Invoice`.posting_date<=%(to_date)s"),
-		("company_gstin", " and `tabSales Invoice`.company_gstin = %(company_gstin)s"),
-		("invoice_type", " and `tabSales Invoice`.invoice_type = %(invoice_type)s")):
+		("to_date", " and `tabSales Invoice`.posting_date<=%(to_date)s")):
 			if filters.get(opts[0]):
 				conditions += opts[1]
 
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
index df5c982..a8362bf 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -19,6 +19,11 @@
 			"fieldname": "accumulated_values",
 			"label": __("Accumulated Values"),
 			"fieldtype": "Check"
+		},
+		{
+			"fieldname": "include_default_book_entries",
+			"label": __("Include Default Book Entries"),
+			"fieldtype": "Check"
 		}
 	);
 });
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index d37caaf..de60995 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -157,7 +157,7 @@
 		conditions +=  """ and exists(select name from `tabSales Invoice Item`
 			 where parent=`tabSales Invoice`.name
 			 	and ifnull(`tabSales Invoice Item`.brand, '') = %(brand)s)"""
-	
+
 	if filters.get("item_group"):
 		conditions +=  """ and exists(select name from `tabSales Invoice Item`
 			 where parent=`tabSales Invoice`.name
@@ -171,7 +171,7 @@
 
 	conditions = get_conditions(filters)
 	return frappe.db.sql("""
-		select name, posting_date, debit_to, project, customer, 
+		select name, posting_date, debit_to, project, customer,
 		customer_name, owner, remarks, territory, tax_id, customer_group,
 		base_net_total, base_grand_total, base_rounded_total, outstanding_amount {0}
 		from `tabSales Invoice`
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index cdc7745..8bc7280 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -96,3 +96,16 @@
 	}
 });
 
+let dimension_filters = erpnext.get_dimension_filters();
+
+dimension_filters.then((dimensions) => {
+	dimensions.forEach((dimension) => {
+		frappe.query_reports["Trial Balance"].filters.splice(5, 0 ,{
+			"fieldname": dimension["fieldname"],
+			"label": __(dimension["label"]),
+			"fieldtype": "Link",
+			"options": dimension["document_type"]
+		});
+	});
+});
+
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index b5f0186..b6ddaa8 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -7,6 +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
 
 value_fields = ("opening_debit", "opening_credit", "debit", "credit", "closing_debit", "closing_credit")
 
@@ -105,10 +106,29 @@
 	if filters.finance_book:
 		fb_conditions = " and finance_book = %(finance_book)s"
 		if filters.include_default_book_entries:
-			fb_conditions = " and (finance_book in (%(finance_book)s, %(company_fb)s) or finance_book is null)"
+			fb_conditions = " and (finance_book in (%(finance_book)s, %(company_fb)s))"
 
 		additional_conditions += fb_conditions
 
+	accounting_dimensions = get_accounting_dimensions()
+
+	query_filters = {
+		"company": filters.company,
+		"from_date": filters.from_date,
+		"report_type": report_type,
+		"year_start_date": filters.year_start_date,
+		"finance_book": filters.finance_book,
+		"company_fb": frappe.db.get_value("Company", filters.company, 'default_finance_book')
+	}
+
+	if accounting_dimensions:
+		for dimension in accounting_dimensions:
+			additional_conditions += """ and {0} in (%({0})s) """.format(dimension)
+
+			query_filters.update({
+				dimension: filters.get(dimension)
+			})
+
 	gle = frappe.db.sql("""
 		select
 			account, sum(debit) as opening_debit, sum(credit) as opening_credit
@@ -118,16 +138,7 @@
 			{additional_conditions}
 			and (posting_date < %(from_date)s or ifnull(is_opening, 'No') = 'Yes')
 			and account in (select name from `tabAccount` where report_type=%(report_type)s)
-		group by account""".format(additional_conditions=additional_conditions),
-		{
-			"company": filters.company,
-			"from_date": filters.from_date,
-			"report_type": report_type,
-			"year_start_date": filters.year_start_date,
-			"finance_book": filters.finance_book,
-			"company_fb": frappe.db.get_value("Company", filters.company, 'default_finance_book')
-		},
-		as_dict=True)
+		group by account""".format(additional_conditions=additional_conditions), query_filters , as_dict=True)
 
 	opening = frappe._dict()
 	for d in gle:
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 96f64e8..7a1f6c5 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -435,7 +435,7 @@
 	jv_obj.flags.ignore_validate_update_after_submit = True
 	jv_obj.save(ignore_permissions=True)
 
-def update_reference_in_payment_entry(d, payment_entry):
+def update_reference_in_payment_entry(d, payment_entry, do_not_save=False):
 	reference_details = {
 		"reference_doctype": d.against_voucher_type,
 		"reference_name": d.against_voucher,
@@ -466,7 +466,17 @@
 	payment_entry.setup_party_account_field()
 	payment_entry.set_missing_values()
 	payment_entry.set_amounts()
-	payment_entry.save(ignore_permissions=True)
+
+	if d.difference_amount and d.difference_account:
+		payment_entry.set_gain_or_loss(account_details={
+			'account': d.difference_account,
+			'cost_center': payment_entry.cost_center or frappe.get_cached_value('Company',
+				payment_entry.company, "cost_center"),
+			'amount': d.difference_amount
+		})
+
+	if not do_not_save:
+		payment_entry.save(ignore_permissions=True)
 
 def unlink_ref_doc_from_payment_entries(ref_doc):
 	remove_ref_doc_link_from_jv(ref_doc.doctype, ref_doc.name)
@@ -618,7 +628,7 @@
 	return held_invoices
 
 
-def get_outstanding_invoices(party_type, party, account, condition=None, limit=None):
+def get_outstanding_invoices(party_type, party, account, condition=None):
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
 
@@ -631,7 +641,6 @@
 
 	invoice = 'Sales Invoice' if erpnext.get_party_account_type(party_type) == 'Receivable' else 'Purchase Invoice'
 	held_invoices = get_held_invoices(party_type, party)
-	limit_cond = "limit %s" % limit if limit else ""
 
 	invoice_list = frappe.db.sql("""
 		select
@@ -646,11 +655,10 @@
 					and (against_voucher = '' or against_voucher is null))
 				or (voucher_type not in ('Journal Entry', 'Payment Entry')))
 		group by voucher_type, voucher_no
-		order by posting_date, name {limit_cond}""".format(
+		order by posting_date, name""".format(
 			dr_or_cr=dr_or_cr,
 			invoice = invoice,
-			condition=condition or "",
-			limit_cond = limit_cond
+			condition=condition or ""
 		), {
 			"party_type": party_type,
 			"party": party,
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 350856f..c60ec5e 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -1,497 +1,497 @@
 {
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "naming_series:",
- "creation": "2016-03-01 17:01:27.920130",
- "doctype": "DocType",
- "document_type": "Document",
- "field_order": [
-  "naming_series",
-  "asset_name",
-  "item_code",
-  "item_name",
-  "asset_category",
-  "asset_owner",
-  "asset_owner_company",
-  "supplier",
-  "customer",
-  "image",
-  "column_break_3",
-  "company",
-  "location",
-  "custodian",
-  "department",
-  "purchase_date",
-  "disposal_date",
-  "journal_entry_for_scrap",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "section_break_5",
-  "gross_purchase_amount",
-  "available_for_use_date",
-  "column_break_18",
-  "calculate_depreciation",
-  "is_existing_asset",
-  "opening_accumulated_depreciation",
-  "number_of_depreciations_booked",
-  "section_break_23",
-  "finance_books",
-  "section_break_33",
-  "depreciation_method",
-  "value_after_depreciation",
-  "total_number_of_depreciations",
-  "column_break_24",
-  "frequency_of_depreciation",
-  "next_depreciation_date",
-  "section_break_14",
-  "schedules",
-  "insurance_details",
-  "policy_number",
-  "insurer",
-  "insured_value",
-  "column_break_48",
-  "insurance_start_date",
-  "insurance_end_date",
-  "comprehensive_insurance",
-  "section_break_31",
-  "maintenance_required",
-  "other_details",
-  "status",
-  "booked_fixed_asset",
-  "column_break_51",
-  "purchase_receipt",
-  "purchase_receipt_amount",
-  "purchase_invoice",
-  "default_finance_book",
-  "amended_from"
- ],
- "fields": [
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Naming Series",
-   "options": "ACC-ASS-.YYYY.-"
-  },
-  {
-   "fieldname": "asset_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Asset Name",
-   "reqd": 1
-  },
-  {
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Item Code",
-   "options": "Item",
-   "reqd": 1
-  },
-  {
-   "fetch_from": "item_code.item_name",
-   "fieldname": "item_name",
-   "fieldtype": "Read Only",
-   "label": "Item Name"
-  },
-  {
-   "fetch_from": "item_code.asset_category",
-   "fieldname": "asset_category",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Asset Category",
-   "options": "Asset Category",
-   "read_only": 1
-  },
-  {
-   "fieldname": "asset_owner",
-   "fieldtype": "Select",
-   "label": "Asset Owner",
-   "options": "\nCompany\nSupplier\nCustomer"
-  },
-  {
-   "depends_on": "eval:doc.asset_owner == \"Company\"",
-   "fieldname": "asset_owner_company",
-   "fieldtype": "Link",
-   "label": "Asset Owner Company",
-   "options": "Company"
-  },
-  {
-   "depends_on": "eval:doc.asset_owner == \"Supplier\"",
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "label": "Supplier",
-   "options": "Supplier"
-  },
-  {
-   "depends_on": "eval:doc.asset_owner == \"Customer\"",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "label": "Customer",
-   "options": "Customer"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "image",
-   "fieldtype": "Attach Image",
-   "hidden": 1,
-   "label": "Image",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "remember_last_selected_value": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "location",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Location",
-   "options": "Location",
-   "reqd": 1
-  },
-  {
-   "fieldname": "custodian",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Custodian",
-   "options": "Employee"
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "label": "Department",
-   "options": "Department"
-  },
-  {
-   "fieldname": "purchase_date",
-   "fieldtype": "Date",
-   "label": "Purchase Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "disposal_date",
-   "fieldtype": "Date",
-   "label": "Disposal Date",
-   "read_only": 1
-  },
-  {
-   "fieldname": "journal_entry_for_scrap",
-   "fieldtype": "Link",
-   "label": "Journal Entry for Scrap",
-   "no_copy": 1,
-   "options": "Journal Entry",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "gross_purchase_amount",
-   "fieldtype": "Currency",
-   "label": "Gross Purchase Amount",
-   "options": "Company:company:default_currency",
-   "reqd": 1
-  },
-  {
-   "fieldname": "available_for_use_date",
-   "fieldtype": "Date",
-   "label": "Available-for-use Date"
-  },
-  {
-   "fieldname": "column_break_18",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "calculate_depreciation",
-   "fieldtype": "Check",
-   "label": "Calculate Depreciation"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_existing_asset",
-   "fieldtype": "Check",
-   "label": "Is Existing Asset"
-  },
-  {
-   "depends_on": "is_existing_asset",
-   "fieldname": "opening_accumulated_depreciation",
-   "fieldtype": "Currency",
-   "label": "Opening Accumulated Depreciation",
-   "no_copy": 1,
-   "options": "Company:company:default_currency"
-  },
-  {
-   "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)",
-   "fieldname": "number_of_depreciations_booked",
-   "fieldtype": "Int",
-   "label": "Number of Depreciations Booked",
-   "no_copy": 1
-  },
-  {
-   "depends_on": "calculate_depreciation",
-   "fieldname": "section_break_23",
-   "fieldtype": "Section Break",
-   "label": "Depreciation"
-  },
-  {
-   "fieldname": "finance_books",
-   "fieldtype": "Table",
-   "label": "Finance Books",
-   "options": "Asset Finance Book"
-  },
-  {
-   "fieldname": "section_break_33",
-   "fieldtype": "Section Break",
-   "hidden": 1
-  },
-  {
-   "fieldname": "depreciation_method",
-   "fieldtype": "Select",
-   "label": "Depreciation Method",
-   "options": "\nStraight Line\nDouble Declining Balance\nManual"
-  },
-  {
-   "fieldname": "value_after_depreciation",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Value After Depreciation",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_number_of_depreciations",
-   "fieldtype": "Int",
-   "label": "Total Number of Depreciations"
-  },
-  {
-   "fieldname": "column_break_24",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "frequency_of_depreciation",
-   "fieldtype": "Int",
-   "label": "Frequency of Depreciation (Months)"
-  },
-  {
-   "fieldname": "next_depreciation_date",
-   "fieldtype": "Date",
-   "label": "Next Depreciation Date",
-   "no_copy": 1
-  },
-  {
-   "depends_on": "calculate_depreciation",
-   "fieldname": "section_break_14",
-   "fieldtype": "Section Break",
-   "label": "Depreciation Schedule"
-  },
-  {
-   "fieldname": "schedules",
-   "fieldtype": "Table",
-   "label": "Depreciation Schedules",
-   "no_copy": 1,
-   "options": "Depreciation Schedule"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "insurance_details",
-   "fieldtype": "Section Break",
-   "label": "Insurance details"
-  },
-  {
-   "fieldname": "policy_number",
-   "fieldtype": "Data",
-   "label": "Policy number"
-  },
-  {
-   "fieldname": "insurer",
-   "fieldtype": "Data",
-   "label": "Insurer"
-  },
-  {
-   "fieldname": "insured_value",
-   "fieldtype": "Data",
-   "label": "Insured value"
-  },
-  {
-   "fieldname": "column_break_48",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "insurance_start_date",
-   "fieldtype": "Date",
-   "label": "Insurance Start Date"
-  },
-  {
-   "fieldname": "insurance_end_date",
-   "fieldtype": "Date",
-   "label": "Insurance End Date"
-  },
-  {
-   "fieldname": "comprehensive_insurance",
-   "fieldtype": "Data",
-   "label": "Comprehensive Insurance"
-  },
-  {
-   "fieldname": "section_break_31",
-   "fieldtype": "Section Break",
-   "label": "Maintenance"
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "0",
-   "description": "Check if Asset requires Preventive Maintenance or Calibration",
-   "fieldname": "maintenance_required",
-   "fieldtype": "Check",
-   "label": "Maintenance Required"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "other_details",
-   "fieldtype": "Section Break",
-   "label": "Other Details"
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "Draft",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Status",
-   "no_copy": 1,
-   "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped\nIn Maintenance\nOut of Order\nIssue\nReceipt",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "booked_fixed_asset",
-   "fieldtype": "Check",
-   "label": "Booked Fixed Asset",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_51",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "purchase_receipt",
-   "fieldtype": "Link",
-   "label": "Purchase Receipt",
-   "no_copy": 1,
-   "options": "Purchase Receipt",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "purchase_receipt_amount",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Purchase Receipt Amount",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "purchase_invoice",
-   "fieldtype": "Link",
-   "label": "Purchase Invoice",
-   "no_copy": 1,
-   "options": "Purchase Invoice",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "company.default_finance_book",
-   "fieldname": "default_finance_book",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Default Finance Book",
-   "options": "Finance Book",
-   "read_only": 1
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Asset",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  }
- ],
- "idx": 72,
- "image_field": "image",
- "is_submittable": 1,
- "modified": "2019-05-25 22:26:19.786201",
- "modified_by": "Administrator",
- "module": "Assets",
- "name": "Asset",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "import": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Quality Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  }
- ],
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "asset_name"
-}
\ No newline at end of file
+   "allow_import": 1,
+   "allow_rename": 1,
+   "autoname": "naming_series:",
+   "creation": "2016-03-01 17:01:27.920130",
+   "doctype": "DocType",
+   "document_type": "Document",
+   "field_order": [
+    "naming_series",
+    "asset_name",
+    "item_code",
+    "item_name",
+    "asset_category",
+    "asset_owner",
+    "asset_owner_company",
+    "supplier",
+    "customer",
+    "image",
+    "column_break_3",
+    "company",
+    "location",
+    "custodian",
+    "department",
+    "purchase_date",
+    "disposal_date",
+    "journal_entry_for_scrap",
+    "accounting_dimensions_section",
+    "cost_center",
+    "dimension_col_break",
+    "section_break_5",
+    "gross_purchase_amount",
+    "available_for_use_date",
+    "column_break_18",
+    "calculate_depreciation",
+    "is_existing_asset",
+    "opening_accumulated_depreciation",
+    "number_of_depreciations_booked",
+    "section_break_23",
+    "finance_books",
+    "section_break_33",
+    "depreciation_method",
+    "value_after_depreciation",
+    "total_number_of_depreciations",
+    "column_break_24",
+    "frequency_of_depreciation",
+    "next_depreciation_date",
+    "section_break_14",
+    "schedules",
+    "insurance_details",
+    "policy_number",
+    "insurer",
+    "insured_value",
+    "column_break_48",
+    "insurance_start_date",
+    "insurance_end_date",
+    "comprehensive_insurance",
+    "section_break_31",
+    "maintenance_required",
+    "other_details",
+    "status",
+    "booked_fixed_asset",
+    "column_break_51",
+    "purchase_receipt",
+    "purchase_receipt_amount",
+    "purchase_invoice",
+    "default_finance_book",
+    "amended_from"
+   ],
+   "fields": [
+    {
+     "fieldname": "naming_series",
+     "fieldtype": "Select",
+     "label": "Naming Series",
+     "options": "ACC-ASS-.YYYY.-"
+    },
+    {
+     "fieldname": "asset_name",
+     "fieldtype": "Data",
+     "in_list_view": 1,
+     "label": "Asset Name",
+     "reqd": 1
+    },
+    {
+     "fieldname": "item_code",
+     "fieldtype": "Link",
+     "in_standard_filter": 1,
+     "label": "Item Code",
+     "options": "Item",
+     "reqd": 1
+    },
+    {
+     "fetch_from": "item_code.item_name",
+     "fieldname": "item_name",
+     "fieldtype": "Read Only",
+     "label": "Item Name"
+    },
+    {
+     "fetch_from": "item_code.asset_category",
+     "fieldname": "asset_category",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "in_list_view": 1,
+     "in_standard_filter": 1,
+     "label": "Asset Category",
+     "options": "Asset Category",
+     "read_only": 1
+    },
+    {
+     "fieldname": "asset_owner",
+     "fieldtype": "Select",
+     "label": "Asset Owner",
+     "options": "\nCompany\nSupplier\nCustomer"
+    },
+    {
+     "depends_on": "eval:doc.asset_owner == \"Company\"",
+     "fieldname": "asset_owner_company",
+     "fieldtype": "Link",
+     "label": "Asset Owner Company",
+     "options": "Company"
+    },
+    {
+     "depends_on": "eval:doc.asset_owner == \"Supplier\"",
+     "fieldname": "supplier",
+     "fieldtype": "Link",
+     "label": "Supplier",
+     "options": "Supplier"
+    },
+    {
+     "depends_on": "eval:doc.asset_owner == \"Customer\"",
+     "fieldname": "customer",
+     "fieldtype": "Link",
+     "label": "Customer",
+     "options": "Customer"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "image",
+     "fieldtype": "Attach Image",
+     "hidden": 1,
+     "label": "Image",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_3",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "company",
+     "fieldtype": "Link",
+     "label": "Company",
+     "options": "Company",
+     "remember_last_selected_value": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "location",
+     "fieldtype": "Link",
+     "in_list_view": 1,
+     "label": "Location",
+     "options": "Location",
+     "reqd": 1
+    },
+    {
+     "fieldname": "custodian",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Custodian",
+     "options": "Employee"
+    },
+    {
+     "fieldname": "cost_center",
+     "fieldtype": "Link",
+     "label": "Cost Center",
+     "options": "Cost Center"
+    },
+    {
+     "fieldname": "department",
+     "fieldtype": "Link",
+     "label": "Department",
+     "options": "Department"
+    },
+    {
+     "fieldname": "purchase_date",
+     "fieldtype": "Date",
+     "label": "Purchase Date",
+     "reqd": 1
+    },
+    {
+     "fieldname": "disposal_date",
+     "fieldtype": "Date",
+     "label": "Disposal Date",
+     "read_only": 1
+    },
+    {
+     "fieldname": "journal_entry_for_scrap",
+     "fieldtype": "Link",
+     "label": "Journal Entry for Scrap",
+     "no_copy": 1,
+     "options": "Journal Entry",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_5",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "gross_purchase_amount",
+     "fieldtype": "Currency",
+     "label": "Gross Purchase Amount",
+     "options": "Company:company:default_currency",
+     "reqd": 1
+    },
+    {
+     "fieldname": "available_for_use_date",
+     "fieldtype": "Date",
+     "label": "Available-for-use Date"
+    },
+    {
+     "fieldname": "column_break_18",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "0",
+     "fieldname": "calculate_depreciation",
+     "fieldtype": "Check",
+     "label": "Calculate Depreciation"
+    },
+    {
+     "default": "0",
+     "fieldname": "is_existing_asset",
+     "fieldtype": "Check",
+     "label": "Is Existing Asset"
+    },
+    {
+     "depends_on": "is_existing_asset",
+     "fieldname": "opening_accumulated_depreciation",
+     "fieldtype": "Currency",
+     "label": "Opening Accumulated Depreciation",
+     "no_copy": 1,
+     "options": "Company:company:default_currency"
+    },
+    {
+     "depends_on": "eval:(doc.is_existing_asset && doc.opening_accumulated_depreciation)",
+     "fieldname": "number_of_depreciations_booked",
+     "fieldtype": "Int",
+     "label": "Number of Depreciations Booked",
+     "no_copy": 1
+    },
+    {
+     "depends_on": "calculate_depreciation",
+     "fieldname": "section_break_23",
+     "fieldtype": "Section Break",
+     "label": "Depreciation"
+    },
+    {
+     "fieldname": "finance_books",
+     "fieldtype": "Table",
+     "label": "Finance Books",
+     "options": "Asset Finance Book"
+    },
+    {
+     "fieldname": "section_break_33",
+     "fieldtype": "Section Break",
+     "hidden": 1
+    },
+    {
+     "fieldname": "depreciation_method",
+     "fieldtype": "Select",
+     "label": "Depreciation Method",
+     "options": "\nStraight Line\nDouble Declining Balance\nManual"
+    },
+    {
+     "fieldname": "value_after_depreciation",
+     "fieldtype": "Currency",
+     "hidden": 1,
+     "label": "Value After Depreciation",
+     "options": "Company:company:default_currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "total_number_of_depreciations",
+     "fieldtype": "Int",
+     "label": "Total Number of Depreciations"
+    },
+    {
+     "fieldname": "column_break_24",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "frequency_of_depreciation",
+     "fieldtype": "Int",
+     "label": "Frequency of Depreciation (Months)"
+    },
+    {
+     "fieldname": "next_depreciation_date",
+     "fieldtype": "Date",
+     "label": "Next Depreciation Date",
+     "no_copy": 1
+    },
+    {
+     "depends_on": "calculate_depreciation",
+     "fieldname": "section_break_14",
+     "fieldtype": "Section Break",
+     "label": "Depreciation Schedule"
+    },
+    {
+     "fieldname": "schedules",
+     "fieldtype": "Table",
+     "label": "Depreciation Schedules",
+     "no_copy": 1,
+     "options": "Depreciation Schedule"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "insurance_details",
+     "fieldtype": "Section Break",
+     "label": "Insurance details"
+    },
+    {
+     "fieldname": "policy_number",
+     "fieldtype": "Data",
+     "label": "Policy number"
+    },
+    {
+     "fieldname": "insurer",
+     "fieldtype": "Data",
+     "label": "Insurer"
+    },
+    {
+     "fieldname": "insured_value",
+     "fieldtype": "Data",
+     "label": "Insured value"
+    },
+    {
+     "fieldname": "column_break_48",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "insurance_start_date",
+     "fieldtype": "Date",
+     "label": "Insurance Start Date"
+    },
+    {
+     "fieldname": "insurance_end_date",
+     "fieldtype": "Date",
+     "label": "Insurance End Date"
+    },
+    {
+     "fieldname": "comprehensive_insurance",
+     "fieldtype": "Data",
+     "label": "Comprehensive Insurance"
+    },
+    {
+     "fieldname": "section_break_31",
+     "fieldtype": "Section Break",
+     "label": "Maintenance"
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "0",
+     "description": "Check if Asset requires Preventive Maintenance or Calibration",
+     "fieldname": "maintenance_required",
+     "fieldtype": "Check",
+     "label": "Maintenance Required"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "other_details",
+     "fieldtype": "Section Break",
+     "label": "Other Details"
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "Draft",
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "in_list_view": 1,
+     "in_standard_filter": 1,
+     "label": "Status",
+     "no_copy": 1,
+     "options": "Draft\nSubmitted\nPartially Depreciated\nFully Depreciated\nSold\nScrapped\nIn Maintenance\nOut of Order\nIssue\nReceipt",
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "booked_fixed_asset",
+     "fieldtype": "Check",
+     "label": "Booked Fixed Asset",
+     "no_copy": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_51",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "purchase_receipt",
+     "fieldtype": "Link",
+     "label": "Purchase Receipt",
+     "no_copy": 1,
+     "options": "Purchase Receipt",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "purchase_receipt_amount",
+     "fieldtype": "Currency",
+     "hidden": 1,
+     "label": "Purchase Receipt Amount",
+     "no_copy": 1,
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "purchase_invoice",
+     "fieldtype": "Link",
+     "label": "Purchase Invoice",
+     "no_copy": 1,
+     "options": "Purchase Invoice",
+     "read_only": 1
+    },
+    {
+     "fetch_from": "company.default_finance_book",
+     "fieldname": "default_finance_book",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Default Finance Book",
+     "options": "Finance Book",
+     "read_only": 1
+    },
+    {
+     "fieldname": "amended_from",
+     "fieldtype": "Link",
+     "label": "Amended From",
+     "no_copy": 1,
+     "options": "Asset",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "accounting_dimensions_section",
+     "fieldtype": "Section Break",
+     "label": "Accounting Dimensions"
+    },
+    {
+     "fieldname": "dimension_col_break",
+     "fieldtype": "Column Break"
+    }
+   ],
+   "idx": 72,
+   "image_field": "image",
+   "is_submittable": 1,
+   "modified": "2019-05-25 22:26:19.786201",
+   "modified_by": "Administrator",
+   "module": "Assets",
+   "name": "Asset",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 1,
+     "import": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Accounts User",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Quality Manager",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    }
+   ],
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "title_field": "asset_name"
+  }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 72f5c62..45f7b30 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -291,16 +291,19 @@
 
 	def validate_expected_value_after_useful_life(self):
 		for row in self.get('finance_books'):
-			accumulated_depreciation_after_full_schedule = max([d.accumulated_depreciation_amount
-				for d in self.get("schedules") if cint(d.finance_book_id) == row.idx])
+			accumulated_depreciation_after_full_schedule = [d.accumulated_depreciation_amount
+				for d in self.get("schedules") if cint(d.finance_book_id) == row.idx]
 
-			asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
-				flt(accumulated_depreciation_after_full_schedule),
-				self.precision('gross_purchase_amount'))
+			if accumulated_depreciation_after_full_schedule:
+				accumulated_depreciation_after_full_schedule = max(accumulated_depreciation_after_full_schedule)
 
-			if row.expected_value_after_useful_life < asset_value_after_full_schedule:
-				frappe.throw(_("Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}")
-					.format(row.idx, asset_value_after_full_schedule))
+				asset_value_after_full_schedule = flt(flt(self.gross_purchase_amount) -
+					flt(accumulated_depreciation_after_full_schedule),
+					self.precision('gross_purchase_amount'))
+
+				if row.expected_value_after_useful_life < asset_value_after_full_schedule:
+					frappe.throw(_("Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}")
+						.format(row.idx, asset_value_after_full_schedule))
 
 	def validate_cancellation(self):
 		if self.status not in ("Submitted", "Partially Depreciated", "Fully Depreciated"):
diff --git a/erpnext/assets/doctype/asset/asset_list.js b/erpnext/assets/doctype/asset/asset_list.js
index 8e262f1..3b95a17 100644
--- a/erpnext/assets/doctype/asset/asset_list.js
+++ b/erpnext/assets/doctype/asset/asset_list.js
@@ -1,3 +1,37 @@
 frappe.listview_settings['Asset'] = {
-	add_fields: ['image']
+	add_fields: ['status'],
+	get_indicator: function (doc) {
+		if (doc.status === "Fully Depreciated") {
+			return [__("Fully Depreciated"), "green", "status,=,Fully Depreciated"];
+
+		} else if (doc.status === "Partially Depreciated") {
+			return [__("Partially Depreciated"), "grey", "status,=,Partially Depreciated"];
+
+		} else if (doc.status === "Sold") {
+			return [__("Sold"), "green", "status,=,Sold"];
+
+		} else if (doc.status === "Scrapped") {
+			return [__("Scrapped"), "grey", "status,=,Scrapped"];
+
+		} else if (doc.status === "In Maintenance") {
+			return [__("In Maintenance"), "orange", "status,=,In Maintenance"];
+
+		} else if (doc.status === "Out of Order") {
+			return [__("Out of Order"), "grey", "status,=,Out of Order"];
+
+		} else if (doc.status === "Issue") {
+			return [__("Issue"), "orange", "status,=,Issue"];
+
+		} else if (doc.status === "Receipt") {
+			return [__("Receipt"), "green", "status,=,Receipt"];
+
+		} else if (doc.status === "Submitted") {
+			return [__("Submitted"), "blue", "status,=,Submitted"];
+
+		} else if (doc.status === "Draft") {
+			return [__("Draft"), "red", "status,=,Draft"];
+
+		}
+
+	},
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 797075b..61108ec 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -36,7 +36,7 @@
 	fixed_asset_account, accumulated_depreciation_account, depreciation_expense_account = \
 		get_depreciation_accounts(asset)
 
-	depreciation_cost_center, depreciation_series = frappe.get_cached_value('Company',  asset.company, 
+	depreciation_cost_center, depreciation_series = frappe.get_cached_value('Company',  asset.company,
 		["depreciation_cost_center", "series_for_depreciation_entry"])
 
 	depreciation_cost_center = asset.cost_center or depreciation_cost_center
@@ -70,7 +70,7 @@
 			je.submit()
 
 			d.db_set("journal_entry", je.name)
-			
+
 			idx = cint(d.finance_book_id)
 			finance_books = asset.get('finance_books')[idx - 1]
 			finance_books.value_after_depreciation -= d.depreciation_amount
@@ -88,15 +88,15 @@
 		fieldname = ['fixed_asset_account', 'accumulated_depreciation_account',
 			'depreciation_expense_account'], as_dict=1)
 
-	if accounts:	
+	if accounts:
 		fixed_asset_account = accounts.fixed_asset_account
 		accumulated_depreciation_account = accounts.accumulated_depreciation_account
 		depreciation_expense_account = accounts.depreciation_expense_account
-		
+
 	if not accumulated_depreciation_account or not depreciation_expense_account:
-		accounts = frappe.get_cached_value('Company',  asset.company, 
+		accounts = frappe.get_cached_value('Company',  asset.company,
 			["accumulated_depreciation_account", "depreciation_expense_account"])
-		
+
 		if not accumulated_depreciation_account:
 			accumulated_depreciation_account = accounts[0]
 		if not depreciation_expense_account:
@@ -135,11 +135,11 @@
 
 	je.flags.ignore_permissions = True
 	je.submit()
-	
+
 	frappe.db.set_value("Asset", asset_name, "disposal_date", today())
 	frappe.db.set_value("Asset", asset_name, "journal_entry_for_scrap", je.name)
 	asset.set_status("Scrapped")
-	
+
 	frappe.msgprint(_("Asset scrapped via Journal Entry {0}").format(je.name))
 
 @frappe.whitelist()
@@ -147,21 +147,29 @@
 	asset = frappe.get_doc("Asset", asset_name)
 
 	je = asset.journal_entry_for_scrap
-	
+
 	asset.db_set("disposal_date", None)
 	asset.db_set("journal_entry_for_scrap", None)
-	
+
 	frappe.get_doc("Journal Entry", je).cancel()
 
 	asset.set_status()
 
 @frappe.whitelist()
-def get_gl_entries_on_asset_disposal(asset, selling_amount=0):
+def get_gl_entries_on_asset_disposal(asset, selling_amount=0, finance_book=None):
 	fixed_asset_account, accumulated_depr_account, depr_expense_account = get_depreciation_accounts(asset)
 	disposal_account, depreciation_cost_center = get_disposal_account_and_cost_center(asset.company)
 	depreciation_cost_center = asset.cost_center or depreciation_cost_center
 
-	accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(asset.value_after_depreciation)
+	idx = 1
+	if finance_book:
+		for d in asset.finance_books:
+			if d.finance_book == finance_book:
+				idx = d.idx
+				break
+
+	value_after_depreciation = asset.finance_books[idx - 1].value_after_depreciation
+	accumulated_depr_amount = flt(asset.gross_purchase_amount) - flt(value_after_depreciation)
 
 	gl_entries = [
 		{
@@ -176,7 +184,7 @@
 		}
 	]
 
-	profit_amount = flt(selling_amount) - flt(asset.value_after_depreciation)
+	profit_amount = flt(selling_amount) - flt(value_after_depreciation)
 	if profit_amount:
 		debit_or_credit = "debit" if profit_amount < 0 else "credit"
 		gl_entries.append({
@@ -190,7 +198,7 @@
 
 @frappe.whitelist()
 def get_disposal_account_and_cost_center(company):
-	disposal_account, depreciation_cost_center = frappe.get_cached_value('Company',  company, 
+	disposal_account, depreciation_cost_center = frappe.get_cached_value('Company',  company,
 		["disposal_account", "depreciation_cost_center"])
 
 	if not disposal_account:
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index ef85ffa..fceccfb 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -366,8 +366,9 @@
 		self.assertTrue(asset.journal_entry_for_scrap)
 
 		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 100000.0, 0.0),
-			("_Test Fixed Asset - _TC", 0.0, 100000.0)
+			("_Test Accumulated Depreciations - _TC", 147.54, 0.0),
+			("_Test Fixed Asset - _TC", 0.0, 100000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 99852.46, 0.0)
 		)
 
 		gle = frappe.db.sql("""select account, debit, credit from `tabGL Entry`
@@ -411,9 +412,9 @@
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "status"), "Sold")
 
 		expected_gle = (
-			("_Test Accumulated Depreciations - _TC", 100000.0, 0.0),
+			("_Test Accumulated Depreciations - _TC", 23051.47, 0.0),
 			("_Test Fixed Asset - _TC", 0.0, 100000.0),
-			("_Test Gain/Loss on Asset Disposal - _TC", 0, 25000.0),
+			("_Test Gain/Loss on Asset Disposal - _TC", 51948.53, 0.0),
 			("Debtors - _TC", 25000.0, 0.0)
 		)
 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index a9a2094..8117d9d 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -510,4 +510,3 @@
 def make_inter_company_sales_order(source_name, target_doc=None):
 	from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_inter_company_transaction
 	return make_inter_company_transaction("Purchase Order", source_name, target_doc)
-
diff --git a/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json b/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json
index 9e6e80a..bb11269 100644
--- a/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json
+++ b/erpnext/buying/report/requested_items_to_be_ordered/requested_items_to_be_ordered.json
@@ -1,31 +1,31 @@
 {
- "add_total_row": 1,
- "creation": "2013-05-13 16:10:02",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "idx": 3,
- "is_standard": "Yes",
- "modified": "2019-04-18 19:02:03.099422",
- "modified_by": "Administrator",
- "module": "Buying",
- "name": "Requested Items To Be Ordered",
- "owner": "Administrator",
- "prepared_report": 0,
- "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n\tmr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tsum(ifnull(mr_item.stock_qty, 0)) as \"Qty:Float:100\",\n\tifnull(mr_item.stock_uom, '') as \"UOM:Link/UOM:100\",\n\tsum(ifnull(mr_item.ordered_qty, 0)) as \"Ordered Qty:Float:100\", \n\t(sum(mr_item.stock_qty) - sum(ifnull(mr_item.ordered_qty, 0))) as \"Qty to Order:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\ngroup by mr.name, mr_item.item_code\nhaving\n\tsum(ifnull(mr_item.ordered_qty, 0)) < sum(ifnull(mr_item.stock_qty, 0))\norder by mr.transaction_date asc",
- "ref_doctype": "Purchase Order",
- "report_name": "Requested Items To Be Ordered",
- "report_type": "Query Report",
- "roles": [
-  {
-   "role": "Stock User"
-  },
-  {
-   "role": "Purchase Manager"
-  },
-  {
-   "role": "Purchase User"
-  }
- ]
-}
\ No newline at end of file
+    "add_total_row": 1,
+    "creation": "2013-05-13 16:10:02",
+    "disable_prepared_report": 0,
+    "disabled": 0,
+    "docstatus": 0,
+    "doctype": "Report",
+    "idx": 3,
+    "is_standard": "Yes",
+    "modified": "2019-04-18 19:02:03.099422",
+    "modified_by": "Administrator",
+    "module": "Buying",
+    "name": "Requested Items To Be Ordered",
+    "owner": "Administrator",
+    "prepared_report": 0,
+    "query": "select \n    mr.name as \"Material Request:Link/Material Request:120\",\n\tmr.transaction_date as \"Date:Date:100\",\n\tmr_item.item_code as \"Item Code:Link/Item:120\",\n\tsum(ifnull(mr_item.stock_qty, 0)) as \"Qty:Float:100\",\n\tifnull(mr_item.stock_uom, '') as \"UOM:Link/UOM:100\",\n\tsum(ifnull(mr_item.ordered_qty, 0)) as \"Ordered Qty:Float:100\", \n\t(sum(mr_item.stock_qty) - sum(ifnull(mr_item.ordered_qty, 0))) as \"Qty to Order:Float:100\",\n\tmr_item.item_name as \"Item Name::150\",\n\tmr_item.description as \"Description::200\",\n\tmr.company as \"Company:Link/Company:\"\nfrom\n\t`tabMaterial Request` mr, `tabMaterial Request Item` mr_item\nwhere\n\tmr_item.parent = mr.name\n\tand mr.material_request_type = \"Purchase\"\n\tand mr.docstatus = 1\n\tand mr.status != \"Stopped\"\ngroup by mr.name, mr_item.item_code\nhaving\n\tsum(ifnull(mr_item.ordered_qty, 0)) < sum(ifnull(mr_item.stock_qty, 0))\norder by mr.transaction_date asc",
+    "ref_doctype": "Purchase Order",
+    "report_name": "Requested Items To Be Ordered",
+    "report_type": "Query Report",
+    "roles": [
+     {
+      "role": "Stock User"
+     },
+     {
+      "role": "Purchase Manager"
+     },
+     {
+      "role": "Purchase User"
+     }
+    ]
+   }
\ No newline at end of file
diff --git a/erpnext/communication/__init__.py b/erpnext/communication/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/communication/__init__.py
diff --git a/erpnext/communication/doctype/__init__.py b/erpnext/communication/doctype/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/communication/doctype/__init__.py
diff --git a/erpnext/communication/doctype/call_log/__init__.py b/erpnext/communication/doctype/call_log/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/communication/doctype/call_log/__init__.py
diff --git a/erpnext/communication/doctype/call_log/call_log.json b/erpnext/communication/doctype/call_log/call_log.json
new file mode 100644
index 0000000..110030d
--- /dev/null
+++ b/erpnext/communication/doctype/call_log/call_log.json
@@ -0,0 +1,106 @@
+{
+ "autoname": "field:id",
+ "creation": "2019-06-05 12:07:02.634534",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "id",
+  "from",
+  "to",
+  "column_break_3",
+  "medium",
+  "section_break_5",
+  "status",
+  "duration",
+  "recording_url",
+  "summary"
+ ],
+ "fields": [
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "id",
+   "fieldtype": "Data",
+   "label": "ID",
+   "read_only": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "from",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "From",
+   "read_only": 1
+  },
+  {
+   "fieldname": "to",
+   "fieldtype": "Data",
+   "label": "To",
+   "read_only": 1
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Status",
+   "options": "Ringing\nIn Progress\nCompleted\nMissed",
+   "read_only": 1
+  },
+  {
+   "description": "Call Duration in seconds",
+   "fieldname": "duration",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Duration",
+   "read_only": 1
+  },
+  {
+   "fieldname": "summary",
+   "fieldtype": "Data",
+   "label": "Summary",
+   "read_only": 1
+  },
+  {
+   "fieldname": "recording_url",
+   "fieldtype": "Data",
+   "label": "Recording URL",
+   "read_only": 1
+  },
+  {
+   "fieldname": "medium",
+   "fieldtype": "Data",
+   "label": "Medium",
+   "read_only": 1
+  }
+ ],
+ "in_create": 1,
+ "modified": "2019-07-01 09:09:48.516722",
+ "modified_by": "Administrator",
+ "module": "Communication",
+ "name": "Call Log",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "title_field": "from",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/communication/doctype/call_log/call_log.py b/erpnext/communication/doctype/call_log/call_log.py
new file mode 100644
index 0000000..66f1064
--- /dev/null
+++ b/erpnext/communication/doctype/call_log/call_log.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from erpnext.crm.doctype.utils import get_employee_emails_for_popup
+
+class CallLog(Document):
+	def after_insert(self):
+		employee_emails = get_employee_emails_for_popup(self.medium)
+		for email in employee_emails:
+			frappe.publish_realtime('show_call_popup', self, user=email)
+
+	def on_update(self):
+		doc_before_save = self.get_doc_before_save()
+		if doc_before_save and doc_before_save.status in ['Ringing'] and self.status in ['Missed', 'Completed']:
+			frappe.publish_realtime('call_{id}_disconnected'.format(id=self.id), self)
diff --git a/erpnext/communication/doctype/communication_medium/__init__.py b/erpnext/communication/doctype/communication_medium/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/communication/doctype/communication_medium/__init__.py
diff --git a/erpnext/communication/doctype/communication_medium/communication_medium.json b/erpnext/communication/doctype/communication_medium/communication_medium.json
new file mode 100644
index 0000000..f009b38
--- /dev/null
+++ b/erpnext/communication/doctype/communication_medium/communication_medium.json
@@ -0,0 +1,81 @@
+{
+ "autoname": "Prompt",
+ "creation": "2019-06-05 11:48:30.572795",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "communication_medium_type",
+  "catch_all",
+  "column_break_3",
+  "provider",
+  "disabled",
+  "timeslots_section",
+  "timeslots"
+ ],
+ "fields": [
+  {
+   "fieldname": "communication_medium_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Communication Medium Type",
+   "options": "Voice\nEmail\nChat",
+   "reqd": 1
+  },
+  {
+   "description": "If there is no assigned timeslot, then communication will be handled by this group",
+   "fieldname": "catch_all",
+   "fieldtype": "Link",
+   "label": "Catch All",
+   "options": "Employee Group"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "provider",
+   "fieldtype": "Link",
+   "label": "Provider",
+   "options": "Supplier"
+  },
+  {
+   "default": "0",
+   "fieldname": "disabled",
+   "fieldtype": "Check",
+   "label": "Disabled"
+  },
+  {
+   "fieldname": "timeslots_section",
+   "fieldtype": "Section Break",
+   "label": "Timeslots"
+  },
+  {
+   "fieldname": "timeslots",
+   "fieldtype": "Table",
+   "label": "Timeslots",
+   "options": "Communication Medium Timeslot"
+  }
+ ],
+ "modified": "2019-06-05 11:49:30.769006",
+ "modified_by": "Administrator",
+ "module": "Communication",
+ "name": "Communication Medium",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/communication/doctype/communication_medium/communication_medium.py b/erpnext/communication/doctype/communication_medium/communication_medium.py
new file mode 100644
index 0000000..f233da0
--- /dev/null
+++ b/erpnext/communication/doctype/communication_medium/communication_medium.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class CommunicationMedium(Document):
+	pass
diff --git a/erpnext/communication/doctype/communication_medium_timeslot/__init__.py b/erpnext/communication/doctype/communication_medium_timeslot/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/communication/doctype/communication_medium_timeslot/__init__.py
diff --git a/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json
new file mode 100644
index 0000000..b278ca0
--- /dev/null
+++ b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json
@@ -0,0 +1,56 @@
+{
+ "creation": "2019-06-05 11:43:38.897272",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "day_of_week",
+  "from_time",
+  "to_time",
+  "employee_group"
+ ],
+ "fields": [
+  {
+   "fieldname": "day_of_week",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Day of Week",
+   "options": "Monday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday",
+   "reqd": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "from_time",
+   "fieldtype": "Time",
+   "in_list_view": 1,
+   "label": "From Time",
+   "reqd": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "to_time",
+   "fieldtype": "Time",
+   "in_list_view": 1,
+   "label": "To Time",
+   "reqd": 1
+  },
+  {
+   "fieldname": "employee_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Employee Group",
+   "options": "Employee Group",
+   "reqd": 1
+  }
+ ],
+ "istable": 1,
+ "modified": "2019-06-05 12:19:59.994979",
+ "modified_by": "Administrator",
+ "module": "Communication",
+ "name": "Communication Medium Timeslot",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py
new file mode 100644
index 0000000..d68d2d6
--- /dev/null
+++ b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class CommunicationMediumTimeslot(Document):
+	pass
diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py
index 9a9ee7e..ce1384a 100644
--- a/erpnext/config/accounting.py
+++ b/erpnext/config/accounting.py
@@ -167,7 +167,7 @@
 					"type": "doctype",
 					"name": "Opening Invoice Creation Tool",
 					"description": _("Create Opening Sales and Purchase Invoices")
-				},
+				}
 			]
 		},
 		{
@@ -182,7 +182,7 @@
 					"type": "doctype",
 					"name": "Journal Entry",
 					"description": _("Accounting journal entries.")
-				},
+				}
 			]
 		},
 		{
@@ -247,6 +247,12 @@
 					"name": "Bank",
 				},
 				{
+					"type": "page",
+					"label": _("Reconcile payments and bank transactions"),
+					"name": "bank-reconciliation",
+					"description": _("Link bank transactions with payments.")
+				},
+				{
 					"type": "doctype",
 					"label": _("Bank Account"),
 					"name": "Bank Account",
diff --git a/erpnext/config/integrations.py b/erpnext/config/integrations.py
index 01e077f..52c9ab8 100644
--- a/erpnext/config/integrations.py
+++ b/erpnext/config/integrations.py
@@ -35,6 +35,11 @@
 					"type": "doctype",
 					"name": "Amazon MWS Settings",
 					"description": _("Connect Amazon with ERPNext"),
+				},
+				{
+					"type": "doctype",
+					"name": "Plaid Settings",
+					"description": _("Connect your bank accounts to ERPNext"),
 				}
 			]
 		}
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index da60550..c79c5b8 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -4,43 +4,6 @@
 def get_data():
 	return [
 		{
-			"label": _("Production"),
-			"icon": "fa fa-star",
-			"items": [
-				{
-					"type": "doctype",
-					"name": "Work Order",
-					"description": _("Orders released for production."),
-					"onboard": 1,
-					"dependencies": ["Item", "BOM"]
-				},
-				{
-					"type": "doctype",
-					"name": "Production Plan",
-					"description": _("Generate Material Requests (MRP) and Work Orders."),
-					"onboard": 1,
-					"dependencies": ["Item", "BOM"]
-				},
-				{
-					"type": "doctype",
-					"name": "Stock Entry",
-					"onboard": 1,
-					"dependencies": ["Item"]
-				},
-				{
-					"type": "doctype",
-					"name": "Timesheet",
-					"description": _("Time Sheet for manufacturing."),
-					"onboard": 1,
-					"dependencies": ["Activity Type"]
-				},
-				{
-					"type": "doctype",
-					"name": "Job Card"
-				}
-			]
-		},
-		{
 			"label": _("Bill of Materials"),
 			"items": [
 				{
@@ -86,6 +49,43 @@
 			]
 		},
 		{
+			"label": _("Production"),
+			"icon": "fa fa-star",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "Work Order",
+					"description": _("Orders released for production."),
+					"onboard": 1,
+					"dependencies": ["Item", "BOM"]
+				},
+				{
+					"type": "doctype",
+					"name": "Production Plan",
+					"description": _("Generate Material Requests (MRP) and Work Orders."),
+					"onboard": 1,
+					"dependencies": ["Item", "BOM"]
+				},
+				{
+					"type": "doctype",
+					"name": "Stock Entry",
+					"onboard": 1,
+					"dependencies": ["Item"]
+				},
+				{
+					"type": "doctype",
+					"name": "Timesheet",
+					"description": _("Time Sheet for manufacturing."),
+					"onboard": 1,
+					"dependencies": ["Activity Type"]
+				},
+				{
+					"type": "doctype",
+					"name": "Job Card"
+				}
+			]
+		},
+		{
 			"label": _("Tools"),
 			"icon": "fa fa-wrench",
 			"items": [
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index b31eb02..f18aadb 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -309,10 +309,33 @@
 					"is_query_report": True,
 					"name": "Sales Partners Commission",
 					"doctype": "Customer"
+				},
+				{
+					"type": "report",
+					"is_query_report": True,
+					"name": "Sales Partners Commission",
+					"doctype": "Customer"
 				}
 			]
 		},
 		{
+			"label": _("SMS"),
+			"icon": "fa fa-wrench",
+			"items": [
+				{
+					"type": "doctype",
+					"name": "SMS Center",
+					"description":_("Send mass SMS to your contacts"),
+				},
+				{
+					"type": "doctype",
+					"name": "SMS Log",
+					"description":_("Logs for maintaining sms delivery status"),
+				},
+
+			]
+		},
+		{
 			"label": _("Help"),
 			"items": [
 				{
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 1b8dd57..f5ecaeb 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -32,8 +32,8 @@
 		return self.__company_currency
 
 	def onload(self):
-		self.get("__onload").make_payment_via_journal_entry \
-			= frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
+		self.set_onload("make_payment_via_journal_entry",
+			frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry'))
 
 		if self.is_new():
 			relevant_docs = ("Quotation", "Purchase Order", "Sales Order",
@@ -242,6 +242,10 @@
 				parent_dict.update({"document_type": document_type})
 
 			self.set('pricing_rules', [])
+			# party_name field used for customer in quotation
+			if self.doctype == "Quotation" and self.quotation_to == "Customer" and parent_dict.get("party_name"):
+				parent_dict.update({"customer": parent_dict.get("party_name")})
+
 			for item in self.get("items"):
 				if item.get("item_code"):
 					args = parent_dict.copy()
@@ -392,7 +396,7 @@
 	def validate_qty_is_not_zero(self):
 		for item in self.items:
 			if not item.qty:
-				frappe.throw("Item quantity can not be zero")
+				frappe.throw(_("Item quantity can not be zero"))
 
 	def validate_account_currency(self, account, account_currency=None):
 		valid_currency = [self.company_currency]
@@ -1006,11 +1010,11 @@
 
 
 def get_advance_payment_entries(party_type, party, party_account, order_doctype,
-		order_list=None, include_unallocated=True, against_all_orders=False, limit=1000):
+		order_list=None, include_unallocated=True, against_all_orders=False, limit=None):
 	party_account_field = "paid_from" if party_type == "Customer" else "paid_to"
 	payment_type = "Receive" if party_type == "Customer" else "Pay"
 	payment_entries_against_order, unallocated_payment_entries = [], []
-	limit_cond = "limit %s" % (limit or 1000)
+	limit_cond = "limit %s" % limit if limit else ""
 
 	if order_list or against_all_orders:
 		if order_list:
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index bfb8432..dee71dc 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -98,8 +98,8 @@
 	if allow_rename_attribute_value:
 		pass
 	elif attribute_value not in attributes_list:
-		frappe.throw(_("Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2}").format(
-			attribute_value, attribute, item), InvalidItemAttributeValueError, title=_('Invalid Attribute'))
+		frappe.throw(_("The value {0} is already assigned to an exisiting Item {2}.").format(
+			attribute_value, attribute, item), InvalidItemAttributeValueError, title=_('Rename Not Allowed'))
 
 def get_attribute_values(item):
 	if not frappe.flags.attribute_values:
@@ -176,7 +176,7 @@
 	for key in variants:
 		total_variants *= len(variants[key])
 	if total_variants >= 600:
-		frappe.msgprint("Please do not create more than 500 items at a time", raise_exception=1)
+		frappe.throw(_("Please do not create more than 500 items at a time"))
 		return
 	if total_variants < 10:
 		return create_multiple_variants(item, args)
@@ -282,7 +282,7 @@
 
 	if 'description' not in allow_fields:
 		if not variant.description:
-			variant.description = ""
+				variant.description = ""
 
 		if item.variant_based_on=='Item Attribute':
 			if variant.attributes:
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index ccd334f..d74bc0e 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -296,7 +296,6 @@
 				order by batch.expiry_date, sle.batch_no desc
 				limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args)
 
-	if batch_nos:
 		return batch_nos
 	else:
 		return frappe.db.sql("""select name, concat('MFG-', manufacturing_date), concat('EXP-',expiry_date) from `tabBatch` batch
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index b82987a..8cf11f7 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -205,11 +205,14 @@
 
 def make_return_doc(doctype, source_name, target_doc=None):
 	from frappe.model.mapper import get_mapped_doc
+	company = frappe.db.get_value("Delivery Note", source_name, "company")
+	default_warehouse_for_sales_return = frappe.db.get_value("Company", company, "default_warehouse_for_sales_return")
 	def set_missing_values(source, target):
 		doc = frappe.get_doc(target)
 		doc.is_return = 1
 		doc.return_against = source.name
 		doc.ignore_pricing_rule = 1
+		doc.set_warehouse = ""
 		if doctype == "Sales Invoice":
 			doc.is_pos = source.is_pos
 
@@ -253,7 +256,6 @@
 
 	def update_item(source_doc, target_doc, source_parent):
 		target_doc.qty = -1* source_doc.qty
-		default_return_warehouse = frappe.db.get_single_value("Stock Settings", "default_return_warehouse")
 		if doctype == "Purchase Receipt":
 			target_doc.received_qty = -1* source_doc.received_qty
 			target_doc.rejected_qty = -1* source_doc.rejected_qty
@@ -278,13 +280,16 @@
 			target_doc.so_detail = source_doc.so_detail
 			target_doc.si_detail = source_doc.si_detail
 			target_doc.expense_account = source_doc.expense_account
-			target_doc.warehouse = default_return_warehouse if default_return_warehouse else source_doc.warehouse
+			if default_warehouse_for_sales_return:
+				target_doc.warehouse = default_warehouse_for_sales_return
 		elif doctype == "Sales Invoice":
 			target_doc.sales_order = source_doc.sales_order
 			target_doc.delivery_note = source_doc.delivery_note
 			target_doc.so_detail = source_doc.so_detail
 			target_doc.dn_detail = source_doc.dn_detail
 			target_doc.expense_account = source_doc.expense_account
+			if default_warehouse_for_sales_return:
+				target_doc.warehouse = default_warehouse_for_sales_return
 
 	def update_terms(source_doc, target_doc, source_parent):
 		target_doc.payment_amount = -source_doc.payment_amount
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index ea18004..2cbe596 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -55,14 +55,28 @@
 		self.set_price_list_and_item_details(for_validate=for_validate)
 
 	def set_missing_lead_customer_details(self):
+		customer, lead = None, None
 		if getattr(self, "customer", None):
+			customer = self.customer
+		elif self.doctype == "Opportunity" and self.party_name:
+			if self.opportunity_from == "Customer":
+				customer = self.party_name
+			else:
+				lead = self.party_name
+		elif self.doctype == "Quotation" and self.party_name:
+			if self.quotation_to == "Customer":
+				customer = self.party_name
+			else:
+				lead = self.party_name
+
+		if customer:
 			from erpnext.accounts.party import _get_party_details
 			fetch_payment_terms_template = False
 			if (self.get("__islocal") or
 				self.company != frappe.db.get_value(self.doctype, self.name, 'company')):
 				fetch_payment_terms_template = True
 
-			party_details = _get_party_details(self.customer,
+			party_details = _get_party_details(customer,
 				ignore_permissions=self.flags.ignore_permissions,
 				doctype=self.doctype, company=self.company,
 				fetch_payment_terms_template=fetch_payment_terms_template,
@@ -71,10 +85,9 @@
 				party_details.pop("sales_team")
 			self.update_if_missing(party_details)
 
-		elif getattr(self, "lead", None):
+		elif lead:
 			from erpnext.crm.doctype.lead.lead import get_lead_details
-			self.update_if_missing(get_lead_details(
-				self.lead,
+			self.update_if_missing(get_lead_details(lead,
 				posting_date=self.get('transaction_date') or self.get('posting_date'),
 				company=self.company))
 
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index 42e0a43..f70870b 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -46,9 +46,9 @@
 	"Sales 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"],
-		["Paid", "eval:self.outstanding_amount<=0 and self.docstatus==1 and self.is_return==0"],
-		["Credit Note Issued", "eval:self.outstanding_amount < 0 and self.docstatus==1 and self.is_return==0 and get_value('Sales Invoice', {'is_return': 1, 'return_against': self.name, 'docstatus': 1})"],
+		["Credit Note Issued", "eval:self.outstanding_amount < 0 and self.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"],
@@ -56,9 +56,9 @@
 	"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"],
-		["Paid", "eval:self.outstanding_amount<=0 and self.docstatus==1 and self.is_return==0"],
-		["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})"],
+		["Debit Note Issued", "eval:self.outstanding_amount < 0 and self.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"],
@@ -99,6 +99,10 @@
 		["Issued", "eval:self.status != 'Stopped' and self.per_ordered == 100 and self.docstatus == 1 and self.material_request_type == 'Material Issue'"],
 		["Received", "eval:self.status != 'Stopped' and self.per_received == 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'"],
 		["Partially Received", "eval:self.status != 'Stopped' and self.per_received > 0 and self.per_received < 100 and self.docstatus == 1 and self.material_request_type == 'Purchase'"]
+	],
+	"Bank Transaction": [
+		["Unreconciled", "eval:self.docstatus == 1 and self.unallocated_amount>0"],
+		["Reconciled", "eval:self.docstatus == 1 and self.unallocated_amount<=0"]
 	]
 }
 
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 3021f18..2d87a98 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -128,7 +128,7 @@
 			reconciliation_purpose = frappe.db.get_value(self.doctype, self.name, "purpose")
 			is_opening = "Yes" if reconciliation_purpose == "Opening Stock" else "No"
 			details = []
-			for voucher_detail_no, sle in sle_map.items():
+			for voucher_detail_no in sle_map:
 				details.append(frappe._dict({
 					"name": voucher_detail_no,
 					"expense_account": default_expense_account,
@@ -362,10 +362,12 @@
 					frappe.throw(_("Row {0}: Quality Inspection rejected for item {1}")
 						.format(d.idx, d.item_code), QualityInspectionRejectedError)
 			elif qa_required :
-				frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code))
-				if self.docstatus==1:
-					raise QualityInspectionRequiredError
-
+				action = frappe.get_doc('Stock Settings').action_if_quality_inspection_is_not_submitted
+				if self.docstatus==1 and action == 'Stop':
+					frappe.throw(_("Quality Inspection required for Item {0} to submit").format(frappe.bold(d.item_code)),
+						exc=QualityInspectionRequiredError)
+				else:
+					frappe.msgprint(_("Create Quality Inspection for Item {0}").format(frappe.bold(d.item_code)))
 
 	def update_blanket_order(self):
 		blanket_orders = list(set([d.blanket_order for d in self.items if d.blanket_order]))
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index d5f86a1..ebbe3d9 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -616,7 +616,7 @@
 
 	return itemised_tax, itemised_taxable_amount
 
-def get_itemised_tax(taxes):
+def get_itemised_tax(taxes, with_tax_account=False):
 	itemised_tax = {}
 	for tax in taxes:
 		if getattr(tax, "category", None) and tax.category=="Valuation":
@@ -641,6 +641,9 @@
 					tax_amount = tax_amount
 				))
 
+				if with_tax_account:
+					itemised_tax[item_code][tax.description].tax_account = tax.account_head
+
 	return itemised_tax
 
 def get_itemised_taxable_amount(items):
diff --git a/erpnext/controllers/tests/test_mapper.py b/erpnext/controllers/tests/test_mapper.py
index 14738c5..d02308d 100644
--- a/erpnext/controllers/tests/test_mapper.py
+++ b/erpnext/controllers/tests/test_mapper.py
@@ -43,7 +43,7 @@
 		qtn = frappe.get_doc({
 			"doctype": "Quotation",
 			"quotation_to": "Customer",
-			"customer": customer,
+			"party_name": customer,
 			"order_type": "Sales",
 			"transaction_date" : nowdate(),
 			"valid_till" : add_months(nowdate(), 1)
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 8c1ab2f..cfa7290 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -6,6 +6,17 @@
 
 erpnext.LeadController = frappe.ui.form.Controller.extend({
 	setup: function () {
+		this.frm.make_methods = {
+			'Quotation': () => erpnext.utils.create_new_doc('Quotation', {
+				'quotation_to': this.frm.doc.doctype,
+				'party_name': this.frm.doc.name
+			}),
+			'Opportunity': () => erpnext.utils.create_new_doc('Opportunity', {
+				'opportunity_from': this.frm.doc.doctype,
+				'party_name': this.frm.doc.name
+			})
+		}
+
 		this.frm.fields_dict.customer.get_query = function (doc, cdt, cdn) {
 			return { query: "erpnext.controllers.queries.customer_query" }
 		}
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 600e070..3c22dc7 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -1430,7 +1430,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-05-10 03:22:57.283628",
+ "modified": "2019-06-18 03:22:57.283628",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 4f507f1..4343db0 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -90,11 +90,11 @@
 		return frappe.db.get_value("Customer", {"lead_name": self.name})
 
 	def has_opportunity(self):
-		return frappe.db.get_value("Opportunity", {"lead": self.name, "status": ["!=", "Lost"]})
+		return frappe.db.get_value("Opportunity", {"party_name": self.name, "status": ["!=", "Lost"]})
 
 	def has_quotation(self):
 		return frappe.db.get_value("Quotation", {
-			"lead": self.name,
+			"party_name": self.name,
 			"docstatus": 1,
 			"status": ["!=", "Lost"]
 
@@ -102,7 +102,7 @@
 
 	def has_lost_quotation(self):
 		return frappe.db.get_value("Quotation", {
-			"lead": self.name,
+			"party_name": self.name,
 			"docstatus": 1,
 			"status": "Lost"
 		})
@@ -150,8 +150,8 @@
 			"doctype": "Opportunity",
 			"field_map": {
 				"campaign_name": "campaign",
-				"doctype": "enquiry_from",
-				"name": "lead",
+				"doctype": "opportunity_from",
+				"name": "party_name",
 				"lead_name": "contact_display",
 				"company_name": "customer_name",
 				"email_id": "contact_email",
@@ -167,7 +167,7 @@
 		{"Lead": {
 			"doctype": "Quotation",
 			"field_map": {
-				"name": "lead"
+				"name": "party_name"
 			}
 		}}, target_doc)
 	target_doc.quotation_to = "Lead"
@@ -190,7 +190,7 @@
 	out.update({
 		"territory": lead.territory,
 		"customer_name": lead.company_name or lead.lead_name,
-		"contact_display": lead.lead_name,
+		"contact_display": " ".join(filter(None, [lead.salutation, lead.lead_name])),
 		"contact_email": lead.email_id,
 		"contact_mobile": lead.mobile_no,
 		"contact_phone": lead.phone,
diff --git a/erpnext/crm/doctype/lead/lead_dashboard.py b/erpnext/crm/doctype/lead/lead_dashboard.py
index e8472aa..69d8ca7 100644
--- a/erpnext/crm/doctype/lead/lead_dashboard.py
+++ b/erpnext/crm/doctype/lead/lead_dashboard.py
@@ -4,6 +4,13 @@
 def get_data():
 	return {
 		'fieldname': 'lead',
+		'non_standard_fieldnames': {
+			'Quotation': 'party_name',
+			'Opportunity': 'party_name'
+		},
+		'dynamic_links': {
+			'party_name': ['Lead', 'quotation_to']
+		},
 		'transactions': [
 			{
 				'items': ['Opportunity', 'Quotation']
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 967459f..9dcd0c4 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -10,15 +10,34 @@
 		frm.custom_make_buttons = {
 			'Quotation': 'Quotation',
 			'Supplier Quotation': 'Supplier Quotation'
-		}
-	},
-	customer: function(frm) {
-		frm.trigger('set_contact_link');
-		erpnext.utils.get_party_details(frm);
+		},
+
+		frm.set_query("opportunity_from", function() {
+			return{
+				"filters": {
+					"name": ["in", ["Customer", "Lead"]],
+				}
+			}
+		});
 	},
 
-	lead: function(frm) {
-		frm.trigger('set_contact_link');
+	onload_post_render: function(frm) {
+		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
+	},
+
+	party_name: function(frm) {
+		frm.toggle_display("contact_info", frm.doc.party_name);
+
+		if (frm.doc.opportunity_from == "Customer") {
+			frm.trigger('set_contact_link');
+			erpnext.utils.get_party_details(frm);
+		} else if (frm.doc.opportunity_from == "Lead") {
+			erpnext.utils.map_current_doc({
+				method: "erpnext.crm.doctype.lead.lead.make_opportunity",
+				source_name: frm.doc.party_name,
+				frm: frm
+			});
+		}
 	},
 
 	onload_post_render: function(frm) {
@@ -42,15 +61,14 @@
 
 	contact_person: erpnext.utils.get_contact_details,
 
-	enquiry_from: function(frm) {
-		frm.toggle_reqd("lead", frm.doc.enquiry_from==="Lead");
-		frm.toggle_reqd("customer", frm.doc.enquiry_from==="Customer");
+	opportunity_from: function(frm) {
+		frm.toggle_reqd("party_name", frm.doc.opportunity_from);
+		frm.trigger("set_dynamic_field_label");
 	},
 
 	refresh: function(frm) {
 		var doc = frm.doc;
-		frm.events.enquiry_from(frm);
-		frm.trigger('set_contact_link');
+		frm.events.opportunity_from(frm);
 		frm.trigger('toggle_mandatory');
 		erpnext.toggle_naming_series();
 
@@ -88,10 +106,17 @@
 	},
 
 	set_contact_link: function(frm) {
-		if(frm.doc.customer) {
-			frappe.dynamic_link = {doc: frm.doc, fieldname: 'customer', doctype: 'Customer'}
-		} else if(frm.doc.lead) {
-			frappe.dynamic_link = {doc: frm.doc, fieldname: 'lead', doctype: 'Lead'}
+		if(frm.doc.opportunity_from == "Customer" && frm.doc.party_name) {
+			frappe.dynamic_link = {doc: frm.doc, fieldname: 'party_name', doctype: 'Customer'}
+		} else if(frm.doc.opportunity_from == "Lead" && frm.doc.party_name) {
+			frappe.dynamic_link = {doc: frm.doc, fieldname: 'party_name', doctype: 'Lead'}
+		}
+	},
+
+	set_dynamic_field_label: function(frm){
+
+		if (frm.doc.opportunity_from) {
+			frm.set_df_property("party_name", "label", frm.doc.opportunity_from);
 		}
 	},
 
@@ -110,10 +135,6 @@
 // TODO commonify this code
 erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
 	onload: function() {
-		if(!this.frm.doc.enquiry_from && this.frm.doc.customer)
-			this.frm.doc.enquiry_from = "Customer";
-		if(!this.frm.doc.enquiry_from && this.frm.doc.lead)
-			this.frm.doc.enquiry_from = "Lead";
 
 		if(!this.frm.doc.status) {
 			frm.set_value('status', 'Open');
@@ -144,12 +165,14 @@
 			};
 		});
 
-		$.each([["lead", "lead"],
-			["customer", "customer"],
-			["contact_person", "contact_query"]],
-			function(i, opts) {
-				me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
-			});
+		me.frm.set_query('contact_person', erpnext.queries['contact_query'])
+
+		if (me.frm.doc.opportunity_from == "Lead") {
+			me.frm.set_query('party_name', erpnext.queries['lead']);
+		}
+		else if (me.frm.doc.opportunity_from == "Cuatomer") {
+			me.frm.set_query('party_name', erpnext.queries['customer']);
+		}
 	},
 
 	create_quotation: function() {
@@ -162,11 +185,6 @@
 
 $.extend(cur_frm.cscript, new erpnext.crm.Opportunity({frm: cur_frm}));
 
-cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
-	if(doc.enquiry_from == 'Lead' && doc.lead)
-		cur_frm.cscript.lead(doc, cdt, cdn);
-}
-
 cur_frm.cscript.item_code = function(doc, cdt, cdn) {
 	var d = locals[cdt][cdn];
 	if (d.item_code) {
@@ -183,13 +201,4 @@
 			}
 		})
 	}
-}
-
-cur_frm.cscript.lead = function(doc, cdt, cdn) {
-	cur_frm.toggle_display("contact_info", doc.customer || doc.lead);
-	erpnext.utils.map_current_doc({
-		method: "erpnext.crm.doctype.lead.lead.make_opportunity",
-		source_name: cur_frm.doc.lead,
-		frm: cur_frm
-	});
-}
+}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index d3b22a3..121a336 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -1,1553 +1,1561 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2013-03-07 18:50:30", 
- "custom": 0, 
- "description": "Potential Sales Deal", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "beta": 0,
+ "creation": "2013-03-07 18:50:30",
+ "custom": 0,
+ "description": "Potential Sales Deal",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "from_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": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-user", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "from_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": "",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-user",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "naming_series", 
-   "fieldtype": "Select", 
-   "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": "Series", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "naming_series", 
-   "oldfieldtype": "Select", 
-   "options": "CRM-OPP-.YYYY.-", 
-   "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": 1, 
-   "translatable": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "",
+   "fetch_if_empty": 0,
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "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": "Series",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "CRM-OPP-.YYYY.-",
+   "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": 1,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "enquiry_from", 
-   "fieldtype": "Select", 
-   "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": "Opportunity From", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "enquiry_from", 
-   "oldfieldtype": "Select", 
-   "options": "\nLead\nCustomer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "opportunity_from",
+   "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": 1,
+   "label": "Opportunity From",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "enquiry_from",
+   "oldfieldtype": "Select",
+   "options": "DocType",
+   "permlevel": 0,
+   "print_hide": 1,
+   "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": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.enquiry_from===\"Customer\"", 
-   "fieldname": "customer", 
-   "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": 1, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer", 
-   "oldfieldtype": "Link", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fetch_if_empty": 0,
+   "fieldname": "party_name",
+   "fieldtype": "Dynamic 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": 1,
+   "label": "Party",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "customer",
+   "oldfieldtype": "Link",
+   "options": "opportunity_from",
+   "permlevel": 0,
+   "print_hide": 1,
+   "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": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.enquiry_from===\"Lead\"", 
-   "fieldname": "lead", 
-   "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": 1, 
-   "label": "Lead", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "lead", 
-   "oldfieldtype": "Link", 
-   "options": "Lead", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "",
+   "fetch_from": "",
+   "fetch_if_empty": 0,
+   "fieldname": "customer_name",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Customer / Lead Name",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "customer_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer / Lead Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column 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, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break0",
+   "fieldtype": "Column 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,
+   "oldfieldtype": "Column Break",
+   "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,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "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": "Title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "title",
+   "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": "Title",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Sales", 
-   "fieldname": "opportunity_type", 
-   "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": "Opportunity Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "enquiry_type", 
-   "oldfieldtype": "Select", 
-   "options": "Opportunity Type", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Sales",
+   "fetch_if_empty": 0,
+   "fieldname": "opportunity_type",
+   "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": "Opportunity Type",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "enquiry_type",
+   "oldfieldtype": "Select",
+   "options": "Opportunity Type",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Open", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "Open\nQuotation\nConverted\nLost\nReplied\nClosed", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Open",
+   "fetch_if_empty": 0,
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "status",
+   "oldfieldtype": "Select",
+   "options": "Open\nQuotation\nConverted\nLost\nReplied\nClosed",
+   "permlevel": 0,
+   "print_hide": 1,
+   "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": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "mins_to_first_response", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Mins to first response", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.status===\"Lost\"",
+   "fetch_if_empty": 0,
+   "fieldname": "order_lost_reason",
+   "fieldtype": "Small Text",
+   "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": "Lost Reason",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "contact_by", 
-   "columns": 0, 
-   "fieldname": "next_contact", 
-   "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": "Follow Up", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 1,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "mins_to_first_response",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Mins to first response",
+   "length": 0,
+   "no_copy": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "contact_by", 
-   "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": 1, 
-   "label": "Next Contact By", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "contact_by", 
-   "oldfieldtype": "Link", 
-   "options": "User", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "contact_by",
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "next_contact",
+   "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": "Follow Up",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_by",
+   "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": 1,
+   "label": "Next Contact By",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "contact_by",
+   "oldfieldtype": "Link",
+   "options": "User",
+   "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,
    "width": "75px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "contact_date", 
-   "fieldtype": "Datetime", 
-   "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": "Next Contact Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "contact_date", 
-   "oldfieldtype": "Date", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_date",
+   "fieldtype": "Datetime",
+   "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": "Next Contact Date",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "contact_date",
+   "oldfieldtype": "Date",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break2", 
-   "fieldtype": "Column 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, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break2",
+   "fieldtype": "Column 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,
+   "oldfieldtype": "Column Break",
+   "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,
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_discuss", 
-   "fieldtype": "Small Text", 
-   "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": "To Discuss", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "to_discuss", 
-   "oldfieldtype": "Small Text", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "to_discuss",
+   "fieldtype": "Small Text",
+   "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": "To Discuss",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "to_discuss",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_14", 
-   "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": "Sales", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_14",
+   "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": "Sales",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "currency", 
-   "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": "Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Currency", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "currency",
+   "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": "Currency",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Currency",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "opportunity_amount", 
-   "fieldtype": "Currency", 
-   "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": "Opportunity Amount", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "opportunity_amount",
+   "fieldtype": "Currency",
+   "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": "Opportunity Amount",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "with_items", 
-   "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": "With Items", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "with_items",
+   "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": "With Items",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_17", 
-   "fieldtype": "Column 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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_17",
+   "fieldtype": "Column 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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Prospecting", 
-   "fieldname": "sales_stage", 
-   "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": "Sales Stage", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Stage", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Prospecting",
+   "fetch_if_empty": 0,
+   "fieldname": "sales_stage",
+   "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": "Sales Stage",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Sales Stage",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "100", 
-   "fieldname": "probability", 
-   "fieldtype": "Percent", 
-   "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": "Probability (%)", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "100",
+   "fetch_if_empty": 0,
+   "fieldname": "probability",
+   "fieldtype": "Percent",
+   "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": "Probability (%)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "with_items", 
-   "fieldname": "items_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": "Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-shopping-cart", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "with_items",
+   "fetch_if_empty": 0,
+   "fieldname": "items_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": "Items",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-shopping-cart",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "items", 
-   "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": "Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "enquiry_details", 
-   "oldfieldtype": "Table", 
-   "options": "Opportunity Item", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fetch_if_empty": 0,
+   "fieldname": "items",
+   "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": "Items",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "enquiry_details",
+   "oldfieldtype": "Table",
+   "options": "Opportunity Item",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "next_contact_by", 
-   "columns": 0, 
-   "depends_on": "eval:doc.lead || doc.customer", 
-   "fieldname": "contact_info", 
-   "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": "Contact Info", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "fa fa-bullhorn", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "next_contact_by",
+   "columns": 0,
+   "depends_on": "eval:doc.party_name",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_info",
+   "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": "Contact Info",
+   "length": 0,
+   "no_copy": 0,
+   "options": "fa fa-bullhorn",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.customer || doc.lead", 
-   "fieldname": "customer_address", 
-   "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": "Customer / Lead Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.party_name",
+   "fetch_if_empty": 0,
+   "fieldname": "customer_address",
+   "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": "Customer / Lead Address",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Address",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "address_display", 
-   "fieldtype": "Small Text", 
-   "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": "Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "address", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "address_display",
+   "fieldtype": "Small Text",
+   "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": "Address",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "address",
+   "oldfieldtype": "Small Text",
+   "permlevel": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "customer", 
-   "description": "", 
-   "fieldname": "territory", 
-   "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": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:",
+   "description": "",
+   "fetch_if_empty": 0,
+   "fieldname": "territory",
+   "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": "Territory",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Territory",
+   "permlevel": 0,
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "customer", 
-   "description": "", 
-   "fieldname": "customer_group", 
-   "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": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "customer_group", 
-   "oldfieldtype": "Link", 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.opportunity_from=='Customer' && doc.party_name",
+   "description": "",
+   "fetch_if_empty": 0,
+   "fieldname": "customer_group",
+   "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": "Customer Group",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "customer_group",
+   "oldfieldtype": "Link",
+   "options": "Customer Group",
+   "permlevel": 0,
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break3", 
-   "fieldtype": "Column 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, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break3",
+   "fieldtype": "Column 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,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.lead || doc.customer", 
-   "fieldname": "contact_person", 
-   "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": "Contact Person", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Contact", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.party_name",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_person",
+   "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": "Contact Person",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Contact",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "customer", 
-   "fieldname": "contact_display", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.opportunity_from=='Customer' && doc.party_name",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_display",
+   "fieldtype": "Small Text",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 1,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Contact",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.lead || doc.customer", 
-   "fieldname": "contact_email", 
-   "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": "Contact Email", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.party_name",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_email",
+   "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": "Contact Email",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.lead || doc.customer", 
-   "fieldname": "contact_mobile", 
-   "fieldtype": "Small Text", 
-   "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": "Contact Mobile No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval:doc.party_name",
+   "fetch_if_empty": 0,
+   "fieldname": "contact_mobile",
+   "fieldtype": "Small Text",
+   "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": "Contact Mobile No",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "fieldname": "more_info", 
-   "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": "Source", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-file-text", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "collapsible_depends_on": "",
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "more_info",
+   "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": "Source",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-file-text",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source", 
-   "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": "Source", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "source", 
-   "oldfieldtype": "Select", 
-   "options": "Lead Source", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "source",
+   "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": "Source",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "source",
+   "oldfieldtype": "Select",
+   "options": "Lead Source",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.source==\"Campaign\"", 
-   "description": "Enter name of campaign if source of enquiry is campaign", 
-   "fieldname": "campaign", 
-   "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": "Campaign", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "campaign", 
-   "oldfieldtype": "Link", 
-   "options": "Campaign", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "depends_on": "eval: doc.source==\"Campaign\"",
+   "description": "Enter name of campaign if source of enquiry is campaign",
+   "fetch_if_empty": 0,
+   "fieldname": "campaign",
+   "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": "Campaign",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "campaign",
+   "oldfieldtype": "Link",
+   "options": "Campaign",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.status===\"Lost\"", 
-   "fieldname": "order_lost_reason", 
-   "fieldtype": "Small Text", 
-   "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": "Detailed Reason", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "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_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column 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, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break1",
+   "fieldtype": "Column 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,
+   "oldfieldtype": "Column Break",
+   "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,
    "width": "50%"
-  }, 
+  },
   {
-   "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": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "company", 
-   "oldfieldtype": "Link", 
-   "options": "Company", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "company",
+   "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": "Company",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "permlevel": 0,
+   "print_hide": 1,
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "transaction_date", 
-   "fieldtype": "Date", 
-   "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": "Opportunity Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "transaction_date", 
-   "oldfieldtype": "Date", 
-   "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": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Today",
+   "fetch_if_empty": 0,
+   "fieldname": "transaction_date",
+   "fieldtype": "Date",
+   "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": "Opportunity Date",
+   "length": 0,
+   "no_copy": 0,
+   "oldfieldname": "transaction_date",
+   "oldfieldtype": "Date",
+   "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": 0,
    "width": "50px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "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": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Data", 
-   "options": "Opportunity", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "amended_from",
+   "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": "Amended From",
+   "length": 0,
+   "no_copy": 1,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Data",
+   "options": "Opportunity",
+   "permlevel": 0,
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "lost_reasons", 
-   "fieldtype": "Table MultiSelect", 
-   "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": "Lost Reasons", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Lost Reason Detail", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "lost_reasons",
+   "fieldtype": "Table MultiSelect",
+   "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": "Lost Reasons",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Lost Reason Detail",
+   "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
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-info-sign", 
- "idx": 195, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-12-29 18:38:37.270217", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Opportunity", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-info-sign",
+ "idx": 195,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-06-19 19:03:32.740910",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Opportunity",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
-  }, 
+  },
   {
-   "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": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "status,transaction_date,customer,lead,opportunity_type,territory,company", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "timeline_field": "customer", 
- "title_field": "title", 
- "track_changes": 0, 
- "track_seen": 1, 
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "status,transaction_date,party_name,opportunity_type,territory,company",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "timeline_field": "party_name",
+ "title_field": "title",
+ "track_changes": 0,
+ "track_seen": 1,
  "track_views": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index adac8f5..99486fa 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -9,7 +9,6 @@
 from erpnext.setup.utils import get_exchange_rate
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.accounts.party import get_party_account_currency
-from frappe.desk.form import assign_to
 from frappe.email.inbox import link_communication_to_document
 
 subject_field = "title"
@@ -17,8 +16,8 @@
 
 class Opportunity(TransactionBase):
 	def after_insert(self):
-		if self.lead:
-			frappe.get_doc("Lead", self.lead).set_status(update=True)
+		if self.opportunity_from == "Lead":
+			frappe.get_doc("Lead", self.party_name).set_status(update=True)
 
 	def validate(self):
 		self._prev = frappe._dict({
@@ -30,12 +29,8 @@
 
 		self.make_new_lead_if_required()
 
-		if not self.enquiry_from:
-			frappe.throw(_("Opportunity From field is mandatory"))
-
 		self.validate_item_details()
 		self.validate_uom_is_integer("uom", "qty")
-		self.validate_lead_cust()
 		self.validate_cust_name()
 
 		if not self.title:
@@ -46,7 +41,7 @@
 
 	def make_new_lead_if_required(self):
 		"""Set lead against new opportunity"""
-		if not (self.lead or self.customer) and self.contact_email:
+		if (not self.get("party_name")) and self.contact_email:
 			# check if customer is already created agains the self.contact_email
 			customer = frappe.db.sql("""select
 				distinct `tabDynamic Link`.link_name as customer
@@ -62,8 +57,8 @@
 					`tabDynamic Link`.link_doctype='Customer'
 			""".format(self.contact_email), as_dict=True)
 			if customer and customer[0].customer:
-				self.customer = customer[0].customer
-				self.enquiry_from = "Customer"
+				self.party_name = customer[0].customer
+				self.opportunity_from = "Customer"
 				return
 
 			lead_name = frappe.db.get_value("Lead", {"email_id": self.contact_email})
@@ -90,8 +85,8 @@
 				lead.insert(ignore_permissions=True)
 				lead_name = lead.name
 
-			self.enquiry_from = "Lead"
-			self.lead = lead_name
+			self.opportunity_from = "Lead"
+			self.party_name = lead_name
 
 	def declare_enquiry_lost(self, lost_reasons_list, detailed_reason=None):
 		if not self.has_active_quotation():
@@ -146,18 +141,15 @@
 			return True
 
 	def validate_cust_name(self):
-		if self.customer:
-			self.customer_name = frappe.db.get_value("Customer", self.customer, "customer_name")
-		elif self.lead:
-			lead_name, company_name = frappe.db.get_value("Lead", self.lead, ["lead_name", "company_name"])
+		if self.party_name and self.opportunity_from == 'Customer':
+			self.customer_name = frappe.db.get_value("Customer", self.party_name, "customer_name")
+		elif self.party_name and self.opportunity_from == 'Lead':
+			lead_name, company_name = frappe.db.get_value("Lead", self.party_name, ["lead_name", "company_name"])
 			self.customer_name = company_name or lead_name
 
 	def on_update(self):
 		self.add_calendar_event()
 
-		# assign to customer account manager or lead owner
-		assign_to_user(self, subject_field)
-
 	def add_calendar_event(self, opts=None, force=False):
 		if not opts:
 			opts = frappe._dict()
@@ -165,16 +157,16 @@
 		opts.description = ""
 		opts.contact_date = self.contact_date
 
-		if self.customer:
+		if self.party_name and self.opportunity_from == 'Customer':
 			if self.contact_person:
 				opts.description = 'Contact '+cstr(self.contact_person)
 			else:
-				opts.description = 'Contact customer '+cstr(self.customer)
-		elif self.lead:
+				opts.description = 'Contact customer '+cstr(self.party_name)
+		elif self.party_name and self.opportunity_from == 'Lead':
 			if self.contact_display:
 				opts.description = 'Contact '+cstr(self.contact_display)
 			else:
-				opts.description = 'Contact lead '+cstr(self.lead)
+				opts.description = 'Contact lead '+cstr(self.party_name)
 
 		opts.subject = opts.description
 		opts.description += '. By : ' + cstr(self.contact_by)
@@ -199,17 +191,6 @@
 			for key in item_fields:
 				if not d.get(key): d.set(key, item.get(key))
 
-	def validate_lead_cust(self):
-		if self.enquiry_from == 'Lead':
-			if not self.lead:
-				frappe.throw(_("Lead must be set if Opportunity is made from Lead"))
-			else:
-				self.customer = None
-		elif self.enquiry_from == 'Customer':
-			if not self.customer:
-				msgprint(_("Customer is mandatory if 'Opportunity From' is selected as Customer"), raise_exception=1)
-			else:
-				self.lead = None
 
 @frappe.whitelist()
 def get_item_details(item_code):
@@ -231,8 +212,11 @@
 		quotation = frappe.get_doc(target)
 
 		company_currency = frappe.get_cached_value('Company',  quotation.company,  "default_currency")
-		party_account_currency = get_party_account_currency("Customer", quotation.customer,
-			quotation.company) if quotation.customer else company_currency
+
+		if quotation.quotation_to == 'Customer' and quotation.party_name:
+			party_account_currency = get_party_account_currency("Customer", quotation.party_name, quotation.company)
+		else:
+			party_account_currency = company_currency
 
 		quotation.currency = party_account_currency or company_currency
 
@@ -258,7 +242,7 @@
 		"Opportunity": {
 			"doctype": "Quotation",
 			"field_map": {
-				"enquiry_from": "quotation_to",
+				"opportunity_from": "quotation_to",
 				"opportunity_type": "order_type",
 				"name": "enq_no",
 			}
@@ -335,21 +319,6 @@
 		doc.flags.ignore_mandatory = True
 		doc.save()
 
-def assign_to_user(doc, subject_field):
-	assign_user = None
-	if doc.customer:
-		assign_user = frappe.db.get_value('Customer', doc.customer, 'account_manager')
-	elif doc.lead:
-		assign_user = frappe.db.get_value('Lead', doc.lead, 'lead_owner')
-
-	if assign_user and assign_user not in ['Administrator', 'Guest']:
-		if not assign_to.get(dict(doctype = doc.doctype, name = doc.name)):
-			assign_to.add({
-				"assign_to": assign_user,
-				"doctype": doc.doctype,
-				"name": doc.name,
-				"description": doc.get(subject_field)
-			})
 @frappe.whitelist()
 def make_opportunity_from_communication(communication, ignore_communication_links=False):
 	from erpnext.crm.doctype.lead.lead import make_lead_from_communication
@@ -359,11 +328,11 @@
 	if not lead:
 		lead = make_lead_from_communication(communication, ignore_communication_links=True)
 
-	enquiry_from = "Lead"
+	opportunity_from = "Lead"
 
 	opportunity = frappe.get_doc({
 		"doctype": "Opportunity",
-		"enquiry_from": enquiry_from,
+		"opportunity_from": opportunity_from,
 		"lead": lead
 	}).insert(ignore_permissions=True)
 
diff --git a/erpnext/crm/doctype/opportunity/opportunity_list.js b/erpnext/crm/doctype/opportunity/opportunity_list.js
index 0dbbf8a..af53bf7 100644
--- a/erpnext/crm/doctype/opportunity/opportunity_list.js
+++ b/erpnext/crm/doctype/opportunity/opportunity_list.js
@@ -1,5 +1,5 @@
 frappe.listview_settings['Opportunity'] = {
-	add_fields: ["customer_name", "opportunity_type", "enquiry_from", "status"],
+	add_fields: ["customer_name", "opportunity_type", "opportunity_from", "status"],
 	get_indicator: function(doc) {
 		var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status];
 		if(doc.status=="Quotation") {
@@ -17,5 +17,13 @@
 		listview.page.add_menu_item(__("Set as Closed"), function() {
 			listview.call_for_selected_items(method, {"status": "Closed"});
 		});
+
+		listview.page.fields_dict.opportunity_from.get_query = function() {
+			return {
+				"filters": {
+					"name": ["in", ["Customer", "Lead"]],
+				}
+			};
+		};
 	}
 };
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.js b/erpnext/crm/doctype/opportunity/test_opportunity.js
index f2b04f8..45b97dd 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.js
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.js
@@ -6,7 +6,7 @@
 		() => frappe.timeout(1),
 		() => frappe.click_button('New'),
 		() => frappe.timeout(1),
-		() => cur_frm.set_value('enquiry_from', 'Customer'),
+		() => cur_frm.set_value('opportunity_from', 'Customer'),
 		() => cur_frm.set_value('customer', 'Test Customer 1'),
 
 		// check items
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 0dab01d..1a9f66a 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -7,7 +7,6 @@
 from erpnext.crm.doctype.lead.lead import make_customer
 from erpnext.crm.doctype.opportunity.opportunity import make_quotation
 import unittest
-from frappe.desk.form import assign_to
 
 test_records = frappe.get_test_records('Opportunity')
 
@@ -39,13 +38,13 @@
 		# new lead should be created against the new.opportunity@example.com
 		opp_doc = frappe.get_doc(args).insert(ignore_permissions=True)
 
-		self.assertTrue(opp_doc.lead)
-		self.assertEqual(opp_doc.enquiry_from, "Lead")
-		self.assertEqual(frappe.db.get_value("Lead", opp_doc.lead, "email_id"),
+		self.assertTrue(opp_doc.party_name)
+		self.assertEqual(opp_doc.opportunity_from, "Lead")
+		self.assertEqual(frappe.db.get_value("Lead", opp_doc.party_name, "email_id"),
 			new_lead_email_id)
 
 		# create new customer and create new contact against 'new.opportunity@example.com'
-		customer = make_customer(opp_doc.lead).insert(ignore_permissions=True)
+		customer = make_customer(opp_doc.party_name).insert(ignore_permissions=True)
 		frappe.get_doc({
 			"doctype": "Contact",
 			"email_id": new_lead_email_id,
@@ -57,24 +56,9 @@
 		}).insert(ignore_permissions=True)
 
 		opp_doc = frappe.get_doc(args).insert(ignore_permissions=True)
-		self.assertTrue(opp_doc.customer)
-		self.assertEqual(opp_doc.enquiry_from, "Customer")
-		self.assertEqual(opp_doc.customer, customer.name)
-
-	def test_assignment(self):
-		# assign cutomer account manager
-		frappe.db.set_value('Customer', '_Test Customer', 'account_manager', 'test1@example.com')
-		doc = make_opportunity(with_items=0)
-
-		self.assertEqual(assign_to.get(dict(doctype = doc.doctype, name = doc.name))[0].get('owner'), 'test1@example.com')
-
-		# assign lead owner
-		frappe.db.set_value('Customer', '_Test Customer', 'account_manager', '')
-		frappe.db.set_value('Lead', '_T-Lead-00001', 'lead_owner', 'test2@example.com')
-		doc = make_opportunity(with_items=0, enquiry_from='Lead')
-
-		self.assertEqual(assign_to.get(dict(doctype = doc.doctype, name = doc.name))[0].get('owner'), 'test2@example.com')
-
+		self.assertTrue(opp_doc.party_name)
+		self.assertEqual(opp_doc.opportunity_from, "Customer")
+		self.assertEqual(opp_doc.party_name, customer.name)
 
 def make_opportunity(**args):
 	args = frappe._dict(args)
@@ -82,17 +66,17 @@
 	opp_doc = frappe.get_doc({
 		"doctype": "Opportunity",
 		"company": args.company or "_Test Company",
-		"enquiry_from": args.enquiry_from or "Customer",
+		"opportunity_from": args.opportunity_from or "Customer",
 		"opportunity_type": "Sales",
 		"with_items": args.with_items or 0,
 		"transaction_date": today()
 	})
 
-	if opp_doc.enquiry_from == 'Customer':
-		opp_doc.customer = args.customer or "_Test Customer"
+	if opp_doc.opportunity_from == 'Customer':
+		opp_doc.party_name= args.customer or "_Test Customer"
 
-	if opp_doc.enquiry_from == 'Lead':
-		opp_doc.lead = args.lead or "_T-Lead-00001"
+	if opp_doc.opportunity_from == 'Lead':
+		opp_doc.party_name = args.lead or "_T-Lead-00001"
 
 	if args.with_items:
 		opp_doc.append('items', {
diff --git a/erpnext/crm/doctype/opportunity/test_records.json b/erpnext/crm/doctype/opportunity/test_records.json
index 84dfea5..a1e0ad9 100644
--- a/erpnext/crm/doctype/opportunity/test_records.json
+++ b/erpnext/crm/doctype/opportunity/test_records.json
@@ -2,9 +2,9 @@
 	{
 		"doctype": "Opportunity",
 		"name": "_Test Opportunity 1",
-		"enquiry_from": "Lead",
+		"opportunity_from": "Lead",
 		"enquiry_type": "Sales",
-		"lead": "_T-Lead-00001",
+		"party_name": "_T-Lead-00001",
 		"transaction_date": "2013-12-12",
 		"items": [{
 			"item_name": "Test Item",
diff --git a/erpnext/crm/doctype/utils.py b/erpnext/crm/doctype/utils.py
new file mode 100644
index 0000000..9cfab15
--- /dev/null
+++ b/erpnext/crm/doctype/utils.py
@@ -0,0 +1,100 @@
+import frappe
+from frappe import _
+import json
+
+@frappe.whitelist()
+def get_document_with_phone_number(number):
+	# finds contacts and leads
+	if not number: return
+	number = number.lstrip('0')
+	number_filter = {
+		'phone': ['like', '%{}'.format(number)],
+		'mobile_no': ['like', '%{}'.format(number)]
+	}
+	contacts = frappe.get_all('Contact', or_filters=number_filter, limit=1)
+
+	if contacts:
+		return frappe.get_doc('Contact', contacts[0].name)
+
+	leads = frappe.get_all('Lead', or_filters=number_filter, limit=1)
+
+	if leads:
+		return frappe.get_doc('Lead', leads[0].name)
+
+@frappe.whitelist()
+def get_last_interaction(number, reference_doc):
+	reference_doc = json.loads(reference_doc) if reference_doc else get_document_with_phone_number(number)
+
+	if not reference_doc: return
+
+	reference_doc = frappe._dict(reference_doc)
+
+	last_communication = {}
+	last_issue = {}
+	if reference_doc.doctype == 'Contact':
+		customer_name = ''
+		query_condition = ''
+		for link in reference_doc.links:
+			link = frappe._dict(link)
+			if link.link_doctype == 'Customer':
+				customer_name = link.link_name
+			query_condition += "(`reference_doctype`='{}' AND `reference_name`='{}') OR".format(link.link_doctype, link.link_name)
+
+		if query_condition:
+			query_condition = query_condition[:-2]
+			last_communication = frappe.db.sql("""
+				SELECT `name`, `content`
+				FROM `tabCommunication`
+				WHERE {}
+				ORDER BY `modified`
+				LIMIT 1
+			""".format(query_condition)) # nosec
+
+		if customer_name:
+			last_issue = frappe.get_all('Issue', {
+				'customer': customer_name
+			}, ['name', 'subject', 'customer'], limit=1)
+
+	elif reference_doc.doctype == 'Lead':
+		last_communication = frappe.get_all('Communication', filters={
+			'reference_doctype': reference_doc.doctype,
+			'reference_name': reference_doc.name,
+			'sent_or_received': 'Received'
+		}, fields=['name', 'content'], limit=1)
+
+	return {
+		'last_communication': last_communication[0] if last_communication else None,
+		'last_issue': last_issue[0] if last_issue else None
+	}
+
+@frappe.whitelist()
+def add_call_summary(docname, summary):
+	call_log = frappe.get_doc('Call Log', docname)
+	summary = _('Call Summary by {0}: {1}').format(
+		frappe.utils.get_fullname(frappe.session.user), summary)
+	if not call_log.summary:
+		call_log.summary = summary
+	else:
+		call_log.summary += '<br>' + summary
+	call_log.save(ignore_permissions=True)
+
+def get_employee_emails_for_popup(communication_medium):
+	now_time = frappe.utils.nowtime()
+	weekday = frappe.utils.get_weekday()
+
+	available_employee_groups = frappe.get_all("Communication Medium Timeslot", filters={
+		'day_of_week': weekday,
+		'parent': communication_medium,
+		'from_time': ['<=', now_time],
+		'to_time': ['>=', now_time],
+	}, fields=['employee_group'])
+
+	available_employee_groups = tuple([emp.employee_group for emp in available_employee_groups])
+
+	employees = frappe.get_all('Employee Group Table', filters={
+		'parent': ['in', available_employee_groups]
+	}, fields=['user_id'])
+
+	employee_emails = set([employee.user_id for employee in employees])
+
+	return employee_emails
diff --git a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
index b20fe15..ec49883 100644
--- a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
+++ b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
@@ -4,86 +4,132 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import flt
 
 def execute(filters=None):
 	columns, data = [], []
-	columns=get_columns()
-	data=get_lead_data(filters, "Campaign Name")
+	columns=get_columns("Campaign Name")
+	data=get_lead_data(filters or {}, "Campaign Name")
 	return columns, data
-	
-def get_columns():
+
+def get_columns(based_on):
 	return [
-		_("Campaign Name") + ":data:130", 
-		_("Lead Count") + ":Int:80",
-		_("Opp Count") + ":Int:80",
-		_("Quot Count") + ":Int:80", 
-		_("Order Count") + ":Int:100",
-		_("Order Value") + ":Float:100",
-		_("Opp/Lead %") + ":Float:100",
-		_("Quot/Lead %") + ":Float:100",
-		_("Order/Quot %") + ":Float:100"
+		{
+			"fieldname": frappe.scrub(based_on),
+			"label": _(based_on),
+			"fieldtype": "Data",
+			"width": 150
+		},
+		{
+			"fieldname": "lead_count",
+			"label": _("Lead Count"),
+			"fieldtype": "Int",
+			"width": 80
+		},
+		{
+			"fieldname": "opp_count",
+			"label": _("Opp Count"),
+			"fieldtype": "Int",
+			"width": 80
+		},
+		{
+			"fieldname": "quot_count",
+			"label": _("Quot Count"),
+			"fieldtype": "Int",
+			"width": 80
+		},
+		{
+			"fieldname": "order_count",
+			"label": _("Order Count"),
+			"fieldtype": "Int",
+			"width": 100
+		},
+		{
+			"fieldname": "order_value",
+			"label": _("Order Value"),
+			"fieldtype": "Float",
+			"width": 100
+		},
+		{
+			"fieldname": "opp_lead",
+			"label": _("Opp/Lead %"),
+			"fieldtype": "Float",
+			"width": 100
+		},
+		{
+			"fieldname": "quot_lead",
+			"label": _("Quot/Lead %"),
+			"fieldtype": "Float",
+			"width": 100
+		},
+		{
+			"fieldname": "order_quot",
+			"label": _("Order/Quot %"),
+			"fieldtype": "Float",
+			"width": 100
+		}
 	]
-	
+
 def get_lead_data(filters, based_on):
 	based_on_field = frappe.scrub(based_on)
 	conditions = get_filter_conditions(filters)
-	
+
 	lead_details = frappe.db.sql("""
 		select {based_on_field}, name
-		from `tabLead` 
-		where {based_on_field} is not null and {based_on_field} != '' {conditions} 
+		from `tabLead`
+		where {based_on_field} is not null and {based_on_field} != '' {conditions}
 	""".format(based_on_field=based_on_field, conditions=conditions), filters, as_dict=1)
-	
+
 	lead_map = frappe._dict()
 	for d in lead_details:
 		lead_map.setdefault(d.get(based_on_field), []).append(d.name)
-	
+
 	data = []
 	for based_on_value, leads in lead_map.items():
 		row = {
-			based_on: based_on_value,
-			"Lead Count": len(leads)
+			based_on_field: based_on_value,
+			"lead_count": len(leads)
 		}
-		row["Quot Count"]= get_lead_quotation_count(leads)
-		row["Opp Count"] = get_lead_opp_count(leads)
-		row["Order Count"] = get_quotation_ordered_count(leads)
-		row["Order Value"] = get_order_amount(leads)
-		
-		row["Opp/Lead %"] = row["Opp Count"] / row["Lead Count"] * 100
-		row["Quot/Lead %"] = row["Quot Count"] / row["Lead Count"] * 100
-		
-		row["Order/Quot %"] = row["Order Count"] / (row["Quot Count"] or 1) * 100
-			
+		row["quot_count"]= get_lead_quotation_count(leads)
+		row["opp_count"] = get_lead_opp_count(leads)
+		row["order_count"] = get_quotation_ordered_count(leads)
+		row["order_value"] = get_order_amount(leads) or 0
+
+		row["opp_lead"] = flt(row["opp_count"]) / flt(row["lead_count"] or 1.0) * 100.0
+		row["quot_lead"] = flt(row["quot_count"]) / flt(row["lead_count"] or 1.0) * 100.0
+
+		row["order_quot"] = flt(row["order_count"]) / flt(row["quot_count"] or 1.0) * 100.0
+
 		data.append(row)
-		
+
 	return data
-	
+
 def get_filter_conditions(filters):
 	conditions=""
 	if filters.from_date:
 		conditions += " and date(creation) >= %(from_date)s"
 	if filters.to_date:
 		conditions += " and date(creation) <= %(to_date)s"
-	
+
 	return conditions
-	
+
 def get_lead_quotation_count(leads):
-	return frappe.db.sql("""select count(name) from `tabQuotation` 
-		where lead in (%s)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0]
-	
+	return frappe.db.sql("""select count(name) from `tabQuotation`
+		where quotation_to = 'Lead' and party_name in (%s)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0] #nosec
+
 def get_lead_opp_count(leads):
-	return frappe.db.sql("""select count(name) from `tabOpportunity` 
-	where lead in (%s)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0]
-	
+	return frappe.db.sql("""select count(name) from `tabOpportunity`
+	where opportunity_from = 'Lead' and party_name in (%s)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0]
+
 def get_quotation_ordered_count(leads):
-	return frappe.db.sql("""select count(name) 
-		from `tabQuotation` where status = 'Ordered'
-		and lead in (%s)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0]
-	
+	return frappe.db.sql("""select count(name)
+		from `tabQuotation` where status = 'Ordered' and quotation_to = 'Lead'
+		and party_name in (%s)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0]
+
 def get_order_amount(leads):
-	return frappe.db.sql("""select sum(base_net_amount) 
+	return frappe.db.sql("""select sum(base_net_amount)
 		from `tabSales Order Item`
 		where prevdoc_docname in (
-			select name from `tabQuotation` where status = 'Ordered' 
-			and lead in (%s)
+			select name from `tabQuotation` where status = 'Ordered'
+			and quotation_to = 'Lead' and party_name in (%s)
 		)""" % ', '.join(["%s"]*len(leads)), tuple(leads))[0][0]
\ No newline at end of file
diff --git a/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py b/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py
index d9ee30e..d91b9c5 100644
--- a/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py
+++ b/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py
@@ -66,7 +66,7 @@
 def get_communication_details(filters):
 	communication_count = None
 	communication_list = []
-	opportunities = frappe.db.get_values('Opportunity', {'enquiry_from': 'Lead'},\
+	opportunities = frappe.db.get_values('Opportunity', {'opportunity_from': 'Lead'},\
 		['name', 'customer_name', 'lead', 'contact_email'], as_dict=1)
 
 	for d in opportunities:
diff --git a/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.py b/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.py
index 8134bc2..6172a75 100644
--- a/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.py
+++ b/erpnext/crm/report/lead_owner_efficiency/lead_owner_efficiency.py
@@ -11,16 +11,61 @@
 	columns=get_columns()
 	data=get_lead_data(filters, "Lead Owner")
 	return columns, data
-	
+
 def get_columns():
 	return [
-		_("Lead Owner") + ":Data:130", 
-		_("Lead Count") + ":Int:80",
-		_("Opp Count") + ":Int:80",
-		_("Quot Count") + ":Int:80", 
-		_("Order Count") + ":Int:100",
-		_("Order Value") + ":Float:100",
-		_("Opp/Lead %") + ":Float:100",
-		_("Quot/Lead %") + ":Float:100",
-		_("Order/Quot %") + ":Float:100"
+		{
+			"fieldname": "lead_owner",
+			"label": _("Lead Owner"),
+			"fieldtype": "Data",
+			"width": "130"
+		},
+		{
+			"fieldname": "lead_count",
+			"label": _("Lead Count"),
+			"fieldtype": "Int",
+			"width": "80"
+		},
+		{
+			"fieldname": "opp_count",
+			"label": _("Opp Count"),
+			"fieldtype": "Int",
+			"width": "80"
+		},
+		{
+			"fieldname": "quot_count",
+			"label": _("Quot Count"),
+			"fieldtype": "Int",
+			"width": "80"
+		},
+		{
+			"fieldname": "order_count",
+			"label": _("Order Count"),
+			"fieldtype": "Int",
+			"width": "100"
+		},
+		{
+			"fieldname": "order_value",
+			"label": _("Order Value"),
+			"fieldtype": "Float",
+			"width": "100"
+		},
+		{
+			"fieldname": "opp_lead",
+			"label": _("Opp/Lead %"),
+			"fieldtype": "Float",
+			"width": "100"
+		},
+		{
+			"fieldname": "quot_lead",
+			"label": _("Quot/Lead %"),
+			"fieldtype": "Float",
+			"width": "100"
+		},
+		{
+			"fieldname": "order_quot",
+			"label": _("Order/Quot %"),
+			"fieldtype": "Float",
+			"width": "100"
+		}
 	]
\ No newline at end of file
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.json b/erpnext/crm/report/lost_opportunity/lost_opportunity.json
index c100ffa..e7c5068 100644
--- a/erpnext/crm/report/lost_opportunity/lost_opportunity.json
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.json
@@ -1,25 +1,25 @@
 {
- "add_total_row": 0, 
- "creation": "2018-12-31 16:30:57.188837", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 0, 
- "is_standard": "Yes", 
- "json": "{\"order_by\": \"`tabOpportunity`.`modified` desc\", \"filters\": [[\"Opportunity\", \"status\", \"=\", \"Lost\"]], \"fields\": [[\"name\", \"Opportunity\"], [\"enquiry_from\", \"Opportunity\"], [\"customer\", \"Opportunity\"], [\"lead\", \"Opportunity\"], [\"customer_name\", \"Opportunity\"], [\"opportunity_type\", \"Opportunity\"], [\"status\", \"Opportunity\"], [\"contact_by\", \"Opportunity\"], [\"docstatus\", \"Opportunity\"], [\"lost_reason\", \"Lost Reason Detail\"]], \"add_totals_row\": 0, \"add_total_row\": 0, \"page_length\": 20}", 
- "modified": "2018-12-31 16:33:08.083618", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Lost Opportunity", 
- "owner": "Administrator", 
- "prepared_report": 0, 
- "ref_doctype": "Opportunity", 
- "report_name": "Lost Opportunity", 
- "report_type": "Report Builder", 
+ "add_total_row": 0,
+ "creation": "2018-12-31 16:30:57.188837",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "json": "{\"order_by\": \"`tabOpportunity`.`modified` desc\", \"filters\": [[\"Opportunity\", \"status\", \"=\", \"Lost\"]], \"fields\": [[\"name\", \"Opportunity\"], [\"opportunity_from\", \"Opportunity\"], [\"party_name\", \"Opportunity\"], [\"customer_name\", \"Opportunity\"], [\"opportunity_type\", \"Opportunity\"], [\"status\", \"Opportunity\"], [\"contact_by\", \"Opportunity\"], [\"docstatus\", \"Opportunity\"], [\"lost_reason\", \"Lost Reason Detail\"]], \"add_totals_row\": 0, \"add_total_row\": 0, \"page_length\": 20}",
+ "modified": "2019-06-26 16:33:08.083618",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Lost Opportunity",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Opportunity",
+ "report_name": "Lost Opportunity",
+ "report_type": "Report Builder",
  "roles": [
   {
    "role": "Sales User"
-  }, 
+  },
   {
    "role": "Sales Manager"
   }
diff --git a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
index 36a4ad6..b538a58 100644
--- a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
+++ b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
@@ -35,14 +35,14 @@
 
 	for lead in frappe.get_all('Lead', fields = ['name', 'lead_name', 'company_name'], filters=lead_filters):
 		data = frappe.db.sql("""
-			select 
-				`tabCommunication`.reference_doctype, `tabCommunication`.reference_name, 
+			select
+				`tabCommunication`.reference_doctype, `tabCommunication`.reference_name,
 				`tabCommunication`.content, `tabCommunication`.communication_date
-			from 
+			from
 				(
-					(select name, lead from `tabOpportunity` where lead = %(lead)s)
-				union 
-					(select name, lead from `tabQuotation` where lead = %(lead)s)
+					(select name, party_name as lead from `tabOpportunity` where opportunity_from='Lead' and party_name = %(lead)s)
+				union
+					(select name, party_name as lead from `tabQuotation` where quotation_to = 'Lead' and party_name = %(lead)s)
 				union
 					(select name, lead from `tabIssue` where lead = %(lead)s and status!='Closed')
 				union
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
index d4b55e8..457e976 100644
--- a/erpnext/demo/user/sales.py
+++ b/erpnext/demo/user/sales.py
@@ -65,7 +65,7 @@
 def make_opportunity(domain):
 	b = frappe.get_doc({
 		"doctype": "Opportunity",
-		"enquiry_from": "Customer",
+		"opportunity_from": "Customer",
 		"customer": get_random("Customer"),
 		"opportunity_type": "Sales",
 		"with_items": 1,
@@ -108,7 +108,7 @@
 			"creation": frappe.flags.current_date,
 			"doctype": "Quotation",
 			"quotation_to": "Customer",
-			"customer": customer,
+			"party_name": customer,
 			"currency": party_account_currency or company_currency,
 			"conversion_rate": exchange_rate,
 			"order_type": "Sales",
diff --git a/erpnext/education/doctype/question/question.py b/erpnext/education/doctype/question/question.py
index b822108..9a973c7 100644
--- a/erpnext/education/doctype/question/question.py
+++ b/erpnext/education/doctype/question/question.py
@@ -38,7 +38,7 @@
 		options = self.options
 		answers = [item.name for item in options if item.is_correct == True]
 		if len(answers) == 0:
-			frappe.throw("No correct answer is set for {0}".format(self.name))
+			frappe.throw(_("No correct answer is set for {0}".format(self.name)))
 			return None
 		elif len(answers) == 1:
 			return answers[0]
diff --git a/erpnext/education/doctype/quiz/quiz.py b/erpnext/education/doctype/quiz/quiz.py
index 8e54745..ae1cb6c 100644
--- a/erpnext/education/doctype/quiz/quiz.py
+++ b/erpnext/education/doctype/quiz/quiz.py
@@ -4,12 +4,13 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.model.document import Document
 
 class Quiz(Document):
 	def validate(self):
 		if self.passing_score > 100:
-			frappe.throw("Passing Score value should be between 0 and 100")
+			frappe.throw(_("Passing Score value should be between 0 and 100"))
 
 	def allowed_attempt(self, enrollment, quiz_name):
 		if self.max_attempts ==  0:
@@ -17,7 +18,7 @@
 
 		try:
 			if len(frappe.get_all("Quiz Activity", {'enrollment': enrollment.name, 'quiz': quiz_name})) >= self.max_attempts:
-				frappe.msgprint("Maximum attempts for this quiz reached!")
+				frappe.msgprint(_("Maximum attempts for this quiz reached!"))
 				return False
 			else:
 				return True
@@ -56,5 +57,5 @@
 		else:
 			return False
 	except TypeError:
-		frappe.throw("Compare List function takes on list arguments")
+		frappe.throw(_("Compare List function takes on list arguments"))
 
diff --git a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
index f997975..16933dc 100644
--- a/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
+++ b/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.py
@@ -4,6 +4,7 @@
 
 from __future__ import unicode_literals
 import frappe, json
+from frappe import _
 from frappe.model.document import Document
 from erpnext.education.api import get_grade
 from frappe.utils.pdf import get_pdf
@@ -79,7 +80,7 @@
 		from_date, to_date = frappe.db.get_value("Academic Term", academic_term, ["term_start_date", "term_end_date"])
 	if from_date and to_date:
 		attendance = dict(frappe.db.sql('''select status, count(student) as no_of_days
-			from `tabStudent Attendance` where student = %s 
+			from `tabStudent Attendance` where student = %s
 			and date between %s and %s group by status''',
 			(student, from_date, to_date)))
 		if "Absent" not in attendance.keys():
@@ -88,4 +89,4 @@
 			attendance["Present"] = 0
 		return attendance
 	else:
-		frappe.throw("Provide the academic year and set the starting and ending date.") 
\ No newline at end of file
+		frappe.throw(_("Provide the academic year and set the starting and ending date."))
\ No newline at end of file
diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py
index 8cd5bbb..e0b278c 100644
--- a/erpnext/education/utils.py
+++ b/erpnext/education/utils.py
@@ -148,7 +148,7 @@
 		# Check if self enrollment in allowed
 		program = frappe.get_doc('Program', program_name)
 		if not program.allow_self_enroll:
-			return frappe.throw("You are not allowed to enroll for this course")
+			return frappe.throw(_("You are not allowed to enroll for this course"))
 
 		student = get_current_student()
 		if not student:
@@ -162,7 +162,7 @@
 	# Check if self enrollment in allowed
 	program = frappe.get_doc('Program', program_name)
 	if not program.allow_self_enroll:
-		return frappe.throw("You are not allowed to enroll for this course")
+		return frappe.throw(_("You are not allowed to enroll for this course"))
 
 	# Enroll in program
 	program_enrollment = student.enroll_in_program(program_name)
@@ -185,7 +185,7 @@
 
 	student = get_current_student()
 	if not student:
-		return frappe.throw("Student with email {0} does not exist".format(frappe.session.user), frappe.DoesNotExistError)
+		return frappe.throw(_("Student with email {0} does not exist".format(frappe.session.user)), frappe.DoesNotExistError)
 
 	enrollment = get_or_create_course_enrollment(course, program)
 	if content_type == 'Quiz':
@@ -220,7 +220,7 @@
 		quiz = frappe.get_doc("Quiz", quiz_name)
 		questions = quiz.get_questions()
 	except:
-		frappe.throw("Quiz {0} does not exist".format(quiz_name))
+		frappe.throw(_("Quiz {0} does not exist".format(quiz_name)))
 		return None
 
 	questions = [{
@@ -347,7 +347,7 @@
 	if not course_enrollment:
 		program_enrollment = get_enrollment('program', program, student.name)
 		if not program_enrollment:
-			frappe.throw("You are not enrolled in program {0}".format(program))
+			frappe.throw(_("You are not enrolled in program {0}".format(program)))
 			return
 		return student.enroll_in_course(course_name=course, program_enrollment=get_enrollment('program', program, student.name))
 	else:
diff --git a/erpnext/erpnext_integrations/connectors/shopify_connection.py b/erpnext/erpnext_integrations/connectors/shopify_connection.py
index 88078ab..1d6e891 100644
--- a/erpnext/erpnext_integrations/connectors/shopify_connection.py
+++ b/erpnext/erpnext_integrations/connectors/shopify_connection.py
@@ -124,7 +124,7 @@
 
 	else:
 		so = frappe.get_doc("Sales Order", so)
-	
+
 	frappe.db.commit()
 	return so
 
@@ -252,6 +252,6 @@
 		{"parent": "Shopify Settings", "shopify_tax": tax_title}, "tax_account")
 
 	if not tax_account:
-		frappe.throw("Tax Account not specified for Shopify Tax {0}".format(tax.get("title")))
+		frappe.throw(_("Tax Account not specified for Shopify Tax {0}".format(tax.get("title"))))
 
 	return tax_account
diff --git a/erpnext/erpnext_integrations/doctype/exotel_settings/__init__.py b/erpnext/erpnext_integrations/doctype/exotel_settings/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/exotel_settings/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.json b/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.json
new file mode 100644
index 0000000..72f47b5
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.json
@@ -0,0 +1,61 @@
+{
+ "creation": "2019-05-21 07:41:53.536536",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "enabled",
+  "section_break_2",
+  "account_sid",
+  "api_key",
+  "api_token"
+ ],
+ "fields": [
+  {
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "account_sid",
+   "fieldtype": "Data",
+   "label": "Account SID"
+  },
+  {
+   "fieldname": "api_token",
+   "fieldtype": "Data",
+   "label": "API Token"
+  },
+  {
+   "fieldname": "api_key",
+   "fieldtype": "Data",
+   "label": "API Key"
+  }
+ ],
+ "issingle": 1,
+ "modified": "2019-05-22 06:25:18.026997",
+ "modified_by": "Administrator",
+ "module": "ERPNext Integrations",
+ "name": "Exotel Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py b/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py
new file mode 100644
index 0000000..77de84c
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/exotel_settings/exotel_settings.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+import requests
+import frappe
+from frappe import _
+
+class ExotelSettings(Document):
+	def validate(self):
+		self.verify_credentials()
+
+	def verify_credentials(self):
+		if self.enabled:
+			response = requests.get('https://api.exotel.com/v1/Accounts/{sid}'
+				.format(sid = self.account_sid), auth=(self.api_key, self.api_token))
+			if response.status_code != 200:
+				frappe.throw(_("Invalid credentials"))
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/__init__.py b/erpnext/erpnext_integrations/doctype/plaid_settings/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
new file mode 100644
index 0000000..fbb0ebc
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+import requests
+from plaid import Client
+from plaid.errors import APIError, ItemError
+
+class PlaidConnector():
+	def __init__(self, access_token=None):
+
+		if not(frappe.conf.get("plaid_client_id") and frappe.conf.get("plaid_secret") and frappe.conf.get("plaid_public_key")):
+			frappe.throw(_("Please complete your Plaid API configuration before synchronizing your account"))
+
+		self.config = {
+			"plaid_client_id": frappe.conf.get("plaid_client_id"),
+			"plaid_secret": frappe.conf.get("plaid_secret"),
+			"plaid_public_key": frappe.conf.get("plaid_public_key"),
+			"plaid_env": frappe.conf.get("plaid_env")
+		}
+
+		self.client = Client(client_id=self.config["plaid_client_id"],
+			secret=self.config["plaid_secret"],
+			public_key=self.config["plaid_public_key"],
+			environment=self.config["plaid_env"]
+		)
+
+		self.access_token = access_token
+
+	def get_access_token(self, public_token):
+		if public_token is None:
+			frappe.log_error(_("Public token is missing for this bank"), _("Plaid public token error"))
+
+		response = self.client.Item.public_token.exchange(public_token)
+		access_token = response['access_token']
+
+		return access_token
+
+	def auth(self):
+		try:
+			self.client.Auth.get(self.access_token)
+			print("Authentication successful.....")
+		except ItemError as e:
+			if e.code == 'ITEM_LOGIN_REQUIRED':
+				pass
+			else:
+				pass
+		except APIError as e:
+			if e.code == 'PLANNED_MAINTENANCE':
+				pass
+			else:
+				pass
+		except requests.Timeout:
+			pass
+		except Exception as e:
+			print(e)
+			frappe.log_error(frappe.get_traceback(), _("Plaid authentication error"))
+			frappe.msgprint({"title": _("Authentication Failed"), "message":e, "raise_exception":1, "indicator":'red'})
+
+	def get_transactions(self, start_date, end_date, account_id=None):
+		try:
+			self.auth()
+			if account_id:
+				account_ids = [account_id]
+
+				response = self.client.Transactions.get(self.access_token, start_date=start_date, end_date=end_date, account_ids=account_ids)
+
+			else:
+				response = self.client.Transactions.get(self.access_token, start_date=start_date, end_date=end_date)
+
+			transactions = response['transactions']
+
+			while len(transactions) < response['total_transactions']:
+				response = self.client.Transactions.get(self.access_token, start_date=start_date, end_date=end_date, offset=len(transactions))
+				transactions.extend(response['transactions'])
+			return transactions
+		except Exception:
+			frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error"))
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
new file mode 100644
index 0000000..ace4fbf
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
@@ -0,0 +1,107 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide("erpnext.integrations");
+
+frappe.ui.form.on('Plaid Settings', {
+	link_new_account: function(frm) {
+		new erpnext.integrations.plaidLink(frm);
+	}
+});
+
+erpnext.integrations.plaidLink = class plaidLink {
+	constructor(parent) {
+		this.frm = parent;
+		this.product = ["transactions", "auth"];
+		this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
+		this.init_config();
+	}
+
+	init_config() {
+		const me = this;
+		frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.plaid_configuration')
+			.then(result => {
+				if (result !== "disabled") {
+					if (result.plaid_env == undefined || result.plaid_public_key == undefined) {
+						frappe.throw(__("Please add valid Plaid api keys in site_config.json first"));
+					}
+					me.plaid_env = result.plaid_env;
+					me.plaid_public_key = result.plaid_public_key;
+					me.client_name = result.client_name;
+					me.init_plaid();
+				} else {
+					frappe.throw(__("Please save your document before adding a new account"));
+				}
+			});
+	}
+
+	init_plaid() {
+		const me = this;
+		me.loadScript(me.plaidUrl)
+			.then(() => {
+				me.onScriptLoaded(me);
+			})
+			.then(() => {
+				if (me.linkHandler) {
+					me.linkHandler.open();
+				}
+			})
+			.catch((error) => {
+				me.onScriptError(error);
+			});
+	}
+
+	loadScript(src) {
+		return new Promise(function (resolve, reject) {
+			if (document.querySelector('script[src="' + src + '"]')) {
+				resolve();
+				return;
+			}
+			const el = document.createElement('script');
+			el.type = 'text/javascript';
+			el.async = true;
+			el.src = src;
+			el.addEventListener('load', resolve);
+			el.addEventListener('error', reject);
+			el.addEventListener('abort', reject);
+			document.head.appendChild(el);
+		});
+	}
+
+	onScriptLoaded(me) {
+		me.linkHandler = window.Plaid.create({
+			clientName: me.client_name,
+			env: me.plaid_env,
+			key: me.plaid_public_key,
+			onSuccess: me.plaid_success,
+			product: me.product
+		});
+	}
+
+	onScriptError(error) {
+		frappe.msgprint('There was an issue loading the link-initialize.js script');
+		frappe.msgprint(error);
+	}
+
+	plaid_success(token, response) {
+		const me = this;
+
+		frappe.prompt({
+			fieldtype:"Link",
+			options: "Company",
+			label:__("Company"),
+			fieldname:"company",
+			reqd:1
+		}, (data) => {
+			me.company = data.company;
+			frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_institution', {token: token, response: response})
+				.then((result) => {
+					frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_bank_accounts', {response: response,
+						bank: result, company: me.company});
+				})
+				.then(() => {
+					frappe.show_alert({message:__("Bank accounts added"), indicator:'green'});
+				});
+		}, __("Select a company"), __("Continue"));
+	}
+};
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
new file mode 100644
index 0000000..ed51c4e
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
@@ -0,0 +1,161 @@
+{
+ "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "beta": 0, 
+ "creation": "2018-10-25 10:02:48.656165", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
+ "fields": [
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "enabled", 
+   "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": "Enabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:doc.enabled==1", 
+   "fieldname": "automatic_sync", 
+   "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": "Synchronize all accounts every hour", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:(doc.enabled==1)&&(!doc.__islocal)", 
+   "fieldname": "link_new_account", 
+   "fieldtype": "Button", 
+   "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": "Link a new bank account", 
+   "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
+  }
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 0, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 1, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-12-14 12:51:12.331395", 
+ "modified_by": "Administrator", 
+ "module": "ERPNext Integrations", 
+ "name": "Plaid Settings", 
+ "name_case": "", 
+ "owner": "Administrator", 
+ "permissions": [
+  {
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 0, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
+   "write": 1
+  }
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_field": "modified", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0, 
+ "track_views": 0
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
new file mode 100644
index 0000000..8d31e24
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe import _
+from frappe.model.document import Document
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+from erpnext.erpnext_integrations.doctype.plaid_settings.plaid_connector import PlaidConnector
+from frappe.utils import getdate, formatdate, today, add_months
+
+class PlaidSettings(Document):
+	pass
+
+@frappe.whitelist()
+def plaid_configuration():
+	if frappe.db.get_value("Plaid Settings", None, "enabled") == "1":
+		return {"plaid_public_key": frappe.conf.get("plaid_public_key") or None, "plaid_env": frappe.conf.get("plaid_env") or None, "client_name": frappe.local.site }
+	else:
+		return "disabled"
+
+@frappe.whitelist()
+def add_institution(token, response):
+	response = json.loads(response)
+
+	plaid = PlaidConnector()
+	access_token = plaid.get_access_token(token)
+
+	if not frappe.db.exists("Bank", response["institution"]["name"]):
+		try:
+			bank = frappe.get_doc({
+				"doctype": "Bank",
+				"bank_name": response["institution"]["name"],
+				"plaid_access_token": access_token
+			})
+			bank.insert()
+		except Exception:
+			frappe.throw(frappe.get_traceback())
+
+	else:
+		bank = frappe.get_doc("Bank", response["institution"]["name"])
+		bank.plaid_access_token = access_token
+		bank.save()
+
+	return bank
+
+@frappe.whitelist()
+def add_bank_accounts(response, bank, company):
+	response = json.loads(response) if not "accounts" in response else response
+	bank = json.loads(bank)
+	result = []
+
+	default_gl_account = get_default_bank_cash_account(company, "Bank")
+	if not default_gl_account:
+		frappe.throw(_("Please setup a default bank account for company {0}".format(company)))
+
+	for account in response["accounts"]:
+		acc_type = frappe.db.get_value("Account Type", account["type"])
+		if not acc_type:
+			add_account_type(account["type"])
+
+		acc_subtype = frappe.db.get_value("Account Subtype", account["subtype"])
+		if not acc_subtype:
+			add_account_subtype(account["subtype"])
+
+		if not frappe.db.exists("Bank Account", dict(integration_id=account["id"])):
+			try:
+				new_account = frappe.get_doc({
+					"doctype": "Bank Account",
+					"bank": bank["bank_name"],
+					"account": default_gl_account.account,
+					"account_name": account["name"],
+					"account_type": account["type"] or "",
+					"account_subtype": account["subtype"] or "",
+					"mask": account["mask"] or "",
+					"integration_id": account["id"],
+					"is_company_account": 1,
+					"company": company
+				})
+				new_account.insert()
+
+				result.append(new_account.name)
+
+			except frappe.UniqueValidationError:
+				frappe.msgprint(_("Bank account {0} already exists and could not be created again").format(new_account.account_name))
+			except Exception:
+				frappe.throw(frappe.get_traceback())
+
+		else:
+			result.append(frappe.db.get_value("Bank Account", dict(integration_id=account["id"]), "name"))
+
+	return result
+
+def add_account_type(account_type):
+	try:
+		frappe.get_doc({
+			"doctype": "Account Type",
+			"account_type": account_type
+		}).insert()
+	except Exception:
+		frappe.throw(frappe.get_traceback())
+
+
+def add_account_subtype(account_subtype):
+	try:
+		frappe.get_doc({
+			"doctype": "Account Subtype",
+			"account_subtype": account_subtype
+		}).insert()
+	except Exception:
+		frappe.throw(frappe.get_traceback())
+
+@frappe.whitelist()
+def sync_transactions(bank, bank_account):
+
+	last_sync_date = frappe.db.get_value("Bank Account", bank_account, "last_integration_date")
+	if last_sync_date:
+		start_date = formatdate(last_sync_date, "YYYY-MM-dd")
+	else:
+		start_date = formatdate(add_months(today(), -12), "YYYY-MM-dd")
+	end_date = formatdate(today(), "YYYY-MM-dd")
+
+	try:
+		transactions = get_transactions(bank=bank, bank_account=bank_account, start_date=start_date, end_date=end_date)
+		result = []
+		if transactions:
+			for transaction in transactions:
+				result.append(new_bank_transaction(transaction))
+
+		frappe.db.set_value("Bank Account", bank_account, "last_integration_date", getdate(end_date))
+
+		return result
+	except Exception:
+		frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error"))
+
+def get_transactions(bank, bank_account=None, start_date=None, end_date=None):
+	access_token = None
+
+	if bank_account:
+		related_bank = frappe.db.get_values("Bank Account", bank_account, ["bank", "integration_id"], as_dict=True)
+		access_token = frappe.db.get_value("Bank", related_bank[0].bank, "plaid_access_token")
+		account_id = related_bank[0].integration_id
+
+	else:
+		access_token = frappe.db.get_value("Bank", bank, "plaid_access_token")
+		account_id = None
+
+	plaid = PlaidConnector(access_token)
+	transactions = plaid.get_transactions(start_date=start_date, end_date=end_date, account_id=account_id)
+
+	return transactions
+
+def new_bank_transaction(transaction):
+	result = []
+
+	bank_account = frappe.db.get_value("Bank Account", dict(integration_id=transaction["account_id"]))
+
+	if float(transaction["amount"]) >= 0:
+		debit = float(transaction["amount"])
+		credit = 0
+	else:
+		debit = 0
+		credit = abs(float(transaction["amount"]))
+
+	status = "Pending" if transaction["pending"] == "True" else "Settled"
+
+	if not frappe.db.exists("Bank Transaction", dict(transaction_id=transaction["transaction_id"])):
+		try:
+			new_transaction = frappe.get_doc({
+				"doctype": "Bank Transaction",
+				"date": getdate(transaction["date"]),
+				"status": status,
+				"bank_account": bank_account,
+				"debit": debit,
+				"credit": credit,
+				"currency": transaction["iso_currency_code"],
+				"description": transaction["name"]
+			})
+			new_transaction.insert()
+			new_transaction.submit()
+
+			result.append(new_transaction.name)
+
+		except Exception:
+			frappe.throw(frappe.get_traceback())
+
+	return result
+
+def automatic_synchronization():
+	settings = frappe.get_doc("Plaid Settings", "Plaid Settings")
+
+	if settings.enabled == 1 and settings.automatic_sync == 1:
+		plaid_accounts = frappe.get_all("Bank Account", filter={"integration_id": ["!=", ""]}, fields=["name", "bank"])
+
+		for plaid_account in plaid_accounts:
+			frappe.enqueue("erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.sync_transactions", bank=plaid_account.bank, bank_account=plaid_account.name)
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.js
new file mode 100644
index 0000000..dc91347
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Plaid Settings", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Plaid Settings
+		() => frappe.tests.make('Plaid Settings', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
new file mode 100644
index 0000000..29e8fa4
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+import frappe
+from erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings import plaid_configuration, add_account_type, add_account_subtype, new_bank_transaction, add_bank_accounts
+import json
+from frappe.utils.response import json_handler
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+
+class TestPlaidSettings(unittest.TestCase):
+	def setUp(self):
+		pass
+
+	def tearDown(self):
+		for bt in frappe.get_all("Bank Transaction"):
+			doc = frappe.get_doc("Bank Transaction", bt.name)
+			doc.cancel()
+			doc.delete()
+
+		for ba in frappe.get_all("Bank Account"):
+			frappe.get_doc("Bank Account", ba.name).delete()
+
+		for at in frappe.get_all("Account Type"):
+			frappe.get_doc("Account Type", at.name).delete()
+
+		for ast in frappe.get_all("Account Subtype"):
+			frappe.get_doc("Account Subtype", ast.name).delete()
+
+	def test_plaid_disabled(self):
+		frappe.db.set_value("Plaid Settings", None, "enabled", 0)
+		self.assertTrue(plaid_configuration() == "disabled")
+
+	def test_add_account_type(self):
+		add_account_type("brokerage")
+		self.assertEqual(frappe.get_doc("Account Type", "brokerage").name, "brokerage")
+
+	def test_add_account_subtype(self):
+		add_account_subtype("loan")
+		self.assertEqual(frappe.get_doc("Account Subtype", "loan").name, "loan")
+
+	def test_default_bank_account(self):
+		if not frappe.db.exists("Bank", "Citi"):
+			frappe.get_doc({
+				"doctype": "Bank",
+				"bank_name": "Citi"
+			}).insert()
+
+		bank_accounts = {
+			'account': {
+				'subtype': 'checking',
+				'mask': '0000',
+				'type': 'depository',
+				'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+				'name': 'Plaid Checking'
+			},
+			'account_id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+			'link_session_id': 'db673d75-61aa-442a-864f-9b3f174f3725',
+			'accounts': [{
+				'type': 'depository',
+				'subtype': 'checking',
+				'mask': '0000',
+				'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+				'name': 'Plaid Checking'
+				}],
+			'institution': {
+				'institution_id': 'ins_6',
+				'name': 'Citi'
+			}
+		}
+
+		bank = json.dumps(frappe.get_doc("Bank", "Citi").as_dict(), default=json_handler)
+		company = frappe.db.get_single_value('Global Defaults', 'default_company')
+		frappe.db.set_value("Company", company, "default_bank_account", None)
+
+		self.assertRaises(frappe.ValidationError, add_bank_accounts, response=bank_accounts, bank=bank, company=company)
+
+	def test_new_transaction(self):
+		if not frappe.db.exists("Bank", "Citi"):
+			frappe.get_doc({
+				"doctype": "Bank",
+				"bank_name": "Citi"
+			}).insert()
+
+		bank_accounts = {
+			'account': {
+				'subtype': 'checking',
+				'mask': '0000',
+				'type': 'depository',
+				'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+				'name': 'Plaid Checking'
+			},
+			'account_id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+			'link_session_id': 'db673d75-61aa-442a-864f-9b3f174f3725',
+			'accounts': [{
+				'type': 'depository',
+				'subtype': 'checking',
+				'mask': '0000',
+				'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+				'name': 'Plaid Checking'
+				}],
+			'institution': {
+				'institution_id': 'ins_6',
+				'name': 'Citi'
+			}
+		}
+
+		bank = json.dumps(frappe.get_doc("Bank", "Citi").as_dict(), default=json_handler)
+		company = frappe.db.get_single_value('Global Defaults', 'default_company')
+
+		if frappe.db.get_value("Company", company, "default_bank_account") is None:
+			frappe.db.set_value("Company", company, "default_bank_account", get_default_bank_cash_account(company, "Cash").get("account"))
+
+		add_bank_accounts(bank_accounts, bank, company)
+
+		transactions = {
+			'account_owner': None,
+			'category': ['Food and Drink', 'Restaurants'],
+			'account_id': 'b4Jkp1LJDZiPgojpr1ansXJrj5Q6w9fVmv6ov',
+			'pending_transaction_id': None,
+			'transaction_id': 'x374xPa7DvUewqlR5mjNIeGK8r8rl3Sn647LM',
+			'unofficial_currency_code': None,
+			'name': 'INTRST PYMNT',
+			'transaction_type': 'place',
+			'amount': -4.22,
+			'location': {
+				'city': None,
+				'zip': None,
+				'store_number': None,
+				'lon': None,
+				'state': None,
+				'address': None,
+				'lat': None
+			},
+			'payment_meta': {
+				'reference_number': None,
+				'payer': None,
+				'payment_method': None,
+				'reason': None,
+				'payee': None,
+				'ppd_id': None,
+				'payment_processor': None,
+				'by_order_of': None
+			},
+			'date': '2017-12-22',
+			'category_id': '13005000',
+			'pending': False,
+			'iso_currency_code': 'USD'
+		}
+
+		new_bank_transaction(transactions)
+
+		self.assertTrue(len(frappe.get_all("Bank Transaction")) == 1)
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/exotel_integration.py b/erpnext/erpnext_integrations/exotel_integration.py
new file mode 100644
index 0000000..c04cedc
--- /dev/null
+++ b/erpnext/erpnext_integrations/exotel_integration.py
@@ -0,0 +1,101 @@
+import frappe
+import requests
+
+# api/method/erpnext.erpnext_integrations.exotel_integration.handle_incoming_call
+# api/method/erpnext.erpnext_integrations.exotel_integration.handle_end_call
+# api/method/erpnext.erpnext_integrations.exotel_integration.handle_missed_call
+
+@frappe.whitelist(allow_guest=True)
+def handle_incoming_call(**kwargs):
+	exotel_settings = get_exotel_settings()
+	if not exotel_settings.enabled: return
+
+	call_payload = kwargs
+	status = call_payload.get('Status')
+	if status == 'free':
+		return
+
+	call_log = get_call_log(call_payload)
+	if not call_log:
+		create_call_log(call_payload)
+
+@frappe.whitelist(allow_guest=True)
+def handle_end_call(**kwargs):
+	update_call_log(kwargs, 'Completed')
+
+@frappe.whitelist(allow_guest=True)
+def handle_missed_call(**kwargs):
+	update_call_log(kwargs, 'Missed')
+
+def update_call_log(call_payload, status):
+	call_log = get_call_log(call_payload)
+	if call_log:
+		call_log.status = status
+		call_log.duration = call_payload.get('DialCallDuration') or 0
+		call_log.recording_url = call_payload.get('RecordingUrl')
+		call_log.save(ignore_permissions=True)
+		frappe.db.commit()
+		return call_log
+
+def get_call_log(call_payload):
+	call_log = frappe.get_all('Call Log', {
+		'id': call_payload.get('CallSid'),
+	}, limit=1)
+
+	if call_log:
+		return frappe.get_doc('Call Log', call_log[0].name)
+
+def create_call_log(call_payload):
+	call_log = frappe.new_doc('Call Log')
+	call_log.id = call_payload.get('CallSid')
+	call_log.to = call_payload.get('CallTo')
+	call_log.medium = call_payload.get('To')
+	call_log.status = 'Ringing'
+	setattr(call_log, 'from', call_payload.get('CallFrom'))
+	call_log.save(ignore_permissions=True)
+	frappe.db.commit()
+	return call_log
+
+@frappe.whitelist()
+def get_call_status(call_id):
+	endpoint = get_exotel_endpoint('Calls/{call_id}.json'.format(call_id=call_id))
+	response = requests.get(endpoint)
+	status = response.json().get('Call', {}).get('Status')
+	return status
+
+@frappe.whitelist()
+def make_a_call(from_number, to_number, caller_id):
+	endpoint = get_exotel_endpoint('Calls/connect.json?details=true')
+	response = requests.post(endpoint, data={
+		'From': from_number,
+		'To': to_number,
+		'CallerId': caller_id
+	})
+
+	return response.json()
+
+def get_exotel_settings():
+	return frappe.get_single('Exotel Settings')
+
+def whitelist_numbers(numbers, caller_id):
+	endpoint = get_exotel_endpoint('CustomerWhitelist')
+	response = requests.post(endpoint, data={
+		'VirtualNumber': caller_id,
+		'Number': numbers,
+	})
+
+	return response
+
+def get_all_exophones():
+	endpoint = get_exotel_endpoint('IncomingPhoneNumbers')
+	response = requests.post(endpoint)
+	return response
+
+def get_exotel_endpoint(action):
+	settings = get_exotel_settings()
+	return 'https://{api_key}:{api_token}@api.exotel.com/v1/Accounts/{sid}/{action}'.format(
+		api_key=settings.api_key,
+		api_token=settings.api_token,
+		sid=settings.account_sid,
+		action=action
+	)
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
index 90bf957..141329b 100644
--- a/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
+++ b/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.py
@@ -30,7 +30,7 @@
 			try:
 				frappe.delete_doc("Item",self.item)
 			except Exception:
-				frappe.throw("""Not permitted. Please disable the Procedure Template""")
+				frappe.throw(_("""Not permitted. Please disable the Procedure Template"""))
 
 	def get_item_details(self, args=None):
 		item = frappe.db.sql("""select stock_uom, item_name
diff --git a/erpnext/healthcare/doctype/patient/patient.js b/erpnext/healthcare/doctype/patient/patient.js
index de5bce0..1692814 100644
--- a/erpnext/healthcare/doctype/patient/patient.js
+++ b/erpnext/healthcare/doctype/patient/patient.js
@@ -123,13 +123,13 @@
 
 frappe.ui.form.on('Patient Relation', {
 	patient_relation_add: function(frm){
-		frm.fields_dict['patient_relation'].grid.get_field('patient').get_query = function(frm){
+		frm.fields_dict['patient_relation'].grid.get_field('patient').get_query = function(doc){
 			var patient_list = [];
-			if(!frm.doc.__islocal) patient_list.push(frm.doc.name);
-			$.each(frm.doc.patient_relation, function(idx, val){
+			if(!doc.__islocal) patient_list.push(doc.name);
+			$.each(doc.patient_relation, function(idx, val){
 				if (val.patient) patient_list.push(val.patient);
 			});
 			return { filters: [['Patient', 'name', 'not in', patient_list]] };
 		};
 	}
-});
\ No newline at end of file
+});
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index 2f328de..b3cbd1f 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -298,7 +298,7 @@
 		});
 	}
 	else{
-		frappe.msgprint("Please select Patient to get prescribed procedure");
+		frappe.msgprint(__("Please select Patient to get prescribed procedure"));
 	}
 };
 
diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
index c7df5b7..7ea4568 100644
--- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
+++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
@@ -160,7 +160,7 @@
 
 var btn_create_procedure = function (frm) {
 	if(!frm.doc.patient){
-		frappe.throw("Please select patient");
+		frappe.throw(__("Please select patient"));
 	}
 	frappe.route_options = {
 		"patient": frm.doc.patient,
diff --git a/erpnext/healthcare/utils.py b/erpnext/healthcare/utils.py
index 0987eb5..6a226d9 100644
--- a/erpnext/healthcare/utils.py
+++ b/erpnext/healthcare/utils.py
@@ -82,7 +82,7 @@
 						'service': service_item, 'rate': practitioner_charge,
 						'income_account': income_account})
 
-			lab_tests = frappe.get_list("Lab Test", {'patient': patient.name, 'invoiced': False})
+			lab_tests = frappe.get_list("Lab Test", {'patient': patient.name, 'invoiced': False, 'docstatus': 1})
 			if lab_tests:
 				for lab_test in lab_tests:
 					lab_test_obj = frappe.get_doc("Lab Test", lab_test['name'])
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 6ce75bb..d814700 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -169,6 +169,11 @@
 	{'role': 'Student', 'doctype':'Student', 'email_field': 'student_email_id'},
 ]
 
+sounds = [
+	{"name": "incoming-call", "src": "/assets/erpnext/sounds/incoming-call.mp3", "volume": 0.2},
+	{"name": "call-disconnect", "src": "/assets/erpnext/sounds/call-disconnect.mp3", "volume": 0.2},
+]
+
 has_website_permission = {
 	"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
@@ -240,6 +245,7 @@
 		"erpnext.accounts.doctype.subscription.subscription.process_all",
 		"erpnext.erpnext_integrations.doctype.amazon_mws_settings.amazon_mws_settings.schedule_get_order_details",
 		"erpnext.accounts.doctype.gl_entry.gl_entry.rename_gle_sle_docs",
+		"erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.automatic_synchronization",
 		"erpnext.projects.doctype.project.project.hourly_reminder",
 		"erpnext.projects.doctype.project.project.collect_project_status",
 		"erpnext.hr.doctype.shift_type.shift_type.process_auto_attendance_for_all_shifts",
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 63ba573..af87f85 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -78,7 +78,15 @@
 
 	def update_user_permissions(self):
 		if not self.create_user_permission: return
-		if not has_permission('User Permission', ptype='write'): return
+		if not has_permission('User Permission', ptype='write', raise_exception=False): return
+
+		employee_user_permission_exists = frappe.db.exists('User Permission', {
+			'allow': 'Employee',
+			'for_value': self.name,
+			'user': self.user_id
+		})
+
+		if employee_user_permission_exists: return
 
 		employee_user_permission_exists = frappe.db.exists('User Permission', {
 			'allow': 'Employee',
@@ -237,7 +245,7 @@
 def update_user_permissions(doc, method):
 	# called via User hook
 	if "Employee" in [d.role for d in doc.get("roles")]:
-		if not has_permission('User Permission', ptype='write'): return
+		if not has_permission('User Permission', ptype='write', raise_exception=False): return
 		employee = frappe.get_doc("Employee", {"user_id": doc.name})
 		employee.update_user_permissions()
 
diff --git a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py
index 3a80b30..abb82f2 100644
--- a/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py
+++ b/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py
@@ -84,7 +84,7 @@
 			pay_against_benefit_claim, max_benefit_amount = frappe.db.get_value("Salary Component", sal_struct_row.salary_component, ["pay_against_benefit_claim", "max_benefit_amount"])
 		except TypeError:
 			# show the error in tests?
-			frappe.throw("Unable to find Salary Component {0}".format(sal_struct_row.salary_component))
+			frappe.throw(_("Unable to find Salary Component {0}".format(sal_struct_row.salary_component)))
 		if sal_struct_row.is_flexible_benefit == 1 and pay_against_benefit_claim != 1:
 			total_pro_rata_max += max_benefit_amount
 	if total_pro_rata_max > 0:
diff --git a/erpnext/hr/doctype/employee_group_table/employee_group_table.json b/erpnext/hr/doctype/employee_group_table/employee_group_table.json
index f2e7770..4e0045c 100644
--- a/erpnext/hr/doctype/employee_group_table/employee_group_table.json
+++ b/erpnext/hr/doctype/employee_group_table/employee_group_table.json
@@ -1,109 +1,45 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-11-19 12:39:46.153061", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "creation": "2018-11-19 12:39:46.153061",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "employee",
+  "employee_name",
+  "user_id"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee", 
-   "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": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "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": "employee",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Employee",
+   "options": "Employee"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "employee.first_name", 
-   "fieldname": "employee_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": "Employee 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fetch_from": "employee.first_name",
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Employee Name"
+  },
+  {
+   "fetch_from": "employee.user_id",
+   "fieldname": "user_id",
+   "fieldtype": "Data",
+   "label": "ERPNext User ID",
+   "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": 1, 
- "max_attachments": 0, 
- "modified": "2018-11-19 13:18:17.281656", 
- "modified_by": "Administrator", 
- "module": "HR", 
- "name": "Employee Group Table", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "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
+ ],
+ "istable": 1,
+ "modified": "2019-06-06 10:41:20.313756",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Employee Group Table",
+ "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/hr/doctype/employee_onboarding/test_employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
index b7085fa..5e7f276 100644
--- a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
+++ b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
@@ -39,6 +39,7 @@
 
 		# complete the task
 		project = frappe.get_doc('Project', onboarding.project)
+		project.load_tasks()
 		project.tasks[0].status = 'Completed'
 		project.save()
 
diff --git a/erpnext/hr/doctype/employee_separation/test_employee_separation.py b/erpnext/hr/doctype/employee_separation/test_employee_separation.py
index 4c3e566..2fa114d 100644
--- a/erpnext/hr/doctype/employee_separation/test_employee_separation.py
+++ b/erpnext/hr/doctype/employee_separation/test_employee_separation.py
@@ -10,9 +10,9 @@
 
 class TestEmployeeSeparation(unittest.TestCase):
 	def test_employee_separation(self):
-		employee = get_employee()
+		employee = frappe.db.get_value("Employee", {"status": "Active"})
 		separation = frappe.new_doc('Employee Separation')
-		separation.employee = employee.name
+		separation.employee = employee
 		separation.company = '_Test Company'
 		separation.append('activities', {
 			'activity_name': 'Deactivate Employee',
@@ -23,7 +23,4 @@
 		separation.submit()
 		self.assertEqual(separation.docstatus, 1)
 		separation.cancel()
-		self.assertEqual(separation.project, "")
-
-def get_employee():
-	return frappe.get_doc('Employee', {'employee_name': 'Test Researcher'})
\ No newline at end of file
+		self.assertEqual(separation.project, "")
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index f0bc268..4e2778f 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -1,429 +1,435 @@
 {
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-01-10 16:34:14",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
-  "naming_series",
-  "employee",
-  "employee_name",
-  "department",
-  "column_break_5",
-  "expense_approver",
-  "approval_status",
-  "is_paid",
-  "expense_details",
-  "expenses",
-  "sb1",
-  "taxes",
-  "transactions_section",
-  "total_sanctioned_amount",
-  "total_taxes_and_charges",
-  "total_advance_amount",
-  "column_break_17",
-  "grand_total",
-  "total_claimed_amount",
-  "total_amount_reimbursed",
-  "section_break_16",
-  "posting_date",
-  "vehicle_log",
-  "task",
-  "cb1",
-  "remark",
-  "title",
-  "email_id",
-  "accounting_details",
-  "company",
-  "mode_of_payment",
-  "column_break_24",
-  "payable_account",
-  "accounting_dimensions_section",
-  "project",
-  "dimension_col_break",
-  "cost_center",
-  "more_details",
-  "status",
-  "amended_from",
-  "advance_payments",
-  "advances"
- ],
- "fields": [
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "options": "HR-EXP-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "fieldname": "employee",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "label": "From Employee",
-   "oldfieldname": "employee",
-   "oldfieldtype": "Link",
-   "options": "Employee",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fetch_from": "employee.employee_name",
-   "fieldname": "employee_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Employee Name",
-   "oldfieldname": "employee_name",
-   "oldfieldtype": "Data",
-   "read_only": 1,
-   "width": "150px"
-  },
-  {
-   "fetch_from": "employee.department",
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "label": "Department",
-   "options": "Department",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_5",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "expense_approver",
-   "fieldtype": "Link",
-   "label": "Expense Approver",
-   "options": "User"
-  },
-  {
-   "default": "Draft",
-   "fieldname": "approval_status",
-   "fieldtype": "Select",
-   "label": "Approval Status",
-   "no_copy": 1,
-   "options": "Draft\nApproved\nRejected",
-   "search_index": 1
-  },
-  {
-   "fieldname": "total_claimed_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Total Claimed Amount",
-   "no_copy": 1,
-   "oldfieldname": "total_claimed_amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1,
-   "width": "160px"
-  },
-  {
-   "fieldname": "total_sanctioned_amount",
-   "fieldtype": "Currency",
-   "label": "Total Sanctioned Amount",
-   "no_copy": 1,
-   "oldfieldname": "total_sanctioned_amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1,
-   "width": "160px"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:(doc.docstatus==0 || doc.is_paid)",
-   "fieldname": "is_paid",
-   "fieldtype": "Check",
-   "label": "Is Paid"
-  },
-  {
-   "fieldname": "expense_details",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break"
-  },
-  {
-   "fieldname": "expenses",
-   "fieldtype": "Table",
-   "label": "Expenses",
-   "oldfieldname": "expense_voucher_details",
-   "oldfieldtype": "Table",
-   "options": "Expense Claim Detail",
-   "reqd": 1
-  },
-  {
-   "fieldname": "sb1",
-   "fieldtype": "Section Break",
-   "options": "Simple"
-  },
-  {
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "label": "Posting Date",
-   "oldfieldname": "posting_date",
-   "oldfieldtype": "Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "vehicle_log",
-   "fieldtype": "Link",
-   "label": "Vehicle Log",
-   "options": "Vehicle Log",
-   "read_only": 1
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "task",
-   "fieldtype": "Link",
-   "label": "Task",
-   "options": "Task",
-   "remember_last_selected_value": 1
-  },
-  {
-   "fieldname": "cb1",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_amount_reimbursed",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Total Amount Reimbursed",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "remark",
-   "fieldtype": "Small Text",
-   "label": "Remark",
-   "no_copy": 1,
-   "oldfieldname": "remark",
-   "oldfieldtype": "Small Text"
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "{employee_name}",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Title",
-   "no_copy": 1
-  },
-  {
-   "fieldname": "email_id",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Employees Email Id",
-   "oldfieldname": "email_id",
-   "oldfieldtype": "Data",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "accounting_details",
-   "fieldtype": "Section Break",
-   "label": "Accounting Details"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "remember_last_selected_value": 1,
-   "reqd": 1
-  },
-  {
-   "depends_on": "is_paid",
-   "fieldname": "mode_of_payment",
-   "fieldtype": "Link",
-   "label": "Mode of Payment",
-   "options": "Mode of Payment"
-  },
-  {
-   "fieldname": "column_break_24",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "payable_account",
-   "fieldtype": "Link",
-   "label": "Payable Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "more_details",
-   "fieldtype": "Section Break",
-   "label": "More Details"
-  },
-  {
-   "default": "Draft",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Status",
-   "no_copy": 1,
-   "options": "Draft\nPaid\nUnpaid\nRejected\nSubmitted\nCancelled",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "options": "Expense Claim",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1,
-   "width": "160px"
-  },
-  {
-   "fieldname": "advance_payments",
-   "fieldtype": "Section Break",
-   "label": "Advance Payments"
-  },
-  {
-   "fieldname": "advances",
-   "fieldtype": "Table",
-   "label": "Advances",
-   "options": "Expense Claim Advance"
-  },
-  {
-   "fieldname": "total_advance_amount",
-   "fieldtype": "Currency",
-   "label": "Total Advance Amount",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "label": "Expense Taxes and Charges",
-   "options": "Expense Taxes and Charges"
-  },
-  {
-   "fieldname": "section_break_16",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "transactions_section",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "grand_total",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Grand Total",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_17",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  }
- ],
- "icon": "fa fa-money",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2019-06-13 18:05:52.530462",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Expense Claim",
- "name_case": "Title Case",
- "owner": "harshada@webnotestech.com",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Employee",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Expense Approver",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  }
- ],
- "search_fields": "employee,employee_name",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "employee",
- "title_field": "title"
-}
\ No newline at end of file
+  "allow_import": 1,
+  "autoname": "naming_series:",
+  "creation": "2013-01-10 16:34:14",
+  "doctype": "DocType",
+  "document_type": "Setup",
+  "engine": "InnoDB",
+  "field_order": [
+   "naming_series",
+   "employee",
+   "employee_name",
+   "department",
+   "column_break_5",
+   "expense_approver",
+   "approval_status",
+   "is_paid",
+   "expense_details",
+   "expenses",
+   "sb1",
+   "taxes",
+   "transactions_section",
+   "total_sanctioned_amount",
+   "total_taxes_and_charges",
+   "total_advance_amount",
+   "column_break_17",
+   "grand_total",
+   "total_claimed_amount",
+   "total_amount_reimbursed",
+   "section_break_16",
+   "posting_date",
+   "vehicle_log",
+   "task",
+   "cb1",
+   "remark",
+   "title",
+   "email_id",
+   "accounting_details",
+   "company",
+   "mode_of_payment",
+   "clearance_date",
+   "column_break_24",
+   "payable_account",
+   "accounting_dimensions_section",
+   "project",
+   "dimension_col_break",
+   "cost_center",
+   "more_details",
+   "status",
+   "amended_from",
+   "advance_payments",
+   "advances"
+  ],
+  "fields": [
+   {
+    "fieldname": "naming_series",
+    "fieldtype": "Select",
+    "label": "Series",
+    "no_copy": 1,
+    "options": "HR-EXP-.YYYY.-",
+    "print_hide": 1,
+    "reqd": 1,
+    "set_only_once": 1
+   },
+   {
+    "fieldname": "employee",
+    "fieldtype": "Link",
+    "in_global_search": 1,
+    "label": "From Employee",
+    "oldfieldname": "employee",
+    "oldfieldtype": "Link",
+    "options": "Employee",
+    "reqd": 1,
+    "search_index": 1
+   },
+   {
+    "fetch_from": "employee.employee_name",
+    "fieldname": "employee_name",
+    "fieldtype": "Data",
+    "in_global_search": 1,
+    "label": "Employee Name",
+    "oldfieldname": "employee_name",
+    "oldfieldtype": "Data",
+    "read_only": 1,
+    "width": "150px"
+   },
+   {
+    "fetch_from": "employee.department",
+    "fieldname": "department",
+    "fieldtype": "Link",
+    "label": "Department",
+    "options": "Department",
+    "read_only": 1
+   },
+   {
+    "fieldname": "column_break_5",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "expense_approver",
+    "fieldtype": "Link",
+    "label": "Expense Approver",
+    "options": "User"
+   },
+   {
+    "default": "Draft",
+    "fieldname": "approval_status",
+    "fieldtype": "Select",
+    "label": "Approval Status",
+    "no_copy": 1,
+    "options": "Draft\nApproved\nRejected",
+    "search_index": 1
+   },
+   {
+    "fieldname": "total_claimed_amount",
+    "fieldtype": "Currency",
+    "in_list_view": 1,
+    "label": "Total Claimed Amount",
+    "no_copy": 1,
+    "oldfieldname": "total_claimed_amount",
+    "oldfieldtype": "Currency",
+    "options": "Company:company:default_currency",
+    "read_only": 1,
+    "width": "160px"
+   },
+   {
+    "fieldname": "total_sanctioned_amount",
+    "fieldtype": "Currency",
+    "label": "Total Sanctioned Amount",
+    "no_copy": 1,
+    "oldfieldname": "total_sanctioned_amount",
+    "oldfieldtype": "Currency",
+    "options": "Company:company:default_currency",
+    "read_only": 1,
+    "width": "160px"
+   },
+   {
+    "default": "0",
+    "depends_on": "eval:(doc.docstatus==0 || doc.is_paid)",
+    "fieldname": "is_paid",
+    "fieldtype": "Check",
+    "label": "Is Paid"
+   },
+   {
+    "fieldname": "expense_details",
+    "fieldtype": "Section Break",
+    "oldfieldtype": "Section Break"
+   },
+   {
+    "fieldname": "expenses",
+    "fieldtype": "Table",
+    "label": "Expenses",
+    "oldfieldname": "expense_voucher_details",
+    "oldfieldtype": "Table",
+    "options": "Expense Claim Detail",
+    "reqd": 1
+   },
+   {
+    "fieldname": "sb1",
+    "fieldtype": "Section Break",
+    "options": "Simple"
+   },
+   {
+    "default": "Today",
+    "fieldname": "posting_date",
+    "fieldtype": "Date",
+    "label": "Posting Date",
+    "oldfieldname": "posting_date",
+    "oldfieldtype": "Date",
+    "reqd": 1
+   },
+   {
+    "fieldname": "vehicle_log",
+    "fieldtype": "Link",
+    "label": "Vehicle Log",
+    "options": "Vehicle Log",
+    "read_only": 1
+   },
+   {
+    "fieldname": "project",
+    "fieldtype": "Link",
+    "label": "Project",
+    "options": "Project"
+   },
+   {
+    "fieldname": "task",
+    "fieldtype": "Link",
+    "label": "Task",
+    "options": "Task",
+    "remember_last_selected_value": 1
+   },
+   {
+    "fieldname": "cb1",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "total_amount_reimbursed",
+    "fieldtype": "Currency",
+    "in_list_view": 1,
+    "label": "Total Amount Reimbursed",
+    "no_copy": 1,
+    "options": "Company:company:default_currency",
+    "read_only": 1
+   },
+   {
+    "fieldname": "remark",
+    "fieldtype": "Small Text",
+    "label": "Remark",
+    "no_copy": 1,
+    "oldfieldname": "remark",
+    "oldfieldtype": "Small Text"
+   },
+   {
+    "allow_on_submit": 1,
+    "default": "{employee_name}",
+    "fieldname": "title",
+    "fieldtype": "Data",
+    "hidden": 1,
+    "label": "Title",
+    "no_copy": 1
+   },
+   {
+    "fieldname": "email_id",
+    "fieldtype": "Data",
+    "hidden": 1,
+    "label": "Employees Email Id",
+    "oldfieldname": "email_id",
+    "oldfieldtype": "Data",
+    "print_hide": 1
+   },
+   {
+    "fieldname": "accounting_details",
+    "fieldtype": "Section Break",
+    "label": "Accounting Details"
+   },
+   {
+    "fieldname": "company",
+    "fieldtype": "Link",
+    "label": "Company",
+    "oldfieldname": "company",
+    "oldfieldtype": "Link",
+    "options": "Company",
+    "remember_last_selected_value": 1,
+    "reqd": 1
+   },
+   {
+    "depends_on": "is_paid",
+    "fieldname": "mode_of_payment",
+    "fieldtype": "Link",
+    "label": "Mode of Payment",
+    "options": "Mode of Payment"
+   },
+   {
+    "fieldname": "clearance_date",
+    "fieldtype": "Date",
+    "label": "Clearance Date"
+   },
+   {
+    "fieldname": "column_break_24",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "payable_account",
+    "fieldtype": "Link",
+    "label": "Payable Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "cost_center",
+    "fieldtype": "Link",
+    "label": "Cost Center",
+    "options": "Cost Center"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "more_details",
+    "fieldtype": "Section Break",
+    "label": "More Details"
+   },
+   {
+    "default": "Draft",
+    "fieldname": "status",
+    "fieldtype": "Select",
+    "in_list_view": 1,
+    "label": "Status",
+    "no_copy": 1,
+    "options": "Draft\nPaid\nUnpaid\nRejected\nSubmitted\nCancelled",
+    "print_hide": 1,
+    "read_only": 1
+   },
+   {
+    "fieldname": "amended_from",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Amended From",
+    "no_copy": 1,
+    "oldfieldname": "amended_from",
+    "oldfieldtype": "Data",
+    "options": "Expense Claim",
+    "print_hide": 1,
+    "read_only": 1,
+    "report_hide": 1,
+    "width": "160px"
+   },
+   {
+    "fieldname": "advance_payments",
+    "fieldtype": "Section Break",
+    "label": "Advance Payments"
+   },
+   {
+    "fieldname": "advances",
+    "fieldtype": "Table",
+    "label": "Advances",
+    "options": "Expense Claim Advance"
+   },
+   {
+    "fieldname": "total_advance_amount",
+    "fieldtype": "Currency",
+    "label": "Total Advance Amount",
+    "options": "Company:company:default_currency",
+    "read_only": 1
+   },
+   {
+    "fieldname": "accounting_dimensions_section",
+    "fieldtype": "Section Break",
+    "label": "Accounting Dimensions"
+   },
+   {
+    "fieldname": "dimension_col_break",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "taxes",
+    "fieldtype": "Table",
+    "label": "Expense Taxes and Charges",
+    "options": "Expense Taxes and Charges"
+   },
+   {
+    "fieldname": "section_break_16",
+    "fieldtype": "Section Break"
+   },
+   {
+    "fieldname": "transactions_section",
+    "fieldtype": "Section Break"
+   },
+   {
+    "fieldname": "grand_total",
+    "fieldtype": "Currency",
+    "in_list_view": 1,
+    "label": "Grand Total",
+    "options": "Company:company:default_currency",
+    "read_only": 1
+   },
+   {
+    "fieldname": "column_break_17",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "total_taxes_and_charges",
+    "fieldtype": "Currency",
+    "label": "Total Taxes and Charges",
+    "options": "Company:company:default_currency",
+    "read_only": 1
+   }
+  ],
+  "icon": "fa fa-money",
+  "idx": 1,
+  "is_submittable": 1,
+  "modified": "2019-06-26 18:05:52.530462",
+  "modified_by": "Administrator",
+  "module": "HR",
+  "name": "Expense Claim",
+  "name_case": "Title Case",
+  "owner": "harshada@webnotestech.com",
+  "permissions": [
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "export": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "HR Manager",
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   },
+   {
+    "create": 1,
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Employee",
+    "share": 1,
+    "write": 1
+   },
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Expense Approver",
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   },
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "HR User",
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   }
+  ],
+  "search_fields": "employee,employee_name",
+  "show_name_in_global_search": 1,
+  "sort_field": "modified",
+  "sort_order": "DESC",
+  "timeline_field": "employee",
+  "title_field": "title"
+ }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index a42209f..92fdc09 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -14,20 +14,24 @@
 class TestExpenseClaim(unittest.TestCase):
 	def test_total_expense_claim_for_project(self):
 		frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
+		frappe.db.sql("""delete from `tabProject Task` where parent = "_Test Project 1" """)
 		frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
-
+		frappe.db.sql("delete from `tabExpense Claim` where project='_Test Project 1'")
 
 		frappe.get_doc({
 			"project_name": "_Test Project 1",
 			"doctype": "Project",
-			"tasks" :
-				[{ "title": "_Test Project Task 1", "status": "Open" }]
+		}).save()
+
+		task = frappe.get_doc({
+			"doctype": "Task",
+			"subject": "_Test Project Task 1",
+			"project": "_Test Project 1"
 		}).save()
 
 		task_name = frappe.db.get_value("Task", {"project": "_Test Project 1"})
 		payable_account = get_payable_account("Wind Power LLC")
-
-		make_expense_claim(payable_account, 300, 200, "Wind Power LLC", "Travel Expenses - WP", "_Test Project 1", task_name)
+		make_expense_claim(payable_account, 300, 200, "Wind Power LLC","Travel Expenses - WP", "_Test Project 1", task_name)
 
 		self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 200)
 		self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 200)
@@ -119,9 +123,10 @@
 	}]}
 
 def make_expense_claim(payable_account, amount, sanctioned_amount, company, account, project=None, task_name=None, do_not_submit=False, taxes=None):
+	employee = frappe.db.get_value("Employee", {"status": "Active"})
 	expense_claim = {
 		 "doctype": "Expense Claim",
-		 "employee": "_T-Employee-00001",
+		 "employee": employee,
 		 "payable_account": payable_account,
 		 "approval_status": "Approved",
 		 "company": company,
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.js b/erpnext/hr/doctype/hr_settings/hr_settings.js
index d8be46b..9e5effe 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.js
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.js
@@ -15,7 +15,7 @@
 		let policy = frm.doc.password_policy;
 		if (policy) {
 			if (policy.includes(' ') || policy.includes('--')) {
-				frappe.msgprint("Password policy cannot contain spaces or simultaneous hyphens. The format will be restructured automatically");
+				frappe.msgprint(_("Password policy cannot contain spaces or simultaneous hyphens. The format will be restructured automatically"));
 			}
 			frm.set_value('password_policy', policy.split(new RegExp(" |-", 'g')).filter((token) => token).join('-'));
 		}
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index 113dcad..1ef8ee0 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -135,6 +135,7 @@
 					# make new attendance and submit it
 					doc = frappe.new_doc("Attendance")
 					doc.employee = self.employee
+					doc.employee_name = self.employee_name
 					doc.attendance_date = date
 					doc.company = self.company
 					doc.leave_type = self.leave_type
diff --git a/erpnext/hr/doctype/payroll_period/payroll_period.py b/erpnext/hr/doctype/payroll_period/payroll_period.py
index cb4264b..c176959 100644
--- a/erpnext/hr/doctype/payroll_period/payroll_period.py
+++ b/erpnext/hr/doctype/payroll_period/payroll_period.py
@@ -102,4 +102,4 @@
 		remaining_days_in_payroll_period = date_diff(period_end, start_date) + 1
 		remaining_sub_periods = flt(remaining_days_in_payroll_period) / flt(salary_days)
 
-	return total_sub_periods, remaining_sub_periods
\ No newline at end of file
+	return total_sub_periods, remaining_sub_periods
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index e117a20..986030d 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -1,264 +1,264 @@
 {
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:salary_component",
- "creation": "2016-06-30 15:42:43.631931",
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "salary_component",
-  "salary_component_abbr",
-  "type",
-  "description",
-  "column_break_4",
-  "is_payable",
-  "depends_on_payment_days",
-  "is_tax_applicable",
-  "deduct_full_tax_on_selected_payroll_date",
-  "round_to_the_nearest_integer",
-  "statistical_component",
-  "do_not_include_in_total",
-  "disabled",
-  "flexible_benefits",
-  "is_flexible_benefit",
-  "max_benefit_amount",
-  "column_break_9",
-  "pay_against_benefit_claim",
-  "only_tax_impact",
-  "create_separate_payment_entry_against_benefit_claim",
-  "section_break_11",
-  "variable_based_on_taxable_salary",
-  "section_break_5",
-  "accounts",
-  "condition_and_formula",
-  "condition",
-  "amount",
-  "amount_based_on_formula",
-  "formula",
-  "column_break_28",
-  "help"
- ],
- "fields": [
-  {
-   "fieldname": "salary_component",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Name",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "salary_component_abbr",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Abbr",
-   "print_width": "120px",
-   "reqd": 1,
-   "width": "120px"
-  },
-  {
-   "fieldname": "type",
-   "fieldtype": "Select",
-   "in_standard_filter": 1,
-   "label": "Type",
-   "options": "Earning\nDeduction",
-   "reqd": 1
-  },
-  {
-   "default": "1",
-   "depends_on": "eval:doc.type == \"Earning\"",
-   "fieldname": "is_tax_applicable",
-   "fieldtype": "Check",
-   "label": "Is Tax Applicable"
-  },
-  {
-   "default": "1",
-   "fieldname": "is_payable",
-   "fieldtype": "Check",
-   "label": "Is Payable"
-  },
-  {
-   "default": "1",
-   "fieldname": "depends_on_payment_days",
-   "fieldtype": "Check",
-   "label": "Depends on Payment Days",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "do_not_include_in_total",
-   "fieldtype": "Check",
-   "label": "Do Not Include in Total"
-  },
-  {
-   "default": "0",
-   "depends_on": "is_tax_applicable",
-   "fieldname": "deduct_full_tax_on_selected_payroll_date",
-   "fieldtype": "Check",
-   "label": "Deduct Full Tax on Selected Payroll Date"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Description"
-  },
-  {
-   "default": "0",
-   "description": "If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",
-   "fieldname": "statistical_component",
-   "fieldtype": "Check",
-   "label": "Statistical Component"
-  },
-  {
-   "depends_on": "eval:doc.type==\"Earning\" && doc.statistical_component!=1",
-   "fieldname": "flexible_benefits",
-   "fieldtype": "Section Break",
-   "label": "Flexible Benefits"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_flexible_benefit",
-   "fieldtype": "Check",
-   "label": "Is Flexible Benefit"
-  },
-  {
-   "depends_on": "is_flexible_benefit",
-   "fieldname": "max_benefit_amount",
-   "fieldtype": "Currency",
-   "label": "Max Benefit Amount (Yearly)"
-  },
-  {
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "depends_on": "is_flexible_benefit",
-   "fieldname": "pay_against_benefit_claim",
-   "fieldtype": "Check",
-   "label": "Pay Against Benefit Claim"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.create_separate_payment_entry_against_benefit_claim !=1",
-   "fieldname": "only_tax_impact",
-   "fieldtype": "Check",
-   "label": "Only Tax Impact (Cannot Claim But Part of Taxable Income)"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.only_tax_impact !=1",
-   "fieldname": "create_separate_payment_entry_against_benefit_claim",
-   "fieldtype": "Check",
-   "label": "Create Separate Payment Entry Against Benefit Claim"
-  },
-  {
-   "depends_on": "eval:doc.type=='Deduction'",
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "variable_based_on_taxable_salary",
-   "fieldtype": "Check",
-   "label": "Variable Based On Taxable Salary"
-  },
-  {
-   "depends_on": "eval:doc.statistical_component != 1",
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break",
-   "label": "Accounts"
-  },
-  {
-   "fieldname": "accounts",
-   "fieldtype": "Table",
-   "label": "Accounts",
-   "options": "Salary Component Account"
-  },
-  {
-   "collapsible": 1,
-   "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1",
-   "fieldname": "condition_and_formula",
-   "fieldtype": "Section Break",
-   "label": "Condition and Formula"
-  },
-  {
-   "fieldname": "condition",
-   "fieldtype": "Code",
-   "label": "Condition"
-  },
-  {
-   "default": "0",
-   "fieldname": "amount_based_on_formula",
-   "fieldtype": "Check",
-   "label": "Amount based on formula"
-  },
-  {
-   "depends_on": "amount_based_on_formula",
-   "fieldname": "formula",
-   "fieldtype": "Code",
-   "label": "Formula"
-  },
-  {
-   "depends_on": "eval:doc.amount_based_on_formula!==1",
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "label": "Amount"
-  },
-  {
-   "fieldname": "column_break_28",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "help",
-   "fieldtype": "HTML",
-   "label": "Help",
-   "options": "<h3>Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>"
-  },
-  {
-   "default": "0",
-   "fieldname": "round_to_the_nearest_integer",
-   "fieldtype": "Check",
-   "label": "Round to the Nearest Integer"
-  }
- ],
- "icon": "fa fa-flag",
- "modified": "2019-06-05 11:34:14.231228",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Component",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "read": 1,
-   "role": "Employee"
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC"
-}
\ No newline at end of file
+    "allow_import": 1,
+    "allow_rename": 1,
+    "autoname": "field:salary_component",
+    "creation": "2016-06-30 15:42:43.631931",
+    "doctype": "DocType",
+    "document_type": "Setup",
+    "editable_grid": 1,
+    "engine": "InnoDB",
+    "field_order": [
+     "salary_component",
+     "salary_component_abbr",
+     "type",
+     "description",
+     "column_break_4",
+     "is_payable",
+     "depends_on_payment_days",
+     "is_tax_applicable",
+     "deduct_full_tax_on_selected_payroll_date",
+     "round_to_the_nearest_integer",
+     "statistical_component",
+     "do_not_include_in_total",
+     "disabled",
+     "flexible_benefits",
+     "is_flexible_benefit",
+     "max_benefit_amount",
+     "column_break_9",
+     "pay_against_benefit_claim",
+     "only_tax_impact",
+     "create_separate_payment_entry_against_benefit_claim",
+     "section_break_11",
+     "variable_based_on_taxable_salary",
+     "section_break_5",
+     "accounts",
+     "condition_and_formula",
+     "condition",
+     "amount",
+     "amount_based_on_formula",
+     "formula",
+     "column_break_28",
+     "help"
+    ],
+    "fields": [
+     {
+      "fieldname": "salary_component",
+      "fieldtype": "Data",
+      "in_list_view": 1,
+      "label": "Name",
+      "reqd": 1,
+      "unique": 1
+     },
+     {
+      "fieldname": "salary_component_abbr",
+      "fieldtype": "Data",
+      "in_list_view": 1,
+      "label": "Abbr",
+      "print_width": "120px",
+      "reqd": 1,
+      "width": "120px"
+     },
+     {
+      "fieldname": "type",
+      "fieldtype": "Select",
+      "in_standard_filter": 1,
+      "label": "Type",
+      "options": "Earning\nDeduction",
+      "reqd": 1
+     },
+     {
+      "default": "1",
+      "depends_on": "eval:doc.type == \"Earning\"",
+      "fieldname": "is_tax_applicable",
+      "fieldtype": "Check",
+      "label": "Is Tax Applicable"
+     },
+     {
+      "default": "1",
+      "fieldname": "is_payable",
+      "fieldtype": "Check",
+      "label": "Is Payable"
+     },
+     {
+      "default": "1",
+      "fieldname": "depends_on_payment_days",
+      "fieldtype": "Check",
+      "label": "Depends on Payment Days",
+      "print_hide": 1
+     },
+     {
+      "default": "0",
+      "fieldname": "do_not_include_in_total",
+      "fieldtype": "Check",
+      "label": "Do Not Include in Total"
+     },
+     {
+      "default": "0",
+      "depends_on": "is_tax_applicable",
+      "fieldname": "deduct_full_tax_on_selected_payroll_date",
+      "fieldtype": "Check",
+      "label": "Deduct Full Tax on Selected Payroll Date"
+     },
+     {
+      "fieldname": "column_break_4",
+      "fieldtype": "Column Break"
+     },
+     {
+      "default": "0",
+      "fieldname": "disabled",
+      "fieldtype": "Check",
+      "label": "Disabled"
+     },
+     {
+      "fieldname": "description",
+      "fieldtype": "Small Text",
+      "in_list_view": 1,
+      "label": "Description"
+     },
+     {
+      "default": "0",
+      "description": "If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",
+      "fieldname": "statistical_component",
+      "fieldtype": "Check",
+      "label": "Statistical Component"
+     },
+     {
+      "depends_on": "eval:doc.type==\"Earning\" && doc.statistical_component!=1",
+      "fieldname": "flexible_benefits",
+      "fieldtype": "Section Break",
+      "label": "Flexible Benefits"
+     },
+     {
+      "default": "0",
+      "fieldname": "is_flexible_benefit",
+      "fieldtype": "Check",
+      "label": "Is Flexible Benefit"
+     },
+     {
+      "depends_on": "is_flexible_benefit",
+      "fieldname": "max_benefit_amount",
+      "fieldtype": "Currency",
+      "label": "Max Benefit Amount (Yearly)"
+     },
+     {
+      "fieldname": "column_break_9",
+      "fieldtype": "Column Break"
+     },
+     {
+      "default": "0",
+      "depends_on": "is_flexible_benefit",
+      "fieldname": "pay_against_benefit_claim",
+      "fieldtype": "Check",
+      "label": "Pay Against Benefit Claim"
+     },
+     {
+      "default": "0",
+      "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.create_separate_payment_entry_against_benefit_claim !=1",
+      "fieldname": "only_tax_impact",
+      "fieldtype": "Check",
+      "label": "Only Tax Impact (Cannot Claim But Part of Taxable Income)"
+     },
+     {
+      "default": "0",
+      "depends_on": "eval:doc.is_flexible_benefit == 1 & doc.only_tax_impact !=1",
+      "fieldname": "create_separate_payment_entry_against_benefit_claim",
+      "fieldtype": "Check",
+      "label": "Create Separate Payment Entry Against Benefit Claim"
+     },
+     {
+      "depends_on": "eval:doc.type=='Deduction'",
+      "fieldname": "section_break_11",
+      "fieldtype": "Section Break"
+     },
+     {
+      "default": "0",
+      "fieldname": "variable_based_on_taxable_salary",
+      "fieldtype": "Check",
+      "label": "Variable Based On Taxable Salary"
+     },
+     {
+      "depends_on": "eval:doc.statistical_component != 1",
+      "fieldname": "section_break_5",
+      "fieldtype": "Section Break",
+      "label": "Accounts"
+     },
+     {
+      "fieldname": "accounts",
+      "fieldtype": "Table",
+      "label": "Accounts",
+      "options": "Salary Component Account"
+     },
+     {
+      "collapsible": 1,
+      "depends_on": "eval:doc.is_flexible_benefit != 1 && doc.variable_based_on_taxable_salary != 1",
+      "fieldname": "condition_and_formula",
+      "fieldtype": "Section Break",
+      "label": "Condition and Formula"
+     },
+     {
+      "fieldname": "condition",
+      "fieldtype": "Code",
+      "label": "Condition"
+     },
+     {
+      "default": "0",
+      "fieldname": "amount_based_on_formula",
+      "fieldtype": "Check",
+      "label": "Amount based on formula"
+     },
+     {
+      "depends_on": "amount_based_on_formula",
+      "fieldname": "formula",
+      "fieldtype": "Code",
+      "label": "Formula"
+     },
+     {
+      "depends_on": "eval:doc.amount_based_on_formula!==1",
+      "fieldname": "amount",
+      "fieldtype": "Currency",
+      "label": "Amount"
+     },
+     {
+      "fieldname": "column_break_28",
+      "fieldtype": "Column Break"
+     },
+     {
+      "fieldname": "help",
+      "fieldtype": "HTML",
+      "label": "Help",
+      "options": "<h3>Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base &lt; 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS &gt; 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>"
+     },
+     {
+      "default": "0",
+      "fieldname": "round_to_the_nearest_integer",
+      "fieldtype": "Check",
+      "label": "Round to the Nearest Integer"
+     }
+    ],
+    "icon": "fa fa-flag",
+    "modified": "2019-06-05 11:34:14.231228",
+    "modified_by": "Administrator",
+    "module": "HR",
+    "name": "Salary Component",
+    "owner": "Administrator",
+    "permissions": [
+     {
+      "create": 1,
+      "delete": 1,
+      "email": 1,
+      "export": 1,
+      "print": 1,
+      "read": 1,
+      "report": 1,
+      "role": "HR User",
+      "share": 1,
+      "write": 1
+     },
+     {
+      "read": 1,
+      "role": "Employee"
+     }
+    ],
+    "sort_field": "modified",
+    "sort_order": "DESC"
+   }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index 681b008..fa3114c 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -1,1955 +1,1955 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2013-01-10 16:34:15",
- "custom": 0,
- "default_print_format": "",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "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": "Posting Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
+   "allow_copy": 0,
+   "allow_events_in_timeline": 0,
+   "allow_guest_to_view": 0,
+   "allow_import": 1,
+   "allow_rename": 0,
+   "beta": 0,
+   "creation": "2013-01-10 16:34:15",
+   "custom": 0,
+   "default_print_format": "",
+   "docstatus": 0,
+   "doctype": "DocType",
+   "document_type": "Setup",
+   "editable_grid": 0,
+   "fields": [
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Today",
+     "fieldname": "posting_date",
+     "fieldtype": "Date",
+     "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": "Posting Date",
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "employee",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 1,
+     "in_standard_filter": 1,
+     "label": "Employee",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "employee",
+     "oldfieldtype": "Link",
+     "options": "Employee",
+     "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": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_from": "employee.employee_name",
+     "fieldname": "employee_name",
+     "fieldtype": "Read Only",
+     "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": "Employee Name",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "employee_name",
+     "oldfieldtype": "Data",
+     "options": "",
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_from": "employee.department",
+     "fieldname": "department",
+     "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": 1,
+     "label": "Department",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "department",
+     "oldfieldtype": "Link",
+     "options": "Department",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:doc.designation",
+     "fetch_from": "employee.designation",
+     "fieldname": "designation",
+     "fieldtype": "Read Only",
+     "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": "Designation",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "designation",
+     "oldfieldtype": "Link",
+     "options": "",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_from": "employee.branch",
+     "fieldname": "branch",
+     "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": 1,
+     "label": "Branch",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "branch",
+     "oldfieldtype": "Link",
+     "options": "Branch",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break1",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "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": "Status",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Draft\nSubmitted\nCancelled",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "journal_entry",
+     "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": "Journal Entry",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Journal Entry",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "payroll_entry",
+     "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": "Payroll Entry",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Payroll Entry",
+     "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_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": 0,
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 1,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "letter_head",
+     "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": "Letter Head",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Letter Head",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "section_break_10",
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "salary_slip_based_on_timesheet",
+     "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": "Salary Slip Based on Timesheet",
+     "length": 0,
+     "no_copy": 0,
+     "options": "",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "",
+     "fieldname": "start_date",
+     "fieldtype": "Date",
+     "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": "Start Date",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "",
+     "depends_on": "",
+     "fieldname": "end_date",
+     "fieldtype": "Date",
+     "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": "End Date",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_15",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "salary_structure",
+     "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": "Salary Structure",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Salary Structure",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "",
+     "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
+     "fieldname": "payroll_frequency",
+     "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": "Payroll Frequency",
+     "length": 0,
+     "no_copy": 0,
+     "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "total_working_days",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Working Days",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "total_days_in_month",
+     "oldfieldtype": "Int",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "leave_without_pay",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Leave Without Pay",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "leave_without_pay",
+     "oldfieldtype": "Currency",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "payment_days",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Payment Days",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "payment_days",
+     "oldfieldtype": "Float",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "hourly_wages",
+     "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": "",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "timesheets",
+     "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": "Salary Slip Timesheet",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Salary Slip Timesheet",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_20",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "total_working_hours",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Total Working Hours",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 1,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "hour_rate",
+     "fieldtype": "Currency",
+     "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": "Hour Rate",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 1,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "section_break_26",
+     "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": "",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "bank_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": "Bank Name",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "bank_name",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "bank_account_no",
+     "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": "Bank Account No.",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "bank_account_no",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break_32",
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "deduct_tax_for_unclaimed_employee_benefits",
+     "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": "Deduct Tax For Unclaimed Employee Benefits",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "deduct_tax_for_unsubmitted_tax_exemption_proof",
+     "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": "Deduct Tax For Unsubmitted Tax Exemption Proof",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "earning_deduction",
+     "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": "Earning & Deduction",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "earning",
+     "fieldtype": "Column 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": "Earning",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Column Break",
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "earnings",
+     "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": "Earnings",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "earning_details",
+     "oldfieldtype": "Table",
+     "options": "Salary Detail",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "deduction",
+     "fieldtype": "Column 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": "Deduction",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Column Break",
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "deductions",
+     "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": "Deductions",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "deduction_details",
+     "oldfieldtype": "Table",
+     "options": "Salary Detail",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "totals",
+     "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": "",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "gross_pay",
+     "fieldtype": "Currency",
+     "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": "Gross Pay",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "gross_pay",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_25",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "total_deduction",
+     "fieldtype": "Currency",
+     "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": "Total Deduction",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "total_deduction",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "total_loan_repayment",
+     "fieldname": "loan_repayment",
+     "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": "Loan repayment",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "loans",
+     "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": "Employee Loan",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Salary Slip Loan",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "section_break_43",
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "0",
+     "fieldname": "total_principal_amount",
+     "fieldtype": "Currency",
+     "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": "Total Principal Amount",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "0",
+     "fieldname": "total_interest_amount",
+     "fieldtype": "Currency",
+     "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": "Total Interest Amount",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_45",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "0",
+     "fieldname": "total_loan_repayment",
+     "fieldtype": "Currency",
+     "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": "Total Loan Repayment",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "net_pay_info",
+     "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": "net pay info",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Gross Pay - Total Deduction - Loan Repayment",
+     "fieldname": "net_pay",
+     "fieldtype": "Currency",
+     "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": "Net Pay",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "net_pay",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_53",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "rounded_total",
+     "fieldtype": "Currency",
+     "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": "Rounded Total",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "section_break_55",
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Net Pay (in words) will be visible once you save the Salary Slip.",
+     "fieldname": "total_in_words",
+     "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": "Total in words",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "net_pay_in_words",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "amended_from",
+     "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": "Amended From",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "amended_from",
+     "oldfieldtype": "Data",
+     "options": "Salary Slip",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    }
+   ],
+   "has_web_view": 0,
+   "hide_heading": 0,
+   "hide_toolbar": 0,
+   "icon": "fa fa-file-text",
+   "idx": 9,
+   "image_view": 0,
+   "in_create": 0,
+   "is_submittable": 1,
+   "issingle": 0,
+   "istable": 0,
+   "max_attachments": 0,
+   "modified": "2019-06-19 13:10:14.524119",
+   "modified_by": "Administrator",
+   "module": "HR",
+   "name": "Salary Slip",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 1,
+     "delete": 0,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "HR User",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "HR Manager",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 0,
+     "read": 1,
+     "report": 0,
+     "role": "Employee",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 0
+    }
+   ],
+   "quick_entry": 0,
    "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "employee",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "employee",
-   "oldfieldtype": "Link",
-   "options": "Employee",
-   "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": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_from": "employee.employee_name",
-   "fieldname": "employee_name",
-   "fieldtype": "Read Only",
-   "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": "Employee Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "employee_name",
-   "oldfieldtype": "Data",
-   "options": "",
-   "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": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_from": "employee.department",
-   "fieldname": "department",
-   "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": 1,
-   "label": "Department",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "department",
-   "oldfieldtype": "Link",
-   "options": "Department",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.designation",
-   "fetch_from": "employee.designation",
-   "fieldname": "designation",
-   "fieldtype": "Read Only",
-   "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": "Designation",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "designation",
-   "oldfieldtype": "Link",
-   "options": "",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_from": "employee.branch",
-   "fieldname": "branch",
-   "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": 1,
-   "label": "Branch",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "branch",
-   "oldfieldtype": "Link",
-   "options": "Branch",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column 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,
-   "oldfieldtype": "Column Break",
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "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": "Status",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Draft\nSubmitted\nCancelled",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "journal_entry",
-   "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": "Journal Entry",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Journal Entry",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "payroll_entry",
-   "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": "Payroll Entry",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Payroll Entry",
-   "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_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": 0,
-   "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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "letter_head",
-   "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": "Letter Head",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Letter Head",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_10",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "salary_slip_based_on_timesheet",
-   "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": "Salary Slip Based on Timesheet",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fieldname": "start_date",
-   "fieldtype": "Date",
-   "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": "Start Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "",
-   "fieldname": "end_date",
-   "fieldtype": "Date",
-   "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": "End Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_15",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "salary_structure",
-   "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": "Salary Structure",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Salary Structure",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
-   "fieldname": "payroll_frequency",
-   "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": "Payroll Frequency",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "total_working_days",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Working Days",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "total_days_in_month",
-   "oldfieldtype": "Int",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "leave_without_pay",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Leave Without Pay",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "leave_without_pay",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "payment_days",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Payment Days",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "payment_days",
-   "oldfieldtype": "Float",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "hourly_wages",
-   "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": "",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "timesheets",
-   "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": "Salary Slip Timesheet",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Salary Slip Timesheet",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_20",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_working_hours",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Working Hours",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 1,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "hour_rate",
-   "fieldtype": "Currency",
-   "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": "Hour Rate",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 1,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "section_break_26",
-   "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": "",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "bank_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": "Bank Name",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "bank_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "bank_account_no",
-   "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": "Bank Account No.",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "bank_account_no",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break_32",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "deduct_tax_for_unclaimed_employee_benefits",
-   "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": "Deduct Tax For Unclaimed Employee Benefits",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "deduct_tax_for_unsubmitted_tax_exemption_proof",
-   "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": "Deduct Tax For Unsubmitted Tax Exemption Proof",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "earning_deduction",
-   "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": "Earning & Deduction",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "earning",
-   "fieldtype": "Column 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": "Earning",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "earnings",
-   "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": "Earnings",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "earning_details",
-   "oldfieldtype": "Table",
-   "options": "Salary Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "deduction",
-   "fieldtype": "Column 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": "Deduction",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "deductions",
-   "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": "Deductions",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "deduction_details",
-   "oldfieldtype": "Table",
-   "options": "Salary Detail",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "totals",
-   "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": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "gross_pay",
-   "fieldtype": "Currency",
-   "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": "Gross Pay",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "gross_pay",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_25",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "total_deduction",
-   "fieldtype": "Currency",
-   "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": "Total Deduction",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "total_deduction",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "total_loan_repayment",
-   "fieldname": "loan_repayment",
-   "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": "Loan repayment",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "loans",
-   "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": "Employee Loan",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Salary Slip Loan",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_43",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "fieldname": "total_principal_amount",
-   "fieldtype": "Currency",
-   "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": "Total Principal Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "fieldname": "total_interest_amount",
-   "fieldtype": "Currency",
-   "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": "Total Interest Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_45",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0",
-   "fieldname": "total_loan_repayment",
-   "fieldtype": "Currency",
-   "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": "Total Loan Repayment",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "net_pay_info",
-   "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": "net pay info",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Gross Pay - Total Deduction - Loan Repayment",
-   "fieldname": "net_pay",
-   "fieldtype": "Currency",
-   "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": "Net Pay",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "net_pay",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_53",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "rounded_total",
-   "fieldtype": "Currency",
-   "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": "Rounded Total",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_55",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Net Pay (in words) will be visible once you save the Salary Slip.",
-   "fieldname": "total_in_words",
-   "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": "Total in words",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "net_pay_in_words",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "amended_from",
-   "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": "Amended From",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "options": "Salary Slip",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-file-text",
- "idx": 9,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-05-13 13:10:14.524119",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Salary Slip",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Employee",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "employee",
- "title_field": "employee_name",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
-}
\ No newline at end of file
+   "read_only_onload": 0,
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "timeline_field": "employee",
+   "title_field": "employee_name",
+   "track_changes": 0,
+   "track_seen": 0,
+   "track_views": 0
+  }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 62382b6..6d25c06 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -296,10 +296,7 @@
 
 		self.set_loan_repayment()
 
-		self.net_pay = 0
-		if self.total_working_days:
-			self.net_pay = flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))
-
+		self.net_pay = flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))
 		self.rounded_total = rounded(self.net_pay)
 
 	def calculate_component_amounts(self):
@@ -621,7 +618,7 @@
 		elif not self.payment_days and not self.salary_slip_based_on_timesheet and cint(row.depends_on_payment_days):
 			amount, additional_amount = 0, 0
 		elif not row.amount:
-			amount = row.default_amount + row.additional_amount
+			amount = flt(row.default_amount) + flt(row.additional_amount)
 
 		# apply rounding
 		if frappe.get_cached_value("Salary Component", row.salary_component, "round_to_the_nearest_integer"):
diff --git a/erpnext/hr/report/salary_register/salary_register.py b/erpnext/hr/report/salary_register/salary_register.py
index be4b501..ea7fc06 100644
--- a/erpnext/hr/report/salary_register/salary_register.py
+++ b/erpnext/hr/report/salary_register/salary_register.py
@@ -125,4 +125,4 @@
 		ss_ded_map.setdefault(d.parent, frappe._dict()).setdefault(d.salary_component, [])
 		ss_ded_map[d.parent][d.salary_component] = flt(d.amount)
 
-	return ss_ded_map
\ No newline at end of file
+	return ss_ded_map
diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 0c94df3..0d01c67 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -120,7 +120,7 @@
 def publish_selected_items(items_to_publish):
 	items_to_publish = json.loads(items_to_publish)
 	if not len(items_to_publish):
-		frappe.throw('No items to publish')
+		frappe.throw(_('No items to publish'))
 
 	for item in items_to_publish:
 		item_code = item.get('item_code')
@@ -165,7 +165,7 @@
 		frappe.db.set_value("Marketplace Settings", "Marketplace Settings", "sync_in_progress", 1)
 		return response
 	else:
-		frappe.throw('Unable to update remote activity')
+		frappe.throw(_('Unable to update remote activity'))
 
 
 def item_sync_postprocess():
@@ -173,7 +173,7 @@
 	if response:
 		frappe.db.set_value('Marketplace Settings', 'Marketplace Settings', 'last_sync_datetime', frappe.utils.now())
 	else:
-		frappe.throw('Unable to update remote activity')
+		frappe.throw(_('Unable to update remote activity'))
 
 	frappe.db.set_value('Marketplace Settings', 'Marketplace Settings', 'sync_in_progress', 0)
 
diff --git a/erpnext/hub_node/legacy.py b/erpnext/hub_node/legacy.py
index 9daee27..95ada76 100644
--- a/erpnext/hub_node/legacy.py
+++ b/erpnext/hub_node/legacy.py
@@ -28,7 +28,7 @@
 		lead.save(ignore_permissions=True)
 
 	o = frappe.new_doc("Opportunity")
-	o.enquiry_from = "Lead"
+	o.opportunity_from = "Lead"
 	o.lead = frappe.get_all("Lead", filters={"email_id": email_id}, fields = ["name"])[0]["name"]
 	o.save(ignore_permissions=True)
 
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 23a4e51..a8faa13 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -18,21 +18,22 @@
 		self.total_completed_qty = 0.0
 		self.total_time_in_mins = 0.0
 
-		for d in self.get('time_logs'):
-			if get_datetime(d.from_time) > get_datetime(d.to_time):
-				frappe.throw(_("Row {0}: From time must be less than to time").format(d.idx))
+		if self.get('time_logs'):
+			for d in self.get('time_logs'):
+				if get_datetime(d.from_time) > get_datetime(d.to_time):
+					frappe.throw(_("Row {0}: From time must be less than to time").format(d.idx))
 
-			data = self.get_overlap_for(d)
-			if data:
-				frappe.throw(_("Row {0}: From Time and To Time of {1} is overlapping with {2}")
-					.format(d.idx, self.name, data.name))
+				data = self.get_overlap_for(d)
+				if data:
+					frappe.throw(_("Row {0}: From Time and To Time of {1} is overlapping with {2}")
+						.format(d.idx, self.name, data.name))
 
-			if d.from_time and d.to_time:
-				d.time_in_mins = time_diff_in_hours(d.to_time, d.from_time) * 60
-				self.total_time_in_mins += d.time_in_mins
+				if d.from_time and d.to_time:
+					d.time_in_mins = time_diff_in_hours(d.to_time, d.from_time) * 60
+					self.total_time_in_mins += d.time_in_mins
 
-			if d.completed_qty:
-				self.total_completed_qty += d.completed_qty
+				if d.completed_qty:
+					self.total_completed_qty += d.completed_qty
 
 	def get_overlap_for(self, args):
 		existing = frappe.db.sql("""select jc.name as name from
@@ -112,8 +113,10 @@
 			for_quantity += doc.total_completed_qty
 			time_in_mins += doc.total_time_in_mins
 			for time_log in doc.time_logs:
-				from_time_list.append(time_log.from_time)
-				to_time_list.append(time_log.to_time)
+				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)
 
 		if for_quantity:
 			wo = frappe.get_doc('Work Order', self.work_order)
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 3bc2899..1534b59 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -1,484 +1,484 @@
 {
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-01-10 16:34:16",
- "doctype": "DocType",
- "document_type": "Setup",
- "field_order": [
-  "item",
-  "naming_series",
-  "status",
-  "production_item",
-  "item_name",
-  "image",
-  "bom_no",
-  "allow_alternative_item",
-  "use_multi_level_bom",
-  "skip_transfer",
-  "column_break1",
-  "company",
-  "qty",
-  "material_transferred_for_manufacturing",
-  "produced_qty",
-  "sales_order",
-  "project",
-  "from_wip_warehouse",
-  "warehouses",
-  "wip_warehouse",
-  "fg_warehouse",
-  "column_break_12",
-  "scrap_warehouse",
-  "required_items_section",
-  "required_items",
-  "time",
-  "planned_start_date",
-  "actual_start_date",
-  "column_break_13",
-  "planned_end_date",
-  "actual_end_date",
-  "expected_delivery_date",
-  "operations_section",
-  "transfer_material_against",
-  "operations",
-  "section_break_22",
-  "planned_operating_cost",
-  "actual_operating_cost",
-  "additional_operating_cost",
-  "column_break_24",
-  "total_operating_cost",
-  "more_info",
-  "description",
-  "stock_uom",
-  "column_break2",
-  "material_request",
-  "material_request_item",
-  "sales_order_item",
-  "production_plan",
-  "production_plan_item",
-  "product_bundle_item",
-  "amended_from"
- ],
- "fields": [
-  {
-   "fieldname": "item",
-   "fieldtype": "Section Break",
-   "options": "fa fa-gift"
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "options": "MFG-WO-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "default": "Draft",
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "label": "Status",
-   "no_copy": 1,
-   "oldfieldname": "status",
-   "oldfieldtype": "Select",
-   "options": "\nDraft\nSubmitted\nNot Started\nIn Process\nCompleted\nStopped\nCancelled",
-   "read_only": 1,
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "production_item",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Item To Manufacture",
-   "oldfieldname": "production_item",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "reqd": 1
-  },
-  {
-   "depends_on": "eval:doc.production_item",
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "label": "Item Name",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "production_item.image",
-   "fieldname": "image",
-   "fieldtype": "Attach Image",
-   "hidden": 1,
-   "label": "Image",
-   "options": "image",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "bom_no",
-   "fieldtype": "Link",
-   "label": "BOM No",
-   "oldfieldname": "bom_no",
-   "oldfieldtype": "Link",
-   "options": "BOM",
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "allow_alternative_item",
-   "fieldtype": "Check",
-   "label": "Allow Alternative Item"
-  },
-  {
-   "default": "1",
-   "description": "Plan material for sub-assemblies",
-   "fieldname": "use_multi_level_bom",
-   "fieldtype": "Check",
-   "label": "Use Multi-Level BOM",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "description": "Check if material transfer entry is not required",
-   "fieldname": "skip_transfer",
-   "fieldtype": "Check",
-   "label": "Skip Material Transfer to WIP Warehouse"
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "remember_last_selected_value": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "label": "Qty To Manufacture",
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.docstatus==1 && doc.skip_transfer==0",
-   "fieldname": "material_transferred_for_manufacturing",
-   "fieldtype": "Float",
-   "label": "Material Transferred for Manufacturing",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.docstatus==1",
-   "fieldname": "produced_qty",
-   "fieldtype": "Float",
-   "label": "Manufactured Qty",
-   "no_copy": 1,
-   "oldfieldname": "produced_qty",
-   "oldfieldtype": "Currency",
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "sales_order",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "label": "Sales Order",
-   "options": "Sales Order"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "oldfieldname": "project",
-   "oldfieldtype": "Link",
-   "options": "Project"
-  },
-  {
-   "default": "0",
-   "depends_on": "skip_transfer",
-   "fieldname": "from_wip_warehouse",
-   "fieldtype": "Check",
-   "label": "Backflush Raw Materials From Work-in-Progress Warehouse"
-  },
-  {
-   "fieldname": "warehouses",
-   "fieldtype": "Section Break",
-   "label": "Warehouses",
-   "options": "fa fa-building"
-  },
-  {
-   "fieldname": "wip_warehouse",
-   "fieldtype": "Link",
-   "label": "Work-in-Progress Warehouse",
-   "options": "Warehouse"
-  },
-  {
-   "fieldname": "fg_warehouse",
-   "fieldtype": "Link",
-   "label": "Target Warehouse",
-   "options": "Warehouse"
-  },
-  {
-   "fieldname": "column_break_12",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "scrap_warehouse",
-   "fieldtype": "Link",
-   "label": "Scrap Warehouse",
-   "options": "Warehouse"
-  },
-  {
-   "fieldname": "required_items_section",
-   "fieldtype": "Section Break",
-   "label": "Required Items"
-  },
-  {
-   "fieldname": "required_items",
-   "fieldtype": "Table",
-   "label": "Required Items",
-   "no_copy": 1,
-   "options": "Work Order Item",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "time",
-   "fieldtype": "Section Break",
-   "label": "Time",
-   "options": "fa fa-time"
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "now",
-   "fieldname": "planned_start_date",
-   "fieldtype": "Datetime",
-   "label": "Planned Start Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "actual_start_date",
-   "fieldtype": "Datetime",
-   "label": "Actual Start Date",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_13",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "planned_end_date",
-   "fieldtype": "Datetime",
-   "label": "Planned End Date",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "actual_end_date",
-   "fieldtype": "Datetime",
-   "label": "Actual End Date",
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "expected_delivery_date",
-   "fieldtype": "Date",
-   "label": "Expected Delivery Date"
-  },
-  {
-   "fieldname": "operations_section",
-   "fieldtype": "Section Break",
-   "label": "Operations",
-   "options": "fa fa-wrench"
-  },
-  {
-   "default": "Work Order",
-   "depends_on": "operations",
-   "fieldname": "transfer_material_against",
-   "fieldtype": "Select",
-   "label": "Transfer Material Against",
-   "options": "\nWork Order\nJob Card"
-  },
-  {
-   "fieldname": "operations",
-   "fieldtype": "Table",
-   "label": "Operations",
-   "options": "Work Order Operation",
-   "read_only": 1
-  },
-  {
-   "depends_on": "operations",
-   "fieldname": "section_break_22",
-   "fieldtype": "Section Break",
-   "label": "Operation Cost"
-  },
-  {
-   "fieldname": "planned_operating_cost",
-   "fieldtype": "Currency",
-   "label": "Planned Operating Cost",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "actual_operating_cost",
-   "fieldtype": "Currency",
-   "label": "Actual Operating Cost",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "additional_operating_cost",
-   "fieldtype": "Currency",
-   "label": "Additional Operating Cost",
-   "no_copy": 1,
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "column_break_24",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_operating_cost",
-   "fieldtype": "Currency",
-   "label": "Total Operating Cost",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "More Information",
-   "options": "fa fa-file-text"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "label": "Item Description",
-   "read_only": 1
-  },
-  {
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "label": "Stock UOM",
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Data",
-   "options": "UOM",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "description": "Manufacture against Material Request",
-   "fieldname": "material_request",
-   "fieldtype": "Link",
-   "label": "Material Request",
-   "options": "Material Request"
-  },
-  {
-   "fieldname": "material_request_item",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Material Request Item",
-   "read_only": 1
-  },
-  {
-   "fieldname": "sales_order_item",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Sales Order Item",
-   "read_only": 1
-  },
-  {
-   "fieldname": "production_plan",
-   "fieldtype": "Link",
-   "label": "Production Plan",
-   "no_copy": 1,
-   "options": "Production Plan",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "production_plan_item",
-   "fieldtype": "Data",
-   "label": "Production Plan Item",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "product_bundle_item",
-   "fieldtype": "Link",
-   "label": "Product Bundle Item",
-   "no_copy": 1,
-   "options": "Item",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "options": "Work Order",
-   "read_only": 1
-  }
- ],
- "icon": "fa fa-cogs",
- "idx": 1,
- "image_field": "image",
- "is_submittable": 1,
- "modified": "2019-05-27 09:36:16.707719",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "Work Order",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "import": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Manufacturing User",
-   "set_user_permissions": 1,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "read": 1,
-   "report": 1,
-   "role": "Stock User"
-  }
- ],
- "sort_order": "ASC",
- "title_field": "production_item",
- "track_changes": 1,
- "track_seen": 1
-}
\ No newline at end of file
+   "allow_import": 1,
+   "autoname": "naming_series:",
+   "creation": "2013-01-10 16:34:16",
+   "doctype": "DocType",
+   "document_type": "Setup",
+   "field_order": [
+    "item",
+    "naming_series",
+    "status",
+    "production_item",
+    "item_name",
+    "image",
+    "bom_no",
+    "allow_alternative_item",
+    "use_multi_level_bom",
+    "skip_transfer",
+    "column_break1",
+    "company",
+    "qty",
+    "material_transferred_for_manufacturing",
+    "produced_qty",
+    "sales_order",
+    "project",
+    "from_wip_warehouse",
+    "warehouses",
+    "wip_warehouse",
+    "fg_warehouse",
+    "column_break_12",
+    "scrap_warehouse",
+    "required_items_section",
+    "required_items",
+    "time",
+    "planned_start_date",
+    "actual_start_date",
+    "column_break_13",
+    "planned_end_date",
+    "actual_end_date",
+    "expected_delivery_date",
+    "operations_section",
+    "transfer_material_against",
+    "operations",
+    "section_break_22",
+    "planned_operating_cost",
+    "actual_operating_cost",
+    "additional_operating_cost",
+    "column_break_24",
+    "total_operating_cost",
+    "more_info",
+    "description",
+    "stock_uom",
+    "column_break2",
+    "material_request",
+    "material_request_item",
+    "sales_order_item",
+    "production_plan",
+    "production_plan_item",
+    "product_bundle_item",
+    "amended_from"
+   ],
+   "fields": [
+    {
+     "fieldname": "item",
+     "fieldtype": "Section Break",
+     "options": "fa fa-gift"
+    },
+    {
+     "fieldname": "naming_series",
+     "fieldtype": "Select",
+     "label": "Series",
+     "options": "MFG-WO-.YYYY.-",
+     "print_hide": 1,
+     "reqd": 1,
+     "set_only_once": 1
+    },
+    {
+     "default": "Draft",
+     "depends_on": "eval:!doc.__islocal",
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "label": "Status",
+     "no_copy": 1,
+     "oldfieldname": "status",
+     "oldfieldtype": "Select",
+     "options": "\nDraft\nSubmitted\nNot Started\nIn Process\nCompleted\nStopped\nCancelled",
+     "read_only": 1,
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "production_item",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "in_list_view": 1,
+     "in_standard_filter": 1,
+     "label": "Item To Manufacture",
+     "oldfieldname": "production_item",
+     "oldfieldtype": "Link",
+     "options": "Item",
+     "reqd": 1
+    },
+    {
+     "depends_on": "eval:doc.production_item",
+     "fieldname": "item_name",
+     "fieldtype": "Data",
+     "label": "Item Name",
+     "read_only": 1
+    },
+    {
+     "fetch_from": "production_item.image",
+     "fieldname": "image",
+     "fieldtype": "Attach Image",
+     "hidden": 1,
+     "label": "Image",
+     "options": "image",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "bom_no",
+     "fieldtype": "Link",
+     "label": "BOM No",
+     "oldfieldname": "bom_no",
+     "oldfieldtype": "Link",
+     "options": "BOM",
+     "reqd": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "allow_alternative_item",
+     "fieldtype": "Check",
+     "label": "Allow Alternative Item"
+    },
+    {
+     "default": "1",
+     "description": "Plan material for sub-assemblies",
+     "fieldname": "use_multi_level_bom",
+     "fieldtype": "Check",
+     "label": "Use Multi-Level BOM",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "description": "Check if material transfer entry is not required",
+     "fieldname": "skip_transfer",
+     "fieldtype": "Check",
+     "label": "Skip Material Transfer to WIP Warehouse"
+    },
+    {
+     "fieldname": "column_break1",
+     "fieldtype": "Column Break",
+     "oldfieldtype": "Column Break",
+     "width": "50%"
+    },
+    {
+     "fieldname": "company",
+     "fieldtype": "Link",
+     "label": "Company",
+     "oldfieldname": "company",
+     "oldfieldtype": "Link",
+     "options": "Company",
+     "remember_last_selected_value": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "qty",
+     "fieldtype": "Float",
+     "label": "Qty To Manufacture",
+     "oldfieldname": "qty",
+     "oldfieldtype": "Currency",
+     "reqd": 1
+    },
+    {
+     "default": "0",
+     "depends_on": "eval:doc.docstatus==1 && doc.skip_transfer==0",
+     "fieldname": "material_transferred_for_manufacturing",
+     "fieldtype": "Float",
+     "label": "Material Transferred for Manufacturing",
+     "no_copy": 1,
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "depends_on": "eval:doc.docstatus==1",
+     "fieldname": "produced_qty",
+     "fieldtype": "Float",
+     "label": "Manufactured Qty",
+     "no_copy": 1,
+     "oldfieldname": "produced_qty",
+     "oldfieldtype": "Currency",
+     "read_only": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "sales_order",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "label": "Sales Order",
+     "options": "Sales Order"
+    },
+    {
+     "fieldname": "project",
+     "fieldtype": "Link",
+     "label": "Project",
+     "oldfieldname": "project",
+     "oldfieldtype": "Link",
+     "options": "Project"
+    },
+    {
+     "default": "0",
+     "depends_on": "skip_transfer",
+     "fieldname": "from_wip_warehouse",
+     "fieldtype": "Check",
+     "label": "Backflush Raw Materials From Work-in-Progress Warehouse"
+    },
+    {
+     "fieldname": "warehouses",
+     "fieldtype": "Section Break",
+     "label": "Warehouses",
+     "options": "fa fa-building"
+    },
+    {
+     "fieldname": "wip_warehouse",
+     "fieldtype": "Link",
+     "label": "Work-in-Progress Warehouse",
+     "options": "Warehouse"
+    },
+    {
+     "fieldname": "fg_warehouse",
+     "fieldtype": "Link",
+     "label": "Target Warehouse",
+     "options": "Warehouse"
+    },
+    {
+     "fieldname": "column_break_12",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "scrap_warehouse",
+     "fieldtype": "Link",
+     "label": "Scrap Warehouse",
+     "options": "Warehouse"
+    },
+    {
+     "fieldname": "required_items_section",
+     "fieldtype": "Section Break",
+     "label": "Required Items"
+    },
+    {
+     "fieldname": "required_items",
+     "fieldtype": "Table",
+     "label": "Required Items",
+     "no_copy": 1,
+     "options": "Work Order Item",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "time",
+     "fieldtype": "Section Break",
+     "label": "Time",
+     "options": "fa fa-time"
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "now",
+     "fieldname": "planned_start_date",
+     "fieldtype": "Datetime",
+     "label": "Planned Start Date",
+     "reqd": 1
+    },
+    {
+     "fieldname": "actual_start_date",
+     "fieldtype": "Datetime",
+     "label": "Actual Start Date",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_13",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "planned_end_date",
+     "fieldtype": "Datetime",
+     "label": "Planned End Date",
+     "no_copy": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "actual_end_date",
+     "fieldtype": "Datetime",
+     "label": "Actual End Date",
+     "read_only": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "expected_delivery_date",
+     "fieldtype": "Date",
+     "label": "Expected Delivery Date"
+    },
+    {
+     "fieldname": "operations_section",
+     "fieldtype": "Section Break",
+     "label": "Operations",
+     "options": "fa fa-wrench"
+    },
+    {
+     "default": "Work Order",
+     "depends_on": "operations",
+     "fieldname": "transfer_material_against",
+     "fieldtype": "Select",
+     "label": "Transfer Material Against",
+     "options": "\nWork Order\nJob Card"
+    },
+    {
+     "fieldname": "operations",
+     "fieldtype": "Table",
+     "label": "Operations",
+     "options": "Work Order Operation",
+     "read_only": 1
+    },
+    {
+     "depends_on": "operations",
+     "fieldname": "section_break_22",
+     "fieldtype": "Section Break",
+     "label": "Operation Cost"
+    },
+    {
+     "fieldname": "planned_operating_cost",
+     "fieldtype": "Currency",
+     "label": "Planned Operating Cost",
+     "options": "Company:company:default_currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "actual_operating_cost",
+     "fieldtype": "Currency",
+     "label": "Actual Operating Cost",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "additional_operating_cost",
+     "fieldtype": "Currency",
+     "label": "Additional Operating Cost",
+     "no_copy": 1,
+     "options": "Company:company:default_currency"
+    },
+    {
+     "fieldname": "column_break_24",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "total_operating_cost",
+     "fieldtype": "Currency",
+     "label": "Total Operating Cost",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "more_info",
+     "fieldtype": "Section Break",
+     "label": "More Information",
+     "options": "fa fa-file-text"
+    },
+    {
+     "fieldname": "description",
+     "fieldtype": "Small Text",
+     "label": "Item Description",
+     "read_only": 1
+    },
+    {
+     "fieldname": "stock_uom",
+     "fieldtype": "Link",
+     "label": "Stock UOM",
+     "oldfieldname": "stock_uom",
+     "oldfieldtype": "Data",
+     "options": "UOM",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break2",
+     "fieldtype": "Column Break",
+     "width": "50%"
+    },
+    {
+     "description": "Manufacture against Material Request",
+     "fieldname": "material_request",
+     "fieldtype": "Link",
+     "label": "Material Request",
+     "options": "Material Request"
+    },
+    {
+     "fieldname": "material_request_item",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Material Request Item",
+     "read_only": 1
+    },
+    {
+     "fieldname": "sales_order_item",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Sales Order Item",
+     "read_only": 1
+    },
+    {
+     "fieldname": "production_plan",
+     "fieldtype": "Link",
+     "label": "Production Plan",
+     "no_copy": 1,
+     "options": "Production Plan",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "production_plan_item",
+     "fieldtype": "Data",
+     "label": "Production Plan Item",
+     "no_copy": 1,
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "product_bundle_item",
+     "fieldtype": "Link",
+     "label": "Product Bundle Item",
+     "no_copy": 1,
+     "options": "Item",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "amended_from",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Amended From",
+     "no_copy": 1,
+     "oldfieldname": "amended_from",
+     "oldfieldtype": "Data",
+     "options": "Work Order",
+     "read_only": 1
+    }
+   ],
+   "icon": "fa fa-cogs",
+   "idx": 1,
+   "image_field": "image",
+   "is_submittable": 1,
+   "modified": "2019-05-27 09:36:16.707719",
+   "modified_by": "Administrator",
+   "module": "Manufacturing",
+   "name": "Work Order",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 1,
+     "import": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Manufacturing User",
+     "set_user_permissions": 1,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "read": 1,
+     "report": 1,
+     "role": "Stock User"
+    }
+   ],
+   "sort_order": "ASC",
+   "title_field": "production_item",
+   "track_changes": 1,
+   "track_seen": 1
+  }
\ No newline at end of file
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index 9ef8937..316d6de 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -22,4 +22,5 @@
 Non Profit
 Hotels
 Hub Node
-Quality Management
\ No newline at end of file
+Quality Management
+Communication
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 36a31cf..72db8ad 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -533,7 +533,7 @@
 erpnext.patches.v11_0.make_location_from_warehouse
 erpnext.patches.v11_0.make_asset_finance_book_against_old_entries
 erpnext.patches.v11_0.check_buying_selling_in_currency_exchange
-erpnext.patches.v11_0.move_item_defaults_to_child_table_for_multicompany #02-07-2018
+erpnext.patches.v11_0.move_item_defaults_to_child_table_for_multicompany #02-07-2018 #19-06-2019
 erpnext.patches.v11_0.refactor_erpnext_shopify #2018-09-07
 erpnext.patches.v11_0.rename_overproduction_percent_field
 erpnext.patches.v11_0.update_backflush_subcontract_rm_based_on_bom
@@ -569,7 +569,7 @@
 execute:frappe.delete_doc_if_exists("Page", "purchase-analytics")
 execute:frappe.delete_doc_if_exists("Page", "stock-analytics")
 execute:frappe.delete_doc_if_exists("Page", "production-analytics")
-erpnext.patches.v11_0.ewaybill_fields_gst_india #2019-05-01
+erpnext.patches.v11_0.ewaybill_fields_gst_india #2018-11-13 #2019-01-09 #2019-04-01 #2019-04-26 #2019-05-03
 erpnext.patches.v11_0.drop_column_max_days_allowed
 erpnext.patches.v10_0.update_user_image_in_employee
 erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
@@ -605,6 +605,13 @@
 erpnext.patches.v12_0.make_custom_fields_for_bank_remittance #14-06-2019
 execute:frappe.delete_doc_if_exists("Page", "support-analytics")
 erpnext.patches.v12_0.make_item_manufacturer
+erpnext.patches.v11_1.move_customer_lead_to_dynamic_column
+erpnext.patches.v11_1.set_default_action_for_quality_inspection
+erpnext.patches.v11_1.delete_bom_browser
+erpnext.patches.v11_1.set_missing_title_for_quotation
+erpnext.patches.v11_1.update_bank_transaction_status
+erpnext.patches.v11_1.renamed_delayed_item_report
+erpnext.patches.v11_1.set_missing_opportunity_from
 erpnext.patches.v12_0.set_quotation_status
 erpnext.patches.v12_0.set_priority_for_support
 erpnext.patches.v12_0.delete_priority_property_setter
diff --git a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
index 01f84a0..c7c7635 100644
--- a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
+++ b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
@@ -17,10 +17,8 @@
 	frappe.reload_doc('stock', 'doctype', 'item_default')
 	frappe.reload_doc('stock', 'doctype', 'item')
 
-	if frappe.db.a_row_exists('Item Default'): return
-
 	companies = frappe.get_all("Company")
-	if len(companies) == 1:
+	if len(companies) == 1 and not frappe.get_all("Item Default", limit=1):
 		try:
 			frappe.db.sql('''
 					INSERT INTO `tabItem Default`
@@ -35,32 +33,64 @@
 		except:
 			pass
 	else:
-		item_details = frappe.get_all("Item", fields=["name", "default_warehouse", "buying_cost_center",
-									"expense_account", "selling_cost_center", "income_account"], limit=100)
+		item_details = frappe.db.sql(""" SELECT name, default_warehouse,
+				buying_cost_center, expense_account, selling_cost_center, income_account
+			FROM tabItem
+			WHERE
+				name not in (select distinct parent from `tabItem Default`) and ifnull(disabled, 0) = 0"""
+		, as_dict=1)
 
-		for item in item_details:
-			item_defaults = []
+		items_default_data = {}
+		for item_data in item_details:
+			for d in [["default_warehouse", "Warehouse"], ["expense_account", "Account"],
+				["income_account", "Account"], ["buying_cost_center", "Cost Center"],
+				["selling_cost_center", "Cost Center"]]:
+				if item_data.get(d[0]):
+					company = frappe.get_value(d[1], item_data.get(d[0]), "company", cache=True)
 
-			def insert_into_item_defaults(doc_field_name, doc_field_value, company):
-				for d in item_defaults:
-					if d.get("company") == company:
-						d[doc_field_name] = doc_field_value
-						return
-				item_defaults.append({
-					"company": company,
-					doc_field_name: doc_field_value
-				})
+					if item_data.name not in items_default_data:
+						items_default_data[item_data.name] = {}
 
-			for d in [
-						["default_warehouse", "Warehouse"], ["expense_account", "Account"], ["income_account", "Account"],
-						["buying_cost_center", "Cost Center"], ["selling_cost_center", "Cost Center"]
-					]:
-				if item.get(d[0]):
-					company = frappe.get_value(d[1], item.get(d[0]), "company", cache=True)
-					insert_into_item_defaults(d[0], item.get(d[0]), company)
+					company_wise_data = items_default_data[item_data.name]
 
-			doc = frappe.get_doc("Item", item.name)
-			doc.extend("item_defaults", item_defaults)
+					if company not in company_wise_data:
+						company_wise_data[company] = {}
 
-			for child_doc in doc.item_defaults:
-				child_doc.db_insert()
\ No newline at end of file
+					default_data = company_wise_data[company]
+					default_data[d[0]] = item_data.get(d[0])
+
+		to_insert_data = []
+
+		# items_default_data data structure will be as follow
+		# {
+		# 	'item_code 1': {'company 1': {'default_warehouse': 'Test Warehouse 1'}},
+		# 	'item_code 2': {
+		# 		'company 1': {'default_warehouse': 'Test Warehouse 1'},
+		# 		'company 2': {'default_warehouse': 'Test Warehouse 1'}
+		# 	}
+		# }
+
+		for item_code, companywise_item_data in items_default_data.items():
+			for company, item_default_data in companywise_item_data.items():
+				to_insert_data.append((
+					frappe.generate_hash("", 10),
+					item_code,
+					'Item',
+					'item_defaults',
+					company,
+					item_default_data.get('default_warehouse'),
+					item_default_data.get('expense_account'),
+					item_default_data.get('income_account'),
+					item_default_data.get('buying_cost_center'),
+					item_default_data.get('selling_cost_center'),
+				))
+
+		if to_insert_data:
+			frappe.db.sql('''
+				INSERT INTO `tabItem Default`
+				(
+					`name`, `parent`, `parenttype`, `parentfield`, `company`, `default_warehouse`,
+					`expense_account`, `income_account`, `buying_cost_center`, `selling_cost_center`
+				)
+				VALUES {}
+			'''.format(', '.join(['%s'] * len(to_insert_data))), tuple(to_insert_data))
\ No newline at end of file
diff --git a/erpnext/patches/v11_1/delete_bom_browser.py b/erpnext/patches/v11_1/delete_bom_browser.py
new file mode 100644
index 0000000..457f511
--- /dev/null
+++ b/erpnext/patches/v11_1/delete_bom_browser.py
@@ -0,0 +1,8 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    frappe.delete_doc_if_exists('Page', 'bom-browser')
\ No newline at end of file
diff --git a/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py b/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
new file mode 100644
index 0000000..5b1251c
--- /dev/null
+++ b/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doctype("Quotation")
+	frappe.db.sql(""" UPDATE `tabQuotation` set party_name = lead WHERE quotation_to = 'Lead' """)
+	frappe.db.sql(""" UPDATE `tabQuotation` set party_name = customer WHERE quotation_to = 'Customer' """)
+
+	frappe.reload_doctype("Opportunity")
+	frappe.db.sql(""" UPDATE `tabOpportunity` set party_name = lead WHERE opportunity_from = 'Lead' """)
+	frappe.db.sql(""" UPDATE `tabOpportunity` set party_name = customer WHERE opportunity_from = 'Customer' """)
\ No newline at end of file
diff --git a/erpnext/patches/v11_1/renamed_delayed_item_report.py b/erpnext/patches/v11_1/renamed_delayed_item_report.py
new file mode 100644
index 0000000..222b9a0
--- /dev/null
+++ b/erpnext/patches/v11_1/renamed_delayed_item_report.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    for report in ["Delayed Order Item Summary", "Delayed Order Summary"]:
+        if frappe.db.exists("Report", report):
+            frappe.delete_doc("Report", report)
\ No newline at end of file
diff --git a/erpnext/patches/v11_1/set_default_action_for_quality_inspection.py b/erpnext/patches/v11_1/set_default_action_for_quality_inspection.py
new file mode 100644
index 0000000..b13239f
--- /dev/null
+++ b/erpnext/patches/v11_1/set_default_action_for_quality_inspection.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    stock_settings = frappe.get_doc('Stock Settings')
+    if stock_settings.default_warehouse and not frappe.db.exists("Warehouse", stock_settings.default_warehouse):
+        stock_settings.default_warehouse = None
+    if stock_settings.stock_uom and not frappe.db.exists("UOM", stock_settings.stock_uom):
+        stock_settings.stock_uom = None
+    stock_settings.flags.ignore_mandatory = True
+    stock_settings.action_if_quality_inspection_is_not_submitted = "Stop"
+    stock_settings.save()
diff --git a/erpnext/patches/v11_1/set_missing_opportunity_from.py b/erpnext/patches/v11_1/set_missing_opportunity_from.py
new file mode 100644
index 0000000..cb444b2
--- /dev/null
+++ b/erpnext/patches/v11_1/set_missing_opportunity_from.py
@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+
+	frappe.reload_doctype("Opportunity")
+	if frappe.db.has_column("Opportunity", "enquiry_from"):
+		frappe.db.sql(""" UPDATE `tabOpportunity` set opportunity_from = enquiry_from
+			where ifnull(opportunity_from, '') = '' and ifnull(enquiry_from, '') != ''""")
+
+	if frappe.db.has_column("Opportunity", "lead") and frappe.db.has_column("Opportunity", "enquiry_from"):
+		frappe.db.sql(""" UPDATE `tabOpportunity` set party_name = lead
+			where enquiry_from = 'Lead' and ifnull(party_name, '') = '' and ifnull(lead, '') != ''""")
+
+	if frappe.db.has_column("Opportunity", "customer") and frappe.db.has_column("Opportunity", "enquiry_from"):
+		frappe.db.sql(""" UPDATE `tabOpportunity` set party_name = customer
+			 where enquiry_from = 'Customer' and ifnull(party_name, '') = '' and ifnull(customer, '') != ''""")
diff --git a/erpnext/patches/v11_1/set_missing_title_for_quotation.py b/erpnext/patches/v11_1/set_missing_title_for_quotation.py
new file mode 100644
index 0000000..e2ef343
--- /dev/null
+++ b/erpnext/patches/v11_1/set_missing_title_for_quotation.py
@@ -0,0 +1,28 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("Quotation")
+	# update customer_name from Customer document if quotation_to is set to Customer
+	frappe.db.sql('''
+		update tabQuotation, tabCustomer
+		set
+			tabQuotation.customer_name = tabCustomer.customer_name,
+			tabQuotation.title = tabCustomer.customer_name
+		where
+			tabQuotation.customer_name is null
+			and tabQuotation.party_name = tabCustomer.name
+			and tabQuotation.quotation_to = 'Customer'
+	''')
+
+	# update customer_name from Lead document if quotation_to is set to Lead
+
+	frappe.db.sql('''
+		update tabQuotation, tabLead
+		set
+			tabQuotation.customer_name =  case when ifnull(tabLead.company_name, '') != '' then tabLead.company_name else tabLead.lead_name end,
+			tabQuotation.title = case when ifnull(tabLead.company_name, '') != '' then tabLead.company_name else tabLead.lead_name end
+		where
+			tabQuotation.customer_name is null
+			and tabQuotation.party_name = tabLead.name
+			and tabQuotation.quotation_to = 'Lead'
+	''')
diff --git a/erpnext/patches/v11_1/update_bank_transaction_status.py b/erpnext/patches/v11_1/update_bank_transaction_status.py
new file mode 100644
index 0000000..1acdfcc
--- /dev/null
+++ b/erpnext/patches/v11_1/update_bank_transaction_status.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+    frappe.reload_doc("accounts", "doctype", "bank_transaction")
+
+    frappe.db.sql(""" UPDATE `tabBank Transaction`
+        SET status = 'Reconciled'
+        WHERE
+            status = 'Settled' and (debit = allocated_amount or credit = allocated_amount)
+            and ifnull(allocated_amount, 0) > 0
+    """)
\ No newline at end of file
diff --git a/erpnext/patches/v12_0/make_custom_fields_for_bank_remittance.py b/erpnext/patches/v12_0/make_custom_fields_for_bank_remittance.py
index 9925b70..3d4a995 100644
--- a/erpnext/patches/v12_0/make_custom_fields_for_bank_remittance.py
+++ b/erpnext/patches/v12_0/make_custom_fields_for_bank_remittance.py
@@ -3,6 +3,8 @@
 from erpnext.regional.india.setup import make_custom_fields
 
 def execute():
+    frappe.reload_doc("accounts", "doctype", "tax_category")
+    frappe.reload_doc("stock", "doctype", "item_manufacturer")
     company = frappe.get_all('Company', filters = {'country': 'India'})
     if not company:
         return
diff --git a/erpnext/patches/v8_7/sync_india_custom_fields.py b/erpnext/patches/v8_7/sync_india_custom_fields.py
index e1ae0b7..80d66c2 100644
--- a/erpnext/patches/v8_7/sync_india_custom_fields.py
+++ b/erpnext/patches/v8_7/sync_india_custom_fields.py
@@ -8,10 +8,10 @@
 		return
 
 	frappe.reload_doc('hr', 'doctype', 'payroll_period')
-	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_declaration_category')
-	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_proof_submission_detail')
 	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_declaration')
 	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_proof_submission')
+	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_declaration_category')
+	frappe.reload_doc('hr', 'doctype', 'employee_tax_exemption_proof_submission_detail')
 
 	for doctype in ["Sales Invoice", "Delivery Note", "Purchase Invoice"]:
 		frappe.db.sql("""delete from `tabCustom Field` where dt = %s
diff --git a/erpnext/portal/product_configurator/item_variants_cache.py b/erpnext/portal/product_configurator/item_variants_cache.py
index f33c8d6..fc294ce 100644
--- a/erpnext/portal/product_configurator/item_variants_cache.py
+++ b/erpnext/portal/product_configurator/item_variants_cache.py
@@ -110,4 +110,4 @@
 def enqueue_build_cache(item_code):
 	if frappe.cache().hget('item_cache_build_in_progress', item_code):
 		return
-	frappe.enqueue(build_cache, item_code=item_code, queue='short')
+	frappe.enqueue(build_cache, item_code=item_code, queue='long')
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 75847d5..55a6892 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -30,13 +30,14 @@
 
 		self.update_costing()
 
-	def __setup__(self):
+	def before_print(self):
 		self.onload()
 
 	def load_tasks(self):
 		"""Load `tasks` from the database"""
 		if frappe.flags.in_import:
 			return
+		project_task_custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task"}, "fieldname")
 
 		self.tasks = []
 		for task in self.get_tasks():
@@ -50,7 +51,7 @@
 				"task_weight": task.task_weight
 			}
 
-			self.map_custom_fields(task, task_map)
+			self.map_custom_fields(task, task_map, project_task_custom_fields)
 
 			self.append("tasks", task_map)
 
@@ -76,7 +77,7 @@
 			self.copy_from_template()
 		self.validate_dates()
 		self.send_welcome_email()
-		self.update_percent_complete()
+		self.update_percent_complete(from_validate=True)
 
 	def copy_from_template(self):
 		'''
@@ -181,7 +182,7 @@
 					"task_weight": t.task_weight
 				})
 
-				self.map_custom_fields(t, task)
+				self.map_custom_fields(t, task, custom_fields)
 
 				task.flags.ignore_links = True
 				task.flags.from_project = True
@@ -205,10 +206,6 @@
 		for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}):
 			self.deleted_task_list.append(t.name)
 
-	def update_costing_and_percentage_complete(self):
-		self.update_percent_complete()
-		self.update_costing()
-
 	def is_row_updated(self, row, existing_task_data, fields):
 		if self.get("__islocal") or not existing_task_data: return True
 
@@ -218,10 +215,8 @@
 			if row.get(field) != d.get(field):
 				return True
 
-	def map_custom_fields(self, source, target):
-		project_task_custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task"}, "fieldname")
-
-		for field in project_task_custom_fields:
+	def map_custom_fields(self, source, target, custom_fields):
+		for field in custom_fields:
 			target.update({
 				field.fieldname: source.get(field.fieldname)
 			})
@@ -229,15 +224,13 @@
 	def update_project(self):
 		self.update_percent_complete()
 		self.update_costing()
-		self.flags.dont_sync_tasks = True
-		self.save(ignore_permissions=True)
 
 	def after_insert(self):
 		self.copy_from_template()
 		if self.sales_order:
 			frappe.db.set_value("Sales Order", self.sales_order, "project", self.name)
 
-	def update_percent_complete(self):
+	def update_percent_complete(self, from_validate=False):
 		if not self.tasks: return
 		total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0]
 
@@ -275,6 +268,9 @@
 		else:
 			self.status = "Open"
 
+		if not from_validate:
+			self.db_update()
+
 	def update_costing(self):
 		from_time_sheet = frappe.db.sql("""select
 			sum(costing_amount) as costing_amount,
@@ -301,6 +297,7 @@
 		self.update_sales_amount()
 		self.update_billed_amount()
 		self.calculate_gross_margin()
+		self.db_update()
 
 	def calculate_gross_margin(self):
 		expense_amount = (flt(self.total_costing_amount) + flt(self.total_expense_claim)
@@ -354,7 +351,7 @@
 	def on_update(self):
 		self.delete_task()
 		self.load_tasks()
-		self.update_costing_and_percentage_complete()
+		self.update_project()
 		self.update_dependencies_on_duplicated_project()
 
 	def delete_task(self):
@@ -648,7 +645,7 @@
 	set status for project and all related tasks
 	'''
 	if not status in ('Completed', 'Cancelled'):
-		frappe.throw('Status must be Cancelled or Completed')
+		frappe.throw(_('Status must be Cancelled or Completed'))
 
 	project = frappe.get_doc('Project', project)
 	frappe.has_permission(doc = project, throw = True)
@@ -658,4 +655,3 @@
 
 	project.status = status
 	project.save()
-
diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
index f0a3656..beb1f13 100644
--- a/erpnext/projects/doctype/project/test_project.py
+++ b/erpnext/projects/doctype/project/test_project.py
@@ -32,23 +32,6 @@
 		self.assertEqual(task4.title, 'Task 4')
 		self.assertEqual(getdate(task4.end_date), getdate('2019-01-06'))
 
-	def test_bulk_complete_and_cancel(self):
-		frappe.db.sql('delete from tabTask where project = "Test Project for Bulk Actions"')
-		frappe.delete_doc('Project', 'Test Project for Bulk Actions')
-
-		project = get_project('Test Project for Bulk Actions')
-		set_project_status(project.name, 'Completed')
-
-		# check all tasks are completed
-		self.assertTrue(all([d.status=='Completed' for d in
-			frappe.get_all('Task', ['name', 'status'], dict(project = project.name))]))
-
-		# check all tasks are cancelled
-		set_project_status(project.name, 'Cancelled')
-		self.assertTrue(all([d.status=='Cancelled' for d in
-			frappe.get_all('Task', ['name', 'status'], dict(project = project.name))]))
-
-
 def get_project(name):
 	template = get_project_template()
 
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 298efbf..489c7a3 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -19,7 +19,7 @@
 	},
 
 	refresh: function(frm) {
-		frm.fields_dict['parent_task'].get_query = function() {
+		frm.fields_dict['parent_task'].get_query = function () {
 			return {
 				filters: {
 					"is_group": 1,
@@ -27,8 +27,22 @@
 			}
 		}
 
-		if(!frm.doc.is_group){
+		if (!frm.doc.is_group) {
 			if (!frm.is_new()) {
+				if (frappe.model.can_read("Timesheet")) {
+					frm.add_custom_button(__("Timesheet"), () => {
+						frappe.route_options = { "project": frm.doc.project, "task": frm.doc.name }
+						frappe.set_route("List", "Timesheet");
+					}, __("View"), true);
+				}
+
+				if (frappe.model.can_read("Expense Claim")) {
+					frm.add_custom_button(__("Expense Claims"), () => {
+						frappe.route_options = { "project": frm.doc.project, "task": frm.doc.name };
+						frappe.set_route("List", "Expense Claim");
+					}, __("View"), true);
+				}
+
 				if (frm.perm[0].write) {
 					if (!["Closed", "Cancelled"].includes(frm.doc.status)) {
 						frm.add_custom_button(__("Close"), () => {
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 269d417..c5131c7 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -1,380 +1,381 @@
 {
- "allow_import": 1,
- "autoname": "TASK-.YYYY.-.#####",
- "creation": "2013-01-29 19:25:50",
- "doctype": "DocType",
- "document_type": "Setup",
- "field_order": [
-  "subject",
-  "project",
-  "issue",
-  "type",
-  "is_group",
-  "column_break0",
-  "status",
-  "priority",
-  "task_weight",
-  "color",
-  "parent_task",
-  "sb_timeline",
-  "exp_start_date",
-  "expected_time",
-  "column_break_11",
-  "exp_end_date",
-  "progress",
-  "is_milestone",
-  "sb_details",
-  "description",
-  "sb_depends_on",
-  "depends_on",
-  "depends_on_tasks",
-  "sb_actual",
-  "act_start_date",
-  "actual_time",
-  "column_break_15",
-  "act_end_date",
-  "sb_costing",
-  "total_costing_amount",
-  "total_expense_claim",
-  "column_break_20",
-  "total_billing_amount",
-  "sb_more_info",
-  "review_date",
-  "closing_date",
-  "column_break_22",
-  "department",
-  "company",
-  "lft",
-  "rgt",
-  "old_parent"
- ],
- "fields": [
-  {
-   "fieldname": "subject",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Subject",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Project",
-   "oldfieldname": "project",
-   "oldfieldtype": "Link",
-   "options": "Project",
-   "remember_last_selected_value": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "issue",
-   "fieldtype": "Link",
-   "label": "Issue",
-   "options": "Issue"
-  },
-  {
-   "fieldname": "type",
-   "fieldtype": "Link",
-   "label": "Type",
-   "options": "Task Type"
-  },
-  {
-   "bold": 1,
-   "default": "0",
-   "fieldname": "is_group",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Is Group"
-  },
-  {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_width": "50%",
-   "width": "50%"
-  },
-  {
-   "bold": 1,
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Status",
-   "no_copy": 1,
-   "oldfieldname": "status",
-   "oldfieldtype": "Select",
-   "options": "Open\nWorking\nPending Review\nOverdue\nCompleted\nCancelled"
-  },
-  {
-   "fieldname": "priority",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Priority",
-   "oldfieldname": "priority",
-   "oldfieldtype": "Select",
-   "options": "Low\nMedium\nHigh\nUrgent",
-   "search_index": 1
-  },
-  {
-   "fieldname": "color",
-   "fieldtype": "Color",
-   "label": "Color"
-  },
-  {
-   "bold": 1,
-   "fieldname": "parent_task",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Parent Task",
-   "options": "Task",
-   "search_index": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.__islocal",
-   "fieldname": "sb_timeline",
-   "fieldtype": "Section Break",
-   "label": "Timeline"
-  },
-  {
-   "fieldname": "exp_start_date",
-   "fieldtype": "Date",
-   "label": "Expected Start Date",
-   "oldfieldname": "exp_start_date",
-   "oldfieldtype": "Date"
-  },
-  {
-   "default": "0",
-   "fieldname": "expected_time",
-   "fieldtype": "Float",
-   "label": "Expected Time (in hours)",
-   "oldfieldname": "exp_total_hrs",
-   "oldfieldtype": "Data"
-  },
-  {
-   "fetch_from": "type.weight",
-   "fieldname": "task_weight",
-   "fieldtype": "Float",
-   "label": "Weight"
-  },
-  {
-   "fieldname": "column_break_11",
-   "fieldtype": "Column Break"
-  },
-  {
-   "bold": 1,
-   "fieldname": "exp_end_date",
-   "fieldtype": "Date",
-   "label": "Expected End Date",
-   "oldfieldname": "exp_end_date",
-   "oldfieldtype": "Date",
-   "search_index": 1
-  },
-  {
-   "fieldname": "progress",
-   "fieldtype": "Percent",
-   "label": "% Progress"
-  },
-  {
-   "fieldname": "is_milestone",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Is Milestone"
-  },
-  {
-   "fieldname": "sb_details",
-   "fieldtype": "Section Break",
-   "label": "Details",
-   "oldfieldtype": "Section Break"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "in_preview": 1,
-   "label": "Task Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Text Editor",
-   "print_width": "300px",
-   "width": "300px"
-  },
-  {
-   "fieldname": "sb_depends_on",
-   "fieldtype": "Section Break",
-   "label": "Dependencies",
-   "oldfieldtype": "Section Break"
-  },
-  {
-   "fieldname": "depends_on",
-   "fieldtype": "Table",
-   "label": "Dependent Tasks",
-   "options": "Task Depends On"
-  },
-  {
-   "fieldname": "depends_on_tasks",
-   "fieldtype": "Code",
-   "hidden": 1,
-   "label": "Depends on Tasks",
-   "read_only": 1
-  },
-  {
-   "fieldname": "sb_actual",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Column Break",
-   "print_width": "50%",
-   "width": "50%"
-  },
-  {
-   "fieldname": "act_start_date",
-   "fieldtype": "Date",
-   "label": "Actual Start Date (via Time Sheet)",
-   "oldfieldname": "act_start_date",
-   "oldfieldtype": "Date",
-   "read_only": 1
-  },
-  {
-   "fieldname": "actual_time",
-   "fieldtype": "Float",
-   "label": "Actual Time (in hours)",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_15",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "act_end_date",
-   "fieldtype": "Date",
-   "label": "Actual End Date (via Time Sheet)",
-   "oldfieldname": "act_end_date",
-   "oldfieldtype": "Date",
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sb_costing",
-   "fieldtype": "Section Break",
-   "label": "Costing"
-  },
-  {
-   "fieldname": "total_costing_amount",
-   "fieldtype": "Currency",
-   "label": "Total Costing Amount (via Time Sheet)",
-   "oldfieldname": "actual_budget",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_expense_claim",
-   "fieldtype": "Currency",
-   "label": "Total Expense Claim (via Expense Claim)",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_20",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_billing_amount",
-   "fieldtype": "Currency",
-   "label": "Total Billing Amount (via Time Sheet)",
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sb_more_info",
-   "fieldtype": "Section Break",
-   "label": "More Info"
-  },
-  {
-   "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"",
-   "fieldname": "review_date",
-   "fieldtype": "Date",
-   "label": "Review Date",
-   "oldfieldname": "review_date",
-   "oldfieldtype": "Date"
-  },
-  {
-   "depends_on": "eval:doc.status == \"Closed\"",
-   "fieldname": "closing_date",
-   "fieldtype": "Date",
-   "label": "Closing Date",
-   "oldfieldname": "closing_date",
-   "oldfieldtype": "Date"
-  },
-  {
-   "fieldname": "column_break_22",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "label": "Department",
-   "options": "Department"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "remember_last_selected_value": 1
-  },
-  {
-   "fieldname": "lft",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "lft",
-   "read_only": 1
-  },
-  {
-   "fieldname": "rgt",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "rgt",
-   "read_only": 1
-  },
-  {
-   "fieldname": "old_parent",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "ignore_user_permissions": 1,
-   "label": "Old Parent",
-   "read_only": 1
-  }
- ],
- "icon": "fa fa-check",
- "idx": 1,
- "max_attachments": 5,
- "modified": "2019-05-16 09:51:15.599416",
- "modified_by": "Administrator",
- "module": "Projects",
- "name": "Task",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Projects User",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "subject",
- "show_name_in_global_search": 1,
- "show_preview_popup": 1,
- "sort_order": "DESC",
- "timeline_field": "project",
- "title_field": "subject",
- "track_seen": 1
-}
\ No newline at end of file
+  "allow_import": 1,
+  "autoname": "TASK-.YYYY.-.#####",
+  "creation": "2013-01-29 19:25:50",
+  "doctype": "DocType",
+  "document_type": "Setup",
+  "field_order": [
+   "subject",
+   "project",
+   "issue",
+   "type",
+   "is_group",
+   "column_break0",
+   "status",
+   "priority",
+   "task_weight",
+   "color",
+   "parent_task",
+   "sb_timeline",
+   "exp_start_date",
+   "expected_time",
+   "column_break_11",
+   "exp_end_date",
+   "progress",
+   "is_milestone",
+   "sb_details",
+   "description",
+   "sb_depends_on",
+   "depends_on",
+   "depends_on_tasks",
+   "sb_actual",
+   "act_start_date",
+   "actual_time",
+   "column_break_15",
+   "act_end_date",
+   "sb_costing",
+   "total_costing_amount",
+   "total_expense_claim",
+   "column_break_20",
+   "total_billing_amount",
+   "sb_more_info",
+   "review_date",
+   "closing_date",
+   "column_break_22",
+   "department",
+   "company",
+   "lft",
+   "rgt",
+   "old_parent"
+  ],
+  "fields": [
+   {
+    "fieldname": "subject",
+    "fieldtype": "Data",
+    "in_global_search": 1,
+    "label": "Subject",
+    "reqd": 1,
+    "search_index": 1,
+    "in_standard_filter": 1
+   },
+   {
+    "bold": 1,
+    "fieldname": "project",
+    "fieldtype": "Link",
+    "in_global_search": 1,
+    "in_list_view": 1,
+    "in_standard_filter": 1,
+    "label": "Project",
+    "oldfieldname": "project",
+    "oldfieldtype": "Link",
+    "options": "Project",
+    "remember_last_selected_value": 1,
+    "search_index": 1
+   },
+   {
+    "fieldname": "issue",
+    "fieldtype": "Link",
+    "label": "Issue",
+    "options": "Issue"
+   },
+   {
+    "fieldname": "type",
+    "fieldtype": "Link",
+    "label": "Type",
+    "options": "Task Type"
+   },
+   {
+    "bold": 1,
+    "default": "0",
+    "fieldname": "is_group",
+    "fieldtype": "Check",
+    "in_list_view": 1,
+    "label": "Is Group"
+   },
+   {
+    "fieldname": "column_break0",
+    "fieldtype": "Column Break",
+    "oldfieldtype": "Column Break",
+    "print_width": "50%",
+    "width": "50%"
+   },
+   {
+    "bold": 1,
+    "fieldname": "status",
+    "fieldtype": "Select",
+    "in_list_view": 1,
+    "in_standard_filter": 1,
+    "label": "Status",
+    "no_copy": 1,
+    "oldfieldname": "status",
+    "oldfieldtype": "Select",
+    "options": "Open\nWorking\nPending Review\nOverdue\nCompleted\nCancelled"
+   },
+   {
+    "fieldname": "priority",
+    "fieldtype": "Select",
+    "in_list_view": 1,
+    "in_standard_filter": 1,
+    "label": "Priority",
+    "oldfieldname": "priority",
+    "oldfieldtype": "Select",
+    "options": "Low\nMedium\nHigh\nUrgent",
+    "search_index": 1
+   },
+   {
+    "fieldname": "color",
+    "fieldtype": "Color",
+    "label": "Color"
+   },
+   {
+    "bold": 1,
+    "fieldname": "parent_task",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Parent Task",
+    "options": "Task",
+    "search_index": 1
+   },
+   {
+    "collapsible": 1,
+    "collapsible_depends_on": "eval:doc.__islocal",
+    "fieldname": "sb_timeline",
+    "fieldtype": "Section Break",
+    "label": "Timeline"
+   },
+   {
+    "fieldname": "exp_start_date",
+    "fieldtype": "Date",
+    "label": "Expected Start Date",
+    "oldfieldname": "exp_start_date",
+    "oldfieldtype": "Date"
+   },
+   {
+    "default": "0",
+    "fieldname": "expected_time",
+    "fieldtype": "Float",
+    "label": "Expected Time (in hours)",
+    "oldfieldname": "exp_total_hrs",
+    "oldfieldtype": "Data"
+   },
+   {
+    "fetch_from": "type.weight",
+    "fieldname": "task_weight",
+    "fieldtype": "Float",
+    "label": "Weight"
+   },
+   {
+    "fieldname": "column_break_11",
+    "fieldtype": "Column Break"
+   },
+   {
+    "bold": 1,
+    "fieldname": "exp_end_date",
+    "fieldtype": "Date",
+    "label": "Expected End Date",
+    "oldfieldname": "exp_end_date",
+    "oldfieldtype": "Date",
+    "search_index": 1
+   },
+   {
+    "fieldname": "progress",
+    "fieldtype": "Percent",
+    "label": "% Progress"
+   },
+   {
+    "fieldname": "is_milestone",
+    "fieldtype": "Check",
+    "in_list_view": 1,
+    "label": "Is Milestone"
+   },
+   {
+    "fieldname": "sb_details",
+    "fieldtype": "Section Break",
+    "label": "Details",
+    "oldfieldtype": "Section Break"
+   },
+   {
+    "fieldname": "description",
+    "fieldtype": "Text Editor",
+    "in_preview": 1,
+    "label": "Task Description",
+    "oldfieldname": "description",
+    "oldfieldtype": "Text Editor",
+    "print_width": "300px",
+    "width": "300px"
+   },
+   {
+    "fieldname": "sb_depends_on",
+    "fieldtype": "Section Break",
+    "label": "Dependencies",
+    "oldfieldtype": "Section Break"
+   },
+   {
+    "fieldname": "depends_on",
+    "fieldtype": "Table",
+    "label": "Dependent Tasks",
+    "options": "Task Depends On"
+   },
+   {
+    "fieldname": "depends_on_tasks",
+    "fieldtype": "Code",
+    "hidden": 1,
+    "label": "Depends on Tasks",
+    "read_only": 1
+   },
+   {
+    "fieldname": "sb_actual",
+    "fieldtype": "Section Break",
+    "oldfieldtype": "Column Break",
+    "print_width": "50%",
+    "width": "50%"
+   },
+   {
+    "fieldname": "act_start_date",
+    "fieldtype": "Date",
+    "label": "Actual Start Date (via Time Sheet)",
+    "oldfieldname": "act_start_date",
+    "oldfieldtype": "Date",
+    "read_only": 1
+   },
+   {
+    "fieldname": "actual_time",
+    "fieldtype": "Float",
+    "label": "Actual Time (in hours)",
+    "read_only": 1
+   },
+   {
+    "fieldname": "column_break_15",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "act_end_date",
+    "fieldtype": "Date",
+    "label": "Actual End Date (via Time Sheet)",
+    "oldfieldname": "act_end_date",
+    "oldfieldtype": "Date",
+    "read_only": 1
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "sb_costing",
+    "fieldtype": "Section Break",
+    "label": "Costing"
+   },
+   {
+    "fieldname": "total_costing_amount",
+    "fieldtype": "Currency",
+    "label": "Total Costing Amount (via Time Sheet)",
+    "oldfieldname": "actual_budget",
+    "oldfieldtype": "Currency",
+    "options": "Company:company:default_currency",
+    "read_only": 1
+   },
+   {
+    "fieldname": "total_expense_claim",
+    "fieldtype": "Currency",
+    "label": "Total Expense Claim (via Expense Claim)",
+    "options": "Company:company:default_currency",
+    "read_only": 1
+   },
+   {
+    "fieldname": "column_break_20",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "total_billing_amount",
+    "fieldtype": "Currency",
+    "label": "Total Billing Amount (via Time Sheet)",
+    "read_only": 1
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "sb_more_info",
+    "fieldtype": "Section Break",
+    "label": "More Info"
+   },
+   {
+    "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"",
+    "fieldname": "review_date",
+    "fieldtype": "Date",
+    "label": "Review Date",
+    "oldfieldname": "review_date",
+    "oldfieldtype": "Date"
+   },
+   {
+    "depends_on": "eval:doc.status == \"Closed\"",
+    "fieldname": "closing_date",
+    "fieldtype": "Date",
+    "label": "Closing Date",
+    "oldfieldname": "closing_date",
+    "oldfieldtype": "Date"
+   },
+   {
+    "fieldname": "column_break_22",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "department",
+    "fieldtype": "Link",
+    "label": "Department",
+    "options": "Department"
+   },
+   {
+    "fieldname": "company",
+    "fieldtype": "Link",
+    "label": "Company",
+    "options": "Company",
+    "remember_last_selected_value": 1
+   },
+   {
+    "fieldname": "lft",
+    "fieldtype": "Int",
+    "hidden": 1,
+    "label": "lft",
+    "read_only": 1
+   },
+   {
+    "fieldname": "rgt",
+    "fieldtype": "Int",
+    "hidden": 1,
+    "label": "rgt",
+    "read_only": 1
+   },
+   {
+    "fieldname": "old_parent",
+    "fieldtype": "Data",
+    "hidden": 1,
+    "ignore_user_permissions": 1,
+    "label": "Old Parent",
+    "read_only": 1
+   }
+  ],
+  "icon": "fa fa-check",
+  "idx": 1,
+  "max_attachments": 5,
+  "modified": "2019-06-19 09:51:15.599416",
+  "modified_by": "Administrator",
+  "module": "Projects",
+  "name": "Task",
+  "owner": "Administrator",
+  "permissions": [
+   {
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Projects User",
+    "share": 1,
+    "write": 1
+   }
+  ],
+  "search_fields": "subject",
+  "show_name_in_global_search": 1,
+  "show_preview_popup": 1,
+  "sort_order": "DESC",
+  "timeline_field": "project",
+  "title_field": "subject",
+  "track_seen": 1
+ }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index b5e4ff8..d8fc199 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -164,7 +164,6 @@
 				if task.get('task_id') == self.name:
 					frappe.delete_doc('Project Task', task.name)
 
-
 		self.update_nsm_model()
 
 	def update_status(self):
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index be7189b..1490374 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -1,7 +1,8 @@
 {
     "css/erpnext.css": [
         "public/less/erpnext.less",
-        "public/less/hub.less"
+        "public/less/hub.less",
+        "public/less/call_popup.less"
     ],
     "css/marketplace.css": [
         "public/less/hub.less"
@@ -13,42 +14,43 @@
 	"css/erpnext-web.css": [
         "public/scss/website.scss"
 	],
-    "js/marketplace.min.js": [
-        "public/js/hub/marketplace.js"
-    ],
-    "js/erpnext.min.js": [
-        "public/js/conf.js",
-        "public/js/utils.js",
-        "public/js/queries.js",
-        "public/js/sms_manager.js",
-        "public/js/utils/party.js",
-        "public/js/templates/address_list.html",
-        "public/js/templates/contact_list.html",
-        "public/js/controllers/stock_controller.js",
-        "public/js/payment/payments.js",
-        "public/js/controllers/taxes_and_totals.js",
-        "public/js/controllers/transaction.js",
-        "public/js/pos/pos.html",
-        "public/js/pos/pos_bill_item.html",
-        "public/js/pos/pos_bill_item_new.html",
-        "public/js/pos/pos_selected_item.html",
-        "public/js/pos/pos_item.html",
-        "public/js/pos/pos_tax_row.html",
-        "public/js/pos/customer_toolbar.html",
-        "public/js/pos/pos_invoice_list.html",
-        "public/js/payment/pos_payment.html",
-        "public/js/payment/payment_details.html",
-        "public/js/templates/item_selector.html",
+	"js/marketplace.min.js": [
+		"public/js/hub/marketplace.js"
+	],
+	"js/erpnext.min.js": [
+		"public/js/conf.js",
+		"public/js/utils.js",
+		"public/js/queries.js",
+		"public/js/sms_manager.js",
+		"public/js/utils/party.js",
+		"public/js/templates/address_list.html",
+		"public/js/templates/contact_list.html",
+		"public/js/controllers/stock_controller.js",
+		"public/js/payment/payments.js",
+		"public/js/controllers/taxes_and_totals.js",
+		"public/js/controllers/transaction.js",
+		"public/js/pos/pos.html",
+		"public/js/pos/pos_bill_item.html",
+		"public/js/pos/pos_bill_item_new.html",
+		"public/js/pos/pos_selected_item.html",
+		"public/js/pos/pos_item.html",
+		"public/js/pos/pos_tax_row.html",
+		"public/js/pos/customer_toolbar.html",
+		"public/js/pos/pos_invoice_list.html",
+		"public/js/payment/pos_payment.html",
+		"public/js/payment/payment_details.html",
+		"public/js/templates/item_selector.html",
 		"public/js/templates/employees_to_mark_attendance.html",
-        "public/js/utils/item_selector.js",
-        "public/js/help_links.js",
-        "public/js/agriculture/ternary_plot.js",
-        "public/js/templates/item_quick_entry.html",
-        "public/js/utils/item_quick_entry.js",
+		"public/js/utils/item_selector.js",
+		"public/js/help_links.js",
+		"public/js/agriculture/ternary_plot.js",
+		"public/js/templates/item_quick_entry.html",
+		"public/js/utils/item_quick_entry.js",
 		"public/js/utils/customer_quick_entry.js",
         "public/js/education/student_button.html",
         "public/js/education/assessment_result_tool.html",
         "public/js/hub/hub_factory.js",
+        "public/js/call_popup/call_popup.js",
         "public/js/utils/dimension_tree_filter.js"
     ],
     "js/item-dashboard.min.js": [
diff --git a/erpnext/public/js/call_popup/call_popup.js b/erpnext/public/js/call_popup/call_popup.js
new file mode 100644
index 0000000..91dfe80
--- /dev/null
+++ b/erpnext/public/js/call_popup/call_popup.js
@@ -0,0 +1,212 @@
+class CallPopup {
+	constructor(call_log) {
+		this.caller_number = call_log.from;
+		this.call_log = call_log;
+		this.setup_listener();
+		this.make();
+	}
+
+	make() {
+		this.dialog = new frappe.ui.Dialog({
+			'static': true,
+			'minimizable': true,
+			'fields': [{
+				'fieldname': 'caller_info',
+				'fieldtype': 'HTML'
+			}, {
+				'fielname': 'last_interaction',
+				'fieldtype': 'Section Break',
+				'label': __('Activity'),
+			}, {
+				'fieldtype': 'Small Text',
+				'label': __('Last Communication'),
+				'fieldname': 'last_communication',
+				'read_only': true,
+				'default': `<i class="text-muted">${__('No communication found.')}<i>`
+			}, {
+				'fieldtype': 'Small Text',
+				'label': __('Last Issue'),
+				'fieldname': 'last_issue',
+				'read_only': true,
+				'default': `<i class="text-muted">${__('No issue raised by the customer.')}<i>`
+			}, {
+				'fieldtype': 'Column Break',
+			}, {
+				'fieldtype': 'Small Text',
+				'label': __('Call Summary'),
+				'fieldname': 'call_summary',
+			}, {
+				'fieldtype': 'Button',
+				'label': __('Save'),
+				'click': () => {
+					const call_summary = this.dialog.get_value('call_summary');
+					if (!call_summary) return;
+					frappe.xcall('erpnext.crm.doctype.utils.add_call_summary', {
+						'docname': this.call_log.id,
+						'summary': call_summary,
+					}).then(() => {
+						this.close_modal();
+						frappe.show_alert({
+							message: `${__('Call Summary Saved')}<br><a class="text-small text-muted" href="#Form/Call Log/${this.call_log.name}">${__('View call log')}</a>`,
+							indicator: 'green'
+						});
+					});
+				}
+			}],
+		});
+		this.set_call_status();
+		this.make_caller_info_section();
+		this.dialog.get_close_btn().show();
+		this.dialog.$body.addClass('call-popup');
+		this.dialog.set_secondary_action(this.close_modal.bind(this));
+		frappe.utils.play_sound('incoming-call');
+		this.dialog.show();
+	}
+
+	make_caller_info_section() {
+		const wrapper = this.dialog.get_field('caller_info').$wrapper;
+		wrapper.append(`<div class="text-muted"> ${__("Loading...")} </div>`);
+		frappe.xcall('erpnext.crm.doctype.utils.get_document_with_phone_number', {
+			'number': this.caller_number
+		}).then(contact_doc => {
+			wrapper.empty();
+			const contact = this.contact = contact_doc;
+			if (!contact) {
+				this.setup_unknown_caller(wrapper);
+			} else {
+				this.setup_known_caller(wrapper);
+				this.set_call_status();
+				this.make_last_interaction_section();
+			}
+		});
+	}
+
+	setup_unknown_caller(wrapper) {
+		wrapper.append(`
+			<div class="caller-info">
+				<b>${__('Unknown Number')}:</b> ${this.caller_number}
+				<button
+					class="margin-left btn btn-new btn-default btn-xs"
+					data-doctype="Contact"
+					title=${__("Make New Contact")}>
+					<i class="octicon octicon-plus text-medium"></i>
+				</button>
+			</div>
+		`).find('button').click(
+			() => frappe.set_route(`Form/Contact/New Contact?phone=${this.caller_number}`)
+		);
+	}
+
+	setup_known_caller(wrapper) {
+		const contact = this.contact;
+		const contact_name = frappe.utils.get_form_link(contact.doctype, contact.name, true, this.get_caller_name());
+		const links = contact.links ? contact.links : [];
+
+		let contact_links = '';
+
+		links.forEach(link => {
+			contact_links += `<div>${link.link_doctype}: ${frappe.utils.get_form_link(link.link_doctype, link.link_name, true)}</div>`;
+		});
+		wrapper.append(`
+			<div class="caller-info flex">
+				${frappe.avatar(null, 'avatar-xl', contact.name, contact.image)}
+				<div>
+					<h5>${contact_name}</h5>
+					<div>${contact.mobile_no || ''}</div>
+					<div>${contact.phone_no || ''}</div>
+					${contact_links}
+				</div>
+			</div>
+		`);
+	}
+
+	set_indicator(color, blink=false) {
+		let classes = `indicator ${color} ${blink ? 'blink': ''}`;
+		this.dialog.header.find('.indicator').attr('class', classes);
+	}
+
+	set_call_status(call_status) {
+		let title = '';
+		call_status = call_status || this.call_log.status;
+		if (['Ringing'].includes(call_status) || !call_status) {
+			title = __('Incoming call from {0}', [this.get_caller_name()]);
+			this.set_indicator('blue', true);
+		} else if (call_status === 'In Progress') {
+			title = __('Call Connected');
+			this.set_indicator('yellow');
+		} else if (call_status === 'Missed') {
+			this.set_indicator('red');
+			title = __('Call Missed');
+		} else if (['Completed', 'Disconnected'].includes(call_status)) {
+			this.set_indicator('red');
+			title = __('Call Disconnected');
+		} else {
+			this.set_indicator('blue');
+			title = call_status;
+		}
+		this.dialog.set_title(title);
+	}
+
+	update_call_log(call_log) {
+		this.call_log = call_log;
+		this.set_call_status();
+	}
+
+	close_modal() {
+		this.dialog.hide();
+		delete erpnext.call_popup;
+	}
+
+	call_disconnected(call_log) {
+		frappe.utils.play_sound('call-disconnect');
+		this.update_call_log(call_log);
+		setTimeout(() => {
+			if (!this.dialog.get_value('call_summary')) {
+				this.close_modal();
+			}
+		}, 10000);
+	}
+
+	make_last_interaction_section() {
+		frappe.xcall('erpnext.crm.doctype.utils.get_last_interaction', {
+			'number': this.caller_number,
+			'reference_doc': this.contact
+		}).then(data => {
+			const comm_field = this.dialog.get_field('last_communication');
+			if (data.last_communication) {
+				const comm = data.last_communication;
+				comm_field.set_value(comm.content);
+			}
+
+			if (data.last_issue) {
+				const issue = data.last_issue;
+				const issue_field = this.dialog.get_field("last_issue");
+				issue_field.set_value(issue.subject);
+				issue_field.$wrapper.append(`<a class="text-medium" href="#List/Issue?customer=${issue.customer}">
+					${__('View all issues from {0}', [issue.customer])}
+				</a>`);
+			}
+		});
+	}
+	get_caller_name() {
+		return this.contact ? this.contact.lead_name || this.contact.name || '' : this.caller_number;
+	}
+	setup_listener() {
+		frappe.realtime.on(`call_${this.call_log.id}_disconnected`, call_log => {
+			this.call_disconnected(call_log);
+			// Remove call disconnect listener after the call is disconnected
+			frappe.realtime.off(`call_${this.call_log.id}_disconnected`);
+		});
+	}
+}
+
+$(document).on('app_ready', function () {
+	frappe.realtime.on('show_call_popup', call_log => {
+		if (!erpnext.call_popup) {
+			erpnext.call_popup = new CallPopup(call_log);
+		} else {
+			erpnext.call_popup.update_call_log(call_log);
+			erpnext.call_popup.dialog.show();
+		}
+	});
+});
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index bbd1f1c..a3ecea1 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -298,7 +298,7 @@
 				args: { search_value: this.frm.doc.scan_barcode }
 			}).then(r => {
 				const data = r && r.message;
-				if (!data) {
+				if (!data || Object.keys(data).length === 0) {
 					scan_barcode_field.set_new_description(__('Cannot find Item with this barcode'));
 					return;
 				}
@@ -383,8 +383,9 @@
 
 	setup_sms: function() {
 		var me = this;
+		let blacklist = ['Purchase Invoice', 'BOM'];
 		if(this.frm.doc.docstatus===1 && !in_list(["Lost", "Stopped", "Closed"], this.frm.doc.status)
-			&& this.frm.doctype != "Purchase Invoice") {
+			&& !blacklist.includes(this.frm.doctype)) {
 			this.frm.page.add_menu_item(__('Send SMS'), function() { me.send_sms(); });
 		}
 	},
@@ -437,7 +438,8 @@
 							serial_no: item.serial_no,
 							set_warehouse: me.frm.doc.set_warehouse,
 							warehouse: item.warehouse,
-							customer: me.frm.doc.customer,
+							customer: me.frm.doc.customer || me.frm.doc.party_name,
+							quotation_to: me.frm.doc.quotation_to,
 							supplier: me.frm.doc.supplier,
 							currency: me.frm.doc.currency,
 							update_stock: update_stock,
@@ -1179,7 +1181,8 @@
 		var me = this;
 		return {
 			"items": this._get_item_list(item),
-			"customer": me.frm.doc.customer,
+			"customer": me.frm.doc.customer || me.frm.doc.party_name,
+			"quotation_to": me.frm.doc.quotation_to,
 			"customer_group": me.frm.doc.customer_group,
 			"territory": me.frm.doc.territory,
 			"supplier": me.frm.doc.supplier,
diff --git a/erpnext/public/js/education/lms/quiz.js b/erpnext/public/js/education/lms/quiz.js
index 1b520eb..5248129 100644
--- a/erpnext/public/js/education/lms/quiz.js
+++ b/erpnext/public/js/education/lms/quiz.js
@@ -68,7 +68,7 @@
 		}).then(res => {
 			this.submit_btn.remove()
 			if (!res.message) {
-				frappe.throw("Something went wrong while evaluating the quiz.")
+				frappe.throw(__("Something went wrong while evaluating the quiz."))
 			}
 
 			let indicator = 'red'
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 64b96b5..cf48be4 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -266,6 +266,16 @@
 		refresh_field(table_fieldname);
 	},
 
+	create_new_doc: function (doctype, update_fields) {
+		frappe.model.with_doctype(doctype, function() {
+			var new_doc = frappe.model.get_new_doc(doctype);
+			for (let [key, value] of Object.entries(update_fields)) {
+				new_doc[key] = value;
+			}
+			frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
+		});
+	}
+
 });
 
 erpnext.utils.select_alternate_items = function(opts) {
@@ -595,6 +605,7 @@
 }
 
 erpnext.utils.clear_duplicates = function() {
+	if(!cur_frm.doc.items) return;
 	const unique_items = new Map();
 	/*
 		Create a Map of items with
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 44f9f24..35185c9 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -8,10 +8,17 @@
 		method = "erpnext.accounts.party.get_party_details";
 	}
 	if(!args) {
-		if(frm.doctype != "Purchase Order" && frm.doc.customer) {
+		if((frm.doctype != "Purchase Order" && frm.doc.customer)
+			|| (frm.doc.party_name && in_list(['Quotation', 'Opportunity'], frm.doc.doctype))) {
+
+			let party_type = "Customer";
+			if(frm.doc.quotation_to && frm.doc.quotation_to === "Lead") {
+				party_type = "Lead";
+			}
+
 			args = {
-				party: frm.doc.customer,
-				party_type: "Customer",
+				party: frm.doc.customer || frm.doc.party_name,
+				party_type: party_type,
 				price_list: frm.doc.selling_price_list
 			};
 		} else if(frm.doc.supplier) {
@@ -104,7 +111,7 @@
 
 	if(frappe.meta.get_docfield(frm.doc.doctype, "taxes")) {
 		if(!erpnext.utils.validate_mandatory(frm, "Lead/Customer/Supplier",
-			frm.doc.customer || frm.doc.supplier || frm.doc.lead, triggered_from_field)) {
+			frm.doc.customer || frm.doc.supplier || frm.doc.lead || frm.doc.party_name, triggered_from_field)) {
 			return;
 		}
 
@@ -160,6 +167,9 @@
 	} else if (frm.doc.supplier) {
 		party_type = 'Supplier';
 		party = frm.doc.supplier;
+	} else if (frm.doc.quotation_to){
+		party_type = frm.doc.quotation_to;
+		party = frm.doc.party_name;
 	}
 
 	frappe.call({
diff --git a/erpnext/public/js/utils/serial_no_batch_selector.js b/erpnext/public/js/utils/serial_no_batch_selector.js
index 045a046..41a59d0 100644
--- a/erpnext/public/js/utils/serial_no_batch_selector.js
+++ b/erpnext/public/js/utils/serial_no_batch_selector.js
@@ -271,14 +271,6 @@
 	get_batch_fields: function() {
 		var me = this;
 
-		let filters = {
-			item_code: me.item_code
-		}
-
-		if (me.warehouse || me.warehouse_details.name) {
-			filters['warehouse'] = me.warehouse || me.warehouse_details.name;
-		}
-
 		return [
 			{fieldtype:'Section Break', label: __('Batches')},
 			{fieldname: 'batches', fieldtype: 'Table', label: __('Batch Entries'),
@@ -292,7 +284,10 @@
 						'in_list_view': 1,
 						get_query: function () {
 							return {
-								filters: filters,
+								filters: {
+									item_code: me.item_code,
+									warehouse: me.warehouse || me.warehouse_details.name
+								},
 								query: 'erpnext.controllers.queries.get_batch_no'
 							};
 						},
diff --git a/erpnext/public/less/call_popup.less b/erpnext/public/less/call_popup.less
new file mode 100644
index 0000000..32e85ce
--- /dev/null
+++ b/erpnext/public/less/call_popup.less
@@ -0,0 +1,9 @@
+.call-popup {
+	a:hover {
+		text-decoration: underline;
+	}
+	.for-description {
+		max-height: 250px;
+		overflow: scroll;
+	}
+}
\ No newline at end of file
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index b746cc1..8ed5f1a 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -25,10 +25,10 @@
 
 .app-icon-svg {
 	display: inline-block;
-    margin: auto;
-    text-align: center;
-    border-radius: 16px;
-    cursor: pointer;
+	margin: auto;
+	text-align: center;
+	border-radius: 16px;
+	cursor: pointer;
 	box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.15);
 }
 
@@ -458,4 +458,4 @@
 	.list-item_content {
 		padding-right: 45px;
 	}
-}
+}
\ No newline at end of file
diff --git a/erpnext/public/sounds/call-disconnect.mp3 b/erpnext/public/sounds/call-disconnect.mp3
new file mode 100644
index 0000000..1202273
--- /dev/null
+++ b/erpnext/public/sounds/call-disconnect.mp3
Binary files differ
diff --git a/erpnext/public/sounds/incoming-call.mp3 b/erpnext/public/sounds/incoming-call.mp3
new file mode 100644
index 0000000..60431e3
--- /dev/null
+++ b/erpnext/public/sounds/incoming-call.mp3
Binary files differ
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html
index 77a9b63..2da79a6 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html
@@ -222,17 +222,17 @@
 			</tr>
 			<tr>
 				<td>&nbsp (1) {{__("As per rules 42 & 43 of CGST Rules")}}</td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[0].iamt, 2) }}</td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[0].camt, 2) }}</td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[0].samt, 2) }}</td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[0].csamt, 2) }}</td>
 			</tr>
 			<tr>
 				<td>&nbsp (2) {{__("Others")}}</td>
-				<td></td>
-				<td></td>
-				<td></td>
-				<td></td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[1].iamt, 2) }}</td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[1].camt, 2) }}</td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[1].samt, 2) }}</td>
+				<td class="right">{{ flt(data.itc_elg.itc_rev[1].csamt, 2) }}</td>
 			</tr>
 			<tr>
 				<td><b>(C) {{__("Net ITC Available(A) - (B)")}}</b></td>
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
index 6569833..aad267e 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
@@ -4,6 +4,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.model.document import Document
 import json
 from six import iteritems
@@ -91,10 +92,10 @@
 					},
 					{
 						"ty": "ISD",
-						"iamt": 1,
-						"camt": 1,
-						"samt": 1,
-						"csamt": 1
+						"iamt": 0,
+						"camt": 0,
+						"samt": 0,
+						"csamt": 0
 					},
 					{
 						"samt": 0,
@@ -104,6 +105,22 @@
 						"iamt": 0
 					}
 				],
+				"itc_rev": [
+					{
+						"ty": "RUL",
+						"iamt": 0,
+						"camt": 0,
+						"samt": 0,
+						"csamt": 0
+					},
+					{
+						"ty": "OTH",
+						"iamt": 0,
+						"camt": 0,
+						"samt": 0,
+						"csamt": 0
+					}
+				],
 				"itc_net": {
 					"samt": 0,
 					"csamt": 0,
@@ -173,6 +190,10 @@
 		net_itc = self.report_dict["itc_elg"]["itc_net"]
 
 		for d in self.report_dict["itc_elg"]["itc_avl"]:
+
+			itc_type = itc_type_map.get(d["ty"])
+			gst_category = "Registered Regular"
+
 			if d["ty"] == 'ISRC':
 				reverse_charge = "Y"
 			else:
@@ -180,24 +201,22 @@
 
 			for account_head in self.account_heads:
 
-				d["iamt"] = flt(itc_details.get((itc_type_map.get(d["ty"]), reverse_charge, account_head.get('igst_account')), {}).get("amount"), 2)
-				net_itc["iamt"] += flt(d["iamt"], 2)
+				d["iamt"] += flt(itc_details.get((gst_category, itc_type, reverse_charge, account_head.get('igst_account')), {}).get("amount"), 2)
+				d["camt"] += flt(itc_details.get((gst_category, itc_type, reverse_charge, account_head.get('cgst_account')), {}).get("amount"), 2)
+				d["samt"] += flt(itc_details.get((gst_category, itc_type, reverse_charge, account_head.get('sgst_account')), {}).get("amount"), 2)
+				d["csamt"] += flt(itc_details.get((gst_category, itc_type, reverse_charge, account_head.get('cess_account')), {}).get("amount"), 2)
 
-				d["camt"] = flt(itc_details.get((itc_type_map.get(d["ty"]), reverse_charge, account_head.get('cgst_account')), {}).get("amount"), 2)
-				net_itc["camt"] += flt(d["camt"], 2)
-
-				d["samt"] = flt(itc_details.get((itc_type_map.get(d["ty"]), reverse_charge, account_head.get('sgst_account')), {}).get("amount"), 2)
-				net_itc["samt"] += flt(d["samt"], 2)
-
-				d["csamt"] = flt(itc_details.get((itc_type_map.get(d["ty"]), reverse_charge, account_head.get('cess_account')), {}).get("amount"), 2)
-				net_itc["csamt"] += flt(d["csamt"], 2)
+			net_itc["iamt"] += flt(d["iamt"], 2)
+			net_itc["camt"] += flt(d["camt"], 2)
+			net_itc["samt"] += flt(d["samt"], 2)
+			net_itc["csamt"] += flt(d["csamt"], 2)
 
 		for account_head in self.account_heads:
-
-			self.report_dict["itc_elg"]["itc_inelg"][1]["iamt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("igst_account")), {}).get("amount"), 2)
-			self.report_dict["itc_elg"]["itc_inelg"][1]["camt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("cgst_account")), {}).get("amount"), 2)
-			self.report_dict["itc_elg"]["itc_inelg"][1]["samt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("sgst_account")), {}).get("amount"), 2)
-			self.report_dict["itc_elg"]["itc_inelg"][1]["csamt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("cess_account")), {}).get("amount"), 2)
+			itc_inelg = self.report_dict["itc_elg"]["itc_inelg"][1]
+			itc_inelg["iamt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("igst_account")), {}).get("amount"), 2)
+			itc_inelg["camt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("cgst_account")), {}).get("amount"), 2)
+			itc_inelg["samt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("sgst_account")), {}).get("amount"), 2)
+			itc_inelg["csamt"] = flt(itc_details.get(("Ineligible", "N", account_head.get("cess_account")), {}).get("amount"), 2)
 
 	def prepare_data(self, doctype, tax_details, supply_type, supply_category, gst_category_list, reverse_charge="N"):
 
@@ -226,20 +245,22 @@
 
 	def set_inter_state_supply(self, inter_state_supply):
 
+		osup_det = self.report_dict["sup_details"]["osup_det"]
+
 		for d in inter_state_supply.get("Unregistered", []):
 			self.report_dict["inter_sup"]["unreg_details"].append(d)
-			self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d["txval"], 2)
-			self.report_dict["sup_details"]["osup_det"]["iamt"] += flt(d["iamt"], 2)
+			osup_det["txval"] = flt(osup_det["txval"] + d["txval"], 2)
+			osup_det["iamt"] = flt(osup_det["iamt"] + d["iamt"], 2)
 
 		for d in inter_state_supply.get("Registered Composition", []):
 			self.report_dict["inter_sup"]["comp_details"].append(d)
-			self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d["txval"], 2)
-			self.report_dict["sup_details"]["osup_det"]["iamt"] += flt(d["iamt"], 2)
+			osup_det["txval"] = flt(osup_det["txval"] + d["txval"], 2)
+			osup_det["iamt"] = flt(osup_det["iamt"] + d["iamt"], 2)
 
 		for d in inter_state_supply.get("UIN Holders", []):
 			self.report_dict["inter_sup"]["uin_details"].append(d)
-			self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d["txval"], 2)
-			self.report_dict["sup_details"]["osup_det"]["iamt"] += flt(d["iamt"], 2)
+			osup_det["txval"] = flt(osup_det["txval"] + d["txval"], 2)
+			osup_det["iamt"] = flt(osup_det["iamt"] + d["iamt"], 2)
 
 	def get_total_taxable_value(self, doctype, reverse_charge):
 
@@ -268,7 +289,7 @@
 		itc_details = {}
 
 		for d in itc_amount:
-			itc_details.setdefault((d.eligibility_for_itc, d.reverse_charge, d.account_head),{
+			itc_details.setdefault((d.gst_category, d.eligibility_for_itc, d.reverse_charge, d.account_head),{
 				"amount": d.tax_amount
 			})
 
@@ -315,9 +336,10 @@
 					"iamt": flt(inter_state_supply_tax_mapping.get(d.place_of_supply), 2)
 				})
 			else:
-				self.report_dict["sup_details"]["osup_det"]["txval"] += flt(d.total, 2)
-				self.report_dict["sup_details"]["osup_det"]["camt"] += flt(inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
-				self.report_dict["sup_details"]["osup_det"]["samt"] += flt(inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
+				osup_det = self.report_dict["sup_details"]["osup_det"]
+				osup_det["txval"] = flt(osup_det["txval"] + d.total, 2)
+				osup_det["camt"] = flt(osup_det["camt"] + inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
+				osup_det["samt"] = flt(osup_det["samt"] + inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
 
 		return inter_state_supply_details
 
@@ -393,7 +415,7 @@
 		if gst_details:
 			return gst_details[0]
 		else:
-			frappe.throw("Please enter GSTIN and state for the Company Address {0}".format(self.company_address))
+			frappe.throw(_("Please enter GSTIN and state for the Company Address {0}".format(self.company_address)))
 
 	def get_account_heads(self):
 
@@ -406,7 +428,7 @@
 		if account_heads:
 			return account_heads
 		else:
-			frappe.throw("Please set account heads in GST Settings for Compnay {0}".format(self.company))
+			frappe.throw(_("Please set account heads in GST Settings for Compnay {0}".format(self.company)))
 
 	def get_missing_field_invoices(self):
 
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index 26fdb1a..eeb314c 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -209,9 +209,10 @@
 			'fieldname': 'gst_transporter_id',
 			'label': 'GST Transporter ID',
 			'fieldtype': 'Data',
-			'insert_after': 'transporter_name',
+			'insert_after': 'transporter',
 			'fetch_from': 'transporter.gst_transporter_id',
-			'print_hide': 1
+			'print_hide': 1,
+			'translatable': 0
 		},
 		{
 			'fieldname': 'mode_of_transport',
@@ -219,18 +220,142 @@
 			'fieldtype': 'Select',
 			'options': '\nRoad\nAir\nRail\nShip',
 			'default': 'Road',
+			'insert_after': 'transporter_name',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'gst_vehicle_type',
+			'label': 'GST Vehicle Type',
+			'fieldtype': 'Select',
+			'options': 'Regular\nOver Dimensional Cargo (ODC)',
+			'depends_on': 'eval:(doc.mode_of_transport === "Road")',
+			'default': 'Regular',
 			'insert_after': 'lr_date',
+			'print_hide': 1,
+			'translatable': 0
+		}
+	]
+
+	si_ewaybill_fields = [
+		{
+			'fieldname': 'transporter_info',
+ 			'label': 'Transporter Info',
+ 			'fieldtype': 'Section Break',
+ 			'insert_after': 'terms',
+ 			'collapsible': 1,
+ 			'collapsible_depends_on': 'transporter',
+ 			'print_hide': 1
+		},
+		{
+			'fieldname': 'transporter',
+			'label': 'Transporter',
+			'fieldtype': 'Link',
+			'insert_after': 'transporter_info',
+			'options': 'Supplier',
+			'print_hide': 1
+		},
+		{
+			'fieldname': 'gst_transporter_id',
+			'label': 'GST Transporter ID',
+			'fieldtype': 'Data',
+			'insert_after': 'transporter',
+			'fetch_from': 'transporter.gst_transporter_id',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'driver',
+			'label': 'Driver',
+			'fieldtype': 'Link',
+			'insert_after': 'gst_transporter_id',
+			'options': 'Driver',
+			'print_hide': 1
+		},
+		{
+			'fieldname': 'lr_no',
+			'label': 'Transport Receipt No',
+			'fieldtype': 'Data',
+			'insert_after': 'driver',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'vehicle_no',
+			'label': 'Vehicle No',
+			'fieldtype': 'Data',
+			'insert_after': 'lr_no',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'distance',
+			'label': 'Distance (in km)',
+			'fieldtype': 'Float',
+			'insert_after': 'vehicle_no',
+			'print_hide': 1
+		},
+		{
+			'fieldname': 'transporter_col_break',
+			'fieldtype': 'Column Break',
+			'insert_after': 'distance'
+		},
+		{
+			'fieldname': 'transporter_name',
+			'label': 'Transporter Name',
+			'fieldtype': 'Data',
+			'insert_after': 'transporter_col_break',
+			'fetch_from': 'transporter.name',
+			'read_only': 1,
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'mode_of_transport',
+			'label': 'Mode of Transport',
+			'fieldtype': 'Select',
+			'options': '\nRoad\nAir\nRail\nShip',
+			'default': 'Road',
+			'insert_after': 'transporter_name',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'driver_name',
+			'label': 'Driver Name',
+			'fieldtype': 'Data',
+			'insert_after': 'mode_of_transport',
+			'fetch_from': 'driver.full_name',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'lr_date',
+			'label': 'Transport Receipt Date',
+			'fieldtype': 'Date',
+			'insert_after': 'driver_name',
+			'default': 'Today',
 			'print_hide': 1
 		},
 		{
 			'fieldname': 'gst_vehicle_type',
 			'label': 'GST Vehicle Type',
 			'fieldtype': 'Select',
-			'options': '\nRegular\nOver Dimensional Cargo (ODC)',
-			'default': 'Regular',
+			'options': 'Regular\nOver Dimensional Cargo (ODC)',
 			'depends_on': 'eval:(doc.mode_of_transport === "Road")',
-			'insert_after': 'mode_of_transport',
-			'print_hide': 1
+			'default': 'Regular',
+			'insert_after': 'lr_date',
+			'print_hide': 1,
+			'translatable': 0
+		},
+		{
+			'fieldname': 'ewaybill',
+			'label': 'e-Way Bill No.',
+			'fieldtype': 'Data',
+			'depends_on': 'eval:(doc.docstatus === 1)',
+			'allow_on_submit': 1,
+			'insert_after': 'project',
+			'translatable': 0
 		}
 	]
 
@@ -246,8 +371,8 @@
 		'Purchase Invoice': purchase_invoice_gst_category + invoice_gst_fields + purchase_invoice_itc_fields + purchase_invoice_gst_fields,
 		'Purchase Order': purchase_invoice_gst_fields,
 		'Purchase Receipt': purchase_invoice_gst_fields,
-		'Sales Invoice': sales_invoice_gst_category + invoice_gst_fields + sales_invoice_shipping_fields + sales_invoice_gst_fields,
-		'Delivery Note': sales_invoice_gst_fields + ewaybill_fields,
+		'Sales Invoice': sales_invoice_gst_category + invoice_gst_fields + sales_invoice_shipping_fields + sales_invoice_gst_fields + si_ewaybill_fields,
+		'Delivery Note': sales_invoice_gst_fields + ewaybill_fields + sales_invoice_shipping_fields,
 		'Sales Order': sales_invoice_gst_fields,
 		'Sales Taxes and Charges Template': inter_state_gst_field,
 		'Purchase Taxes and Charges Template': inter_state_gst_field,
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index 19022e1..0bc277f 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -1,5 +1,5 @@
 from __future__ import unicode_literals
-import frappe, re
+import frappe, re, json
 from frappe import _
 from frappe.utils import cstr, flt, date_diff, nowdate
 from erpnext.regional.india import states, state_numbers
@@ -40,23 +40,26 @@
 			frappe.throw(_("Invalid GSTIN! The input you've entered doesn't match the format of GSTIN."))
 
 		validate_gstin_check_digit(doc.gstin)
+		set_gst_state_and_state_number(doc)
 
-		if not doc.gst_state:
-			if not doc.state:
-				return
-			state = doc.state.lower()
-			states_lowercase = {s.lower():s for s in states}
-			if state in states_lowercase:
-				doc.gst_state = states_lowercase[state]
-			else:
-				return
-
-		doc.gst_state_number = state_numbers[doc.gst_state]
 		if doc.gst_state_number != doc.gstin[:2]:
 			frappe.throw(_("Invalid GSTIN! First 2 digits of GSTIN should match with State number {0}.")
 				.format(doc.gst_state_number))
 
-def validate_gstin_check_digit(gstin):
+def set_gst_state_and_state_number(doc):
+	if not doc.gst_state:
+		if not doc.state:
+			return
+		state = doc.state.lower()
+		states_lowercase = {s.lower():s for s in states}
+		if state in states_lowercase:
+			doc.gst_state = states_lowercase[state]
+		else:
+			return
+
+	doc.gst_state_number = state_numbers[doc.gst_state]
+
+def validate_gstin_check_digit(gstin, label='GSTIN'):
 	''' Function to validate the check digit of the GSTIN.'''
 	factor = 1
 	total = 0
@@ -69,8 +72,8 @@
 		total += digit
 		factor = 2 if factor == 1 else 1
 	if gstin[-1] != code_point_chars[((mod - (total % mod)) % mod)]:
-		frappe.throw(_("Invalid GSTIN! The check digit validation has failed. " +
-			"Please ensure you've typed the GSTIN correctly."))
+		frappe.throw(_("Invalid {0}! The check digit validation has failed. " +
+			"Please ensure you've typed the {0} correctly.".format(label)))
 
 def get_itemised_tax_breakup_header(item_doctype, tax_accounts):
 	if frappe.get_meta(item_doctype).has_field('gst_hsn_code'):
@@ -78,8 +81,8 @@
 	else:
 		return [_("Item"), _("Taxable Amount")] + tax_accounts
 
-def get_itemised_tax_breakup_data(doc):
-	itemised_tax = get_itemised_tax(doc.taxes)
+def get_itemised_tax_breakup_data(doc, account_wise=False):
+	itemised_tax = get_itemised_tax(doc.taxes, with_tax_account=account_wise)
 
 	itemised_taxable_amount = get_itemised_taxable_amount(doc.items)
 
@@ -94,14 +97,17 @@
 	for item, taxes in itemised_tax.items():
 		hsn_code = item_hsn_map.get(item)
 		hsn_tax.setdefault(hsn_code, frappe._dict())
-		for tax_account, tax_detail in taxes.items():
-			hsn_tax[hsn_code].setdefault(tax_account, {"tax_rate": 0, "tax_amount": 0})
-			hsn_tax[hsn_code][tax_account]["tax_rate"] = tax_detail.get("tax_rate")
-			hsn_tax[hsn_code][tax_account]["tax_amount"] += tax_detail.get("tax_amount")
+		for tax_desc, tax_detail in taxes.items():
+			key = tax_desc
+			if account_wise:
+				key = tax_detail.get('tax_account')
+			hsn_tax[hsn_code].setdefault(key, {"tax_rate": 0, "tax_amount": 0})
+			hsn_tax[hsn_code][key]["tax_rate"] = tax_detail.get("tax_rate")
+			hsn_tax[hsn_code][key]["tax_amount"] += tax_detail.get("tax_amount")
 
 	# set taxable amount
 	hsn_taxable_amount = frappe._dict()
-	for item, taxable_amount in itemised_taxable_amount.items():
+	for item in itemised_taxable_amount:
 		hsn_code = item_hsn_map.get(item)
 		hsn_taxable_amount.setdefault(hsn_code, 0)
 		hsn_taxable_amount[hsn_code] += itemised_taxable_amount.get(item)
@@ -276,6 +282,102 @@
 		exemptions["total_eligible_hra_exemption"] = eligible_hra
 		return exemptions
 
+def get_ewb_data(dt, dn):
+	if dt != 'Sales Invoice':
+		frappe.throw(_('e-Way Bill JSON can only be generated from Sales Invoice'))
+
+	dn = dn.split(',')
+
+	ewaybills = []
+	for doc_name in dn:
+		doc = frappe.get_doc(dt, doc_name)
+
+		validate_sales_invoice(doc)
+
+		data = frappe._dict({
+			"transporterId": "",
+			"TotNonAdvolVal": 0,
+		})
+
+		data.userGstin = data.fromGstin = doc.company_gstin
+		data.supplyType = 'O'
+
+		if doc.gst_category in ['Registered Regular', 'SEZ']:
+			data.subSupplyType = 1
+		elif doc.gst_category in ['Overseas', 'Deemed Export']:
+			data.subSupplyType = 3
+		else:
+			frappe.throw(_('Unsupported GST Category for e-Way Bill JSON generation'))
+
+		data.docType = 'INV'
+		data.docDate = frappe.utils.formatdate(doc.posting_date, 'dd/mm/yyyy')
+
+		company_address = frappe.get_doc('Address', doc.company_address)
+		billing_address = frappe.get_doc('Address', doc.customer_address)
+
+		shipping_address = frappe.get_doc('Address', doc.shipping_address_name)
+
+		data = get_address_details(data, doc, company_address, billing_address)
+
+		data.itemList = []
+		data.totalValue = doc.total
+
+		data = get_item_list(data, doc)
+
+		disable_rounded = frappe.db.get_single_value('Global Defaults', 'disable_rounded_total')
+		data.totInvValue = doc.grand_total if disable_rounded else doc.rounded_total
+
+		data = get_transport_details(data, doc)
+
+		fields = {
+			"/. -": {
+				'docNo': doc.name,
+				'fromTrdName': doc.company,
+				'toTrdName': doc.customer_name,
+				'transDocNo': doc.lr_no,
+			},
+			"@#/,&. -": {
+				'fromAddr1': company_address.address_line1,
+				'fromAddr2': company_address.address_line2,
+				'fromPlace': company_address.city,
+				'toAddr1': shipping_address.address_line1,
+				'toAddr2': shipping_address.address_line2,
+				'toPlace': shipping_address.city,
+				'transporterName': doc.transporter_name
+			}
+		}
+
+		for allowed_chars, field_map in fields.items():
+			for key, value in field_map.items():
+				if not value:
+					data[key] = ''
+				else:
+					data[key] = re.sub(r'[^\w' + allowed_chars + ']', '', value)
+
+		ewaybills.append(data)
+
+	data = {
+		'version': '1.0.1118',
+		'billLists': ewaybills
+	}
+
+	return data
+
+@frappe.whitelist()
+def generate_ewb_json(dt, dn):
+
+	data = get_ewb_data(dt, dn)
+
+	frappe.local.response.filecontent = json.dumps(data, indent=4, sort_keys=True)
+	frappe.local.response.type = 'download'
+
+	if len(data['billLists']) > 1:
+		doc_name = 'Bulk'
+	else:
+		doc_name = dn
+
+	frappe.local.response.filename = '{0}_e-WayBill_Data_{1}.json'.format(doc_name, frappe.utils.random_string(5))
+
 @frappe.whitelist()
 def get_gstins_for_company(company):
 	company_gstins =[]
@@ -291,3 +393,177 @@
 			`tabDynamic Link`.link_name = '{0}'""".format(company))
 	return company_gstins
 
+def get_address_details(data, doc, company_address, billing_address):
+	data.fromPincode = validate_pincode(company_address.pincode, 'Company Address')
+	data.fromStateCode = data.actualFromStateCode = validate_state_code(
+		company_address.gst_state_number, 'Company Address')
+
+	if not doc.billing_address_gstin or len(doc.billing_address_gstin) < 15:
+		data.toGstin = 'URP'
+		set_gst_state_and_state_number(billing_address)
+	else:
+		data.toGstin = doc.billing_address_gstin
+
+	data.toPincode = validate_pincode(billing_address.pincode, 'Customer Address')
+	data.toStateCode = validate_state_code(billing_address.gst_state_number, 'Customer Address')
+
+	if doc.customer_address != doc.shipping_address_name:
+		data.transType = 2
+		shipping_address = frappe.get_doc('Address', doc.shipping_address_name)
+		set_gst_state_and_state_number(shipping_address)
+		data.toPincode = validate_pincode(shipping_address.pincode, 'Shipping Address')
+		data.actualToStateCode = validate_state_code(shipping_address.gst_state_number, 'Shipping Address')
+	else:
+		data.transType = 1
+		data.actualToStateCode = data.toStateCode
+		shipping_address = billing_address
+
+	return data
+
+def get_item_list(data, doc):
+	for attr in ['cgstValue', 'sgstValue', 'igstValue', 'cessValue', 'OthValue']:
+		data[attr] = 0
+
+	gst_accounts = get_gst_accounts(doc.company, account_wise=True)
+	tax_map = {
+		'sgst_account': ['sgstRate', 'sgstValue'],
+		'cgst_account': ['cgstRate', 'cgstValue'],
+		'igst_account': ['igstRate', 'igstValue'],
+		'cess_account': ['cessRate', 'cessValue']
+	}
+	item_data_attrs = ['sgstRate', 'cgstRate', 'igstRate', 'cessRate', 'cessNonAdvol']
+	hsn_wise_charges, hsn_taxable_amount = get_itemised_tax_breakup_data(doc, account_wise=True)
+	for hsn_code, taxable_amount in hsn_taxable_amount.items():
+		item_data = frappe._dict()
+		if not hsn_code:
+			frappe.throw(_('GST HSN Code does not exist for one or more items'))
+		item_data.hsnCode = int(hsn_code)
+		item_data.taxableAmount = taxable_amount
+		item_data.qtyUnit = ""
+		for attr in item_data_attrs:
+			item_data[attr] = 0
+
+		for account, tax_detail in hsn_wise_charges.get(hsn_code, {}).items():
+			account_type = gst_accounts.get(account, '')
+			for tax_acc, attrs in tax_map.items():
+				if account_type == tax_acc:
+					item_data[attrs[0]] = tax_detail.get('tax_rate')
+					data[attrs[1]] += tax_detail.get('tax_amount')
+					break
+			else:
+				data.OthValue += tax_detail.get('tax_amount')
+
+		data.itemList.append(item_data)
+
+		# Tax amounts rounded to 2 decimals to avoid exceeding max character limit
+		for attr in ['sgstValue', 'cgstValue', 'igstValue', 'cessValue']:
+			data[attr] = flt(data[attr], 2)
+
+	return data
+
+def validate_sales_invoice(doc):
+	if doc.docstatus != 1:
+		frappe.throw(_('e-Way Bill JSON can only be generated from submitted document'))
+
+	if doc.is_return:
+		frappe.throw(_('e-Way Bill JSON cannot be generated for Sales Return as of now'))
+
+	if doc.ewaybill:
+		frappe.throw(_('e-Way Bill already exists for this document'))
+
+	reqd_fields = ['company_gstin', 'company_address', 'customer_address',
+		'shipping_address_name', 'mode_of_transport', 'distance']
+
+	for fieldname in reqd_fields:
+		if not doc.get(fieldname):
+			frappe.throw(_('{} is required to generate e-Way Bill JSON'.format(
+				doc.meta.get_label(fieldname)
+			)))
+
+	if len(doc.company_gstin) < 15:
+		frappe.throw(_('You must be a registered supplier to generate e-Way Bill'))
+
+def get_transport_details(data, doc):
+	if doc.distance > 4000:
+		frappe.throw(_('Distance cannot be greater than 4000 kms'))
+
+	data.transDistance = int(round(doc.distance))
+
+	transport_modes = {
+		'Road': 1,
+		'Rail': 2,
+		'Air': 3,
+		'Ship': 4
+	}
+
+	vehicle_types = {
+		'Regular': 'R',
+		'Over Dimensional Cargo (ODC)': 'O'
+	}
+
+	data.transMode = transport_modes.get(doc.mode_of_transport)
+
+	if doc.mode_of_transport == 'Road':
+		if not doc.gst_transporter_id and not doc.vehicle_no:
+			frappe.throw(_('Either GST Transporter ID or Vehicle No is required if Mode of Transport is Road'))
+		if doc.vehicle_no:
+			data.vehicleNo = doc.vehicle_no.replace(' ', '')
+		if not doc.gst_vehicle_type:
+			frappe.throw(_('Vehicle Type is required if Mode of Transport is Road'))
+		else:
+			data.vehicleType = vehicle_types.get(doc.gst_vehicle_type)
+	else:
+		if not doc.lr_no or not doc.lr_date:
+			frappe.throw(_('Transport Receipt No and Date are mandatory for your chosen Mode of Transport'))
+
+	if doc.lr_no:
+		data.transDocNo = doc.lr_no
+
+	if doc.lr_date:
+		data.transDocDate = frappe.utils.formatdate(doc.lr_date, 'dd/mm/yyyy')
+
+	if doc.gst_transporter_id:
+		validate_gstin_check_digit(doc.gst_transporter_id, label='GST Transporter ID')
+		data.transporterId  = doc.gst_transporter_id
+
+	return data
+
+
+def validate_pincode(pincode, address):
+	pin_not_found = "Pin Code doesn't exist for {}"
+	incorrect_pin = "Pin Code for {} is incorrecty formatted. It must be 6 digits (without spaces)"
+
+	if not pincode:
+		frappe.throw(_(pin_not_found.format(address)))
+
+	pincode = pincode.replace(' ', '')
+	if not pincode.isdigit() or len(pincode) != 6:
+		frappe.throw(_(incorrect_pin.format(address)))
+	else:
+		return int(pincode)
+
+def validate_state_code(state_code, address):
+	no_state_code = "GST State Code not found for {0}. Please set GST State in {0}"
+	if not state_code:
+		frappe.throw(_(no_state_code.format(address)))
+	else:
+		return int(state_code)
+
+def get_gst_accounts(company, account_wise=False):
+	gst_accounts = frappe._dict()
+	gst_settings_accounts = frappe.get_all("GST Account",
+		filters={"parent": "GST Settings", "company": company},
+		fields=["cgst_account", "sgst_account", "igst_account", "cess_account"])
+
+	if not gst_settings_accounts:
+		frappe.throw(_("Please set GST Accounts in GST Settings"))
+
+	for d in gst_settings_accounts:
+		for acc, val in d.items():
+			if not account_wise:
+				gst_accounts.setdefault(acc, []).append(val)
+			elif val:
+				gst_accounts[val] = acc
+
+
+	return gst_accounts
diff --git a/erpnext/regional/italy/e-invoice.xml b/erpnext/regional/italy/e-invoice.xml
index b725b96..9a588d1 100644
--- a/erpnext/regional/italy/e-invoice.xml
+++ b/erpnext/regional/italy/e-invoice.xml
@@ -118,7 +118,7 @@
     <DatiGenerali>
       <DatiGeneraliDocumento>
         <TipoDocumento>{{ doc.type_of_document }}</TipoDocumento>
-        <Divisa>EUR</Divisa>
+        <Divisa>{{ doc.currency }}</Divisa>
         <Data>{{ doc.posting_date }}</Data>
         <Numero>{{ doc.unamended_name }}</Numero>
         {%- if doc.stamp_duty %}
diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index 0c42124..407677f 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -80,7 +80,7 @@
 		invoice.stamp_duty = stamp_duty_charge_row.tax_amount
 
 	for item in invoice.e_invoice_items:
-		if item.tax_rate == 0.0 and item.tax_amount == 0.0:
+		if item.tax_rate == 0.0 and item.tax_amount == 0.0 and tax_data.get("0.0"):
 			item.tax_exemption_reason = tax_data["0.0"]["tax_exemption_reason"]
 
 	customer_po_data = {}
@@ -326,6 +326,9 @@
 	return frappe.get_cached_value('Company', company, 'country')
 
 def get_e_invoice_attachments(invoice):
+	if not invoice.company_tax_id:
+		return []
+
 	out = []
 	attachments = get_attachments(invoice.doctype, invoice.name)
 	company_tax_id = invoice.company_tax_id if invoice.company_tax_id.startswith("IT") else "IT" + invoice.company_tax_id
diff --git "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py" "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py"
index a257ed2..e903c9f 100644
--- "a/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py"
+++ "b/erpnext/regional/report/fichier_des_ecritures_comptables_\133fec\135/fichier_des_ecritures_comptables_\133fec\135.py"
@@ -80,7 +80,10 @@
 			jnl.cheque_no as JnlRef, jnl.posting_date as JnlPostDate, jnl.title as JnlTitle,
 			pay.name as PayName, pay.posting_date as PayPostDate, pay.title as PayTitle,
 			cus.customer_name, cus.name as cusName,
-			sup.supplier_name, sup.name as supName
+			sup.supplier_name, sup.name as supName,
+			emp.employee_name, emp.name as empName,
+			stu.title as student_name, stu.name as stuName,
+			member_name, mem.name as memName
 
 		from `tabGL Entry` gl
 			left join `tabSales Invoice` inv on gl.voucher_no = inv.name
@@ -89,6 +92,9 @@
 			left join `tabPayment Entry` pay on gl.voucher_no = pay.name
 			left join `tabCustomer` cus on gl.party = cus.name
 			left join `tabSupplier` sup on gl.party = sup.name
+			left join `tabEmployee` emp on gl.party = emp.name
+			left join `tabStudent` stu on gl.party = stu.name
+			left join `tabMember` mem on gl.party = mem.name
 		where gl.company=%(company)s and gl.fiscal_year=%(fiscal_year)s
 		{group_by_condition}
 		order by GlPostDate, voucher_no"""\
@@ -128,6 +134,18 @@
 			CompAuxNum = d.get("supName")
 			CompAuxLib = d.get("supplier_name")
 
+		elif d.get("party_type") == "Employee":
+			CompAuxNum = d.get("empName")
+			CompAuxLib = d.get("employee_name")
+
+		elif d.get("party_type") == "Student":
+			CompAuxNum = d.get("stuName")
+			CompAuxLib = d.get("student_name")
+
+		elif d.get("party_type") == "Member":
+			CompAuxNum = d.get("memName")
+			CompAuxLib = d.get("member_name")
+
 		else:
 			CompAuxNum = ""
 			CompAuxLib = ""
diff --git a/erpnext/regional/report/gstr_1/gstr_1.json b/erpnext/regional/report/gstr_1/gstr_1.json
index 4ef8d53..2012bb8 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.json
+++ b/erpnext/regional/report/gstr_1/gstr_1.json
@@ -1,29 +1,30 @@
 {
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2018-01-02 15:54:41.424225", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 0, 
- "is_standard": "Yes", 
- "modified": "2018-01-02 17:56:15.379347", 
- "modified_by": "Administrator", 
- "module": "Regional", 
- "name": "GSTR-1", 
- "owner": "Administrator", 
- "ref_doctype": "GL Entry", 
- "report_name": "GSTR-1", 
- "report_type": "Script Report", 
+ "add_total_row": 1,
+ "creation": "2018-01-02 15:54:41.424225",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2019-06-30 19:33:59.769385",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "GSTR-1",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "GL Entry",
+ "report_name": "GSTR-1",
+ "report_type": "Script Report",
  "roles": [
   {
    "role": "Accounts User"
-  }, 
+  },
   {
    "role": "Accounts Manager"
-  }, 
+  },
   {
    "role": "Auditor"
   }
  ]
-}
+}
\ No newline at end of file
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 3a8149d..eff5780 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -8,6 +8,7 @@
 from datetime import date
 from six import iteritems
 from erpnext.regional.doctype.gstr_3b_report.gstr_3b_report import get_period
+from erpnext.regional.india.utils import get_gst_accounts
 
 def execute(filters=None):
 	return Gstr1Report(filters).run()
@@ -29,10 +30,9 @@
 			place_of_supply,
 			ecommerce_gstin,
 			reverse_charge,
-			invoice_type,
 			return_against,
 			is_return,
-			invoice_type,
+			gst_category,
 			export_type,
 			port_code,
 			shipping_bill_number,
@@ -42,7 +42,7 @@
 
 	def run(self):
 		self.get_columns()
-		self.get_gst_accounts()
+		self.gst_accounts = get_gst_accounts(self.filters.company)
 		self.get_invoice_data()
 
 		if self.invoices:
@@ -54,7 +54,6 @@
 		return self.columns, self.data
 
 	def get_data(self):
-
 		if self.filters.get("type_of_business") ==  "B2C Small":
 			self.get_b2cs_data()
 		else:
@@ -266,19 +265,6 @@
 				and frappe.db.get_value(self.doctype, invoice, "export_type") == "Without Payment of Tax":
 					self.items_based_on_tax_rate.setdefault(invoice, {}).setdefault(0, items.keys())
 
-	def get_gst_accounts(self):
-		self.gst_accounts = frappe._dict()
-		gst_settings_accounts = frappe.get_all("GST Account",
-			filters={"parent": "GST Settings", "company": self.filters.company},
-			fields=["cgst_account", "sgst_account", "igst_account", "cess_account"])
-
-		if not gst_settings_accounts:
-			frappe.throw(_("Please set GST Accounts in GST Settings"))
-
-		for d in gst_settings_accounts:
-			for acc, val in d.items():
-				self.gst_accounts.setdefault(acc, []).append(val)
-
 	def get_columns(self):
 		self.tax_columns = [
 			{
@@ -573,19 +559,19 @@
 
 	res = {}
 	if filters["type_of_business"] == "B2B":
-		for item in report_data:
+		for item in report_data[:-1]:
 			res.setdefault(item["customer_gstin"], {}).setdefault(item["invoice_number"],[]).append(item)
 
 		out = get_b2b_json(res, gstin)
 		gst_json["b2b"] = out
 	elif filters["type_of_business"] == "B2C Large":
-		for item in report_data:
+		for item in report_data[:-1]:
 			res.setdefault(item["place_of_supply"], []).append(item)
 
 		out = get_b2cl_json(res, gstin)
 		gst_json["b2cl"] = out
 	elif filters["type_of_business"] == "EXPORT":
-		for item in report_data:
+		for item in report_data[:-1]:
 			res.setdefault(item["export_type"], []).append(item)
 
 		out = get_export_json(res)
@@ -594,7 +580,7 @@
 	download_json_file(report_name, filters["type_of_business"], gst_json)
 
 def get_b2b_json(res, gstin):
-	inv_type, out = {"Regular": "R", "Deemed Export": "DE", "URD": "URD", "SEZ": "SEZ"}, []
+	inv_type, out = {"Registered Regular": "R", "Deemed Export": "DE", "URD": "URD", "SEZ": "SEZ"}, []
 	for gst_in in res:
 		b2b_item, inv = {"ctin": gst_in, "inv": []}, []
 		if not gst_in: continue
@@ -603,7 +589,7 @@
 			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"]
-			inv_item["inv_typ"] = inv_type.get(invoice[0].get("invoice_type", ""),"")
+			inv_item["inv_typ"] = inv_type.get(invoice[0].get("gst_category", ""),"")
 
 			if inv_item["pos"]=="00": continue
 			inv_item["itms"] = []
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 178a21d..458a56c 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -3,6 +3,18 @@
 
 frappe.ui.form.on("Customer", {
 	setup: function(frm) {
+
+		frm.make_methods = {
+			'Quotation': () => erpnext.utils.create_new_doc('Quotation', {
+				'quotation_to': frm.doc.doctype,
+				'party_name': frm.doc.name
+			}),
+			'Opportunity': () => erpnext.utils.create_new_doc('Opportunity', {
+				'opportunity_from': frm.doc.doctype,
+				'party_name': frm.doc.name
+			})
+		}
+
 		frm.add_fetch('lead_name', 'company_name', 'customer_name');
 		frm.add_fetch('default_sales_partner','commission_rate','default_commission_rate');
 		frm.set_query('customer_group', {'is_group': 0});
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 365c2ed..c946c47 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -61,7 +61,7 @@
 				self.loyalty_program_tier = customer.loyalty_program_tier
 
 		if self.sales_team:
-			if sum([member.allocated_percentage for member in self.sales_team]) != 100:
+			if sum([member.allocated_percentage or 0 for member in self.sales_team]) != 100:
 				frappe.throw(_("Total contribution percentage should be equal to 100"))
 
 	def check_customer_group_change(self):
@@ -108,10 +108,6 @@
 		if self.lead_name:
 			frappe.db.set_value('Lead', self.lead_name, 'status', 'Converted', update_modified=False)
 
-			for doctype in ('Opportunity', 'Quotation'):
-				for d in frappe.get_all(doctype, {'lead': self.lead_name}):
-					frappe.db.set_value(doctype, d.name, 'customer', self.name, update_modified=False)
-
 	def create_lead_address_contact(self):
 		if self.lead_name:
 			# assign lead address to customer (if already not set)
diff --git a/erpnext/selling/doctype/customer/customer_dashboard.py b/erpnext/selling/doctype/customer/customer_dashboard.py
index 243c1eb..87ca6a7 100644
--- a/erpnext/selling/doctype/customer/customer_dashboard.py
+++ b/erpnext/selling/doctype/customer/customer_dashboard.py
@@ -9,7 +9,12 @@
 		'heatmap_message': _('This is based on transactions against this Customer. See timeline below for details'),
 		'fieldname': 'customer',
 		'non_standard_fieldnames': {
-			'Payment Entry': 'party_name'
+			'Payment Entry': 'party_name',
+			'Quotation': 'party_name',
+			'Opportunity': 'party_name'
+		},
+		'dynamic_links': {
+			'party_name': ['Customer', 'quotation_to']
 		},
 		'transactions': [
 			{
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index d8e940b..12f3260 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -8,15 +8,27 @@
 	setup: function(frm) {
 		frm.custom_make_buttons = {
 			'Sales Order': 'Make Sales Order'
-		}
+		},
+
+		frm.set_query("quotation_to", function() {
+			return{
+				"filters": {
+					"name": ["in", ["Customer", "Lead"]],
+				}
+			}
+		});
+
 	},
 
 	refresh: function(frm) {
 		frm.trigger("set_label");
+		frm.trigger("set_dynamic_field_label");
 	},
 
 	quotation_to: function(frm) {
 		frm.trigger("set_label");
+		frm.trigger("toggle_reqd_lead_customer");
+		frm.trigger("set_dynamic_field_label");
 	},
 
 	set_label: function(frm) {
@@ -28,16 +40,22 @@
 	onload: function(doc, dt, dn) {
 		var me = this;
 		this._super(doc, dt, dn);
-		if(doc.customer && !doc.quotation_to)
-			doc.quotation_to = "Customer";
-		else if(doc.lead && !doc.quotation_to)
-			doc.quotation_to = "Lead";
 
 	},
+	party_name: function() {
+		var me = this;
+		erpnext.utils.get_party_details(this.frm, null, null, function() {
+			me.apply_price_list();
+		});
+
+		if(me.frm.doc.quotation_to=="Lead" && me.frm.doc.party_name) {
+			me.frm.trigger("get_lead_details");
+		}
+	},
 	refresh: function(doc, dt, dn) {
 		this._super(doc, dt, dn);
 		doctype = doc.quotation_to == 'Customer' ? 'Customer':'Lead';
-		frappe.dynamic_link = {doc: this.frm.doc, fieldname: doctype.toLowerCase(), doctype: doctype}
+		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'party_name', doctype: doctype}
 
 		var me = this;
 
@@ -73,22 +91,29 @@
 		if (this.frm.doc.docstatus===0) {
 			this.frm.add_custom_button(__('Opportunity'),
 				function() {
-					var setters = {};
-					if(me.frm.doc.customer) {
-						setters.customer = me.frm.doc.customer || undefined;
-					} else if (me.frm.doc.lead) {
-						setters.lead = me.frm.doc.lead || undefined;
-					}
 					erpnext.utils.map_current_doc({
 						method: "erpnext.crm.doctype.opportunity.opportunity.make_quotation",
 						source_doctype: "Opportunity",
 						target: me.frm,
-						setters: setters,
+						setters: [
+							{
+								label: "Party",
+								fieldname: "party_name",
+								fieldtype: "Link",
+								options: me.frm.doc.quotation_to,
+								default: me.frm.doc.party_name || undefined
+							},
+							{
+								label: "Opportunity Type",
+								fieldname: "opportunity_type",
+								fieldtype: "Link",
+								options: "Opportunity Type",
+								default: me.frm.doc.order_type || undefined
+							}
+						],
 						get_query_filters: {
 							status: ["not in", ["Lost", "Closed"]],
-							company: me.frm.doc.company,
-							// cannot set opportunity_type as setter, as the fieldname is order_type
-							opportunity_type: me.frm.doc.order_type,
+							company: me.frm.doc.company
 						}
 					})
 				}, __("Get items from"), "btn-default");
@@ -98,33 +123,46 @@
 
 	},
 
-	quotation_to: function() {
-		var me = this;
-		if (this.frm.doc.quotation_to == "Lead") {
-			this.frm.set_value("customer", null);
-			this.frm.set_value("contact_person", null);
-		} else if (this.frm.doc.quotation_to == "Customer") {
-			this.frm.set_value("lead", null);
+	set_dynamic_field_label: function(){
+		if (this.frm.doc.quotation_to == "Customer")
+		{
+			this.frm.set_df_property("party_name", "label", "Customer");
+			this.frm.fields_dict.party_name.get_query = null;
 		}
 
-		this.toggle_reqd_lead_customer();
+		if (this.frm.doc.quotation_to == "Lead")
+		{
+			this.frm.set_df_property("party_name", "label", "Lead");
+
+			this.frm.fields_dict.party_name.get_query = function() {
+				return{	query: "erpnext.controllers.queries.lead_query" }
+			}
+		}
 	},
 
 	toggle_reqd_lead_customer: function() {
 		var me = this;
 
-		this.frm.toggle_reqd("lead", this.frm.doc.quotation_to == "Lead");
-		this.frm.toggle_reqd("customer", this.frm.doc.quotation_to == "Customer");
-
 		// to overwrite the customer_filter trigger from queries.js
-		this.frm.set_query('customer_address', erpnext.queries.address_query);
-		this.frm.set_query('shipping_address_name', erpnext.queries.address_query);
+		this.frm.toggle_reqd("party_name", this.frm.doc.quotation_to);
+		this.frm.set_query('customer_address', this.address_query);
+		this.frm.set_query('shipping_address_name', this.address_query);
 	},
 
 	tc_name: function() {
 		this.get_terms();
 	},
 
+	address_query: function(doc) {
+		return {
+			query: 'frappe.contacts.doctype.address.address.address_query',
+			filters: {
+				link_doctype: frappe.dynamic_link.doctype,
+				link_name: doc.party_name
+			}
+		};
+	},
+
 	validate_company_and_party: function(party_field) {
 		if(!this.frm.doc.quotation_to) {
 			frappe.msgprint(__("Please select a value for {0} quotation_to {1}", [this.frm.doc.doctype, this.frm.doc.name]));
@@ -136,16 +174,16 @@
 		}
 	},
 
-	lead: function() {
+	get_lead_details: function() {
 		var me = this;
-		if(!this.frm.doc.lead) {
+		if(!this.frm.doc.quotation_to === "Lead") {
 			return;
 		}
 
 		frappe.call({
 			method: "erpnext.crm.doctype.lead.lead.get_lead_details",
 			args: {
-				'lead': this.frm.doc.lead,
+				'lead': this.frm.doc.party_name,
 				'posting_date': this.frm.doc.transaction_date,
 				'company': this.frm.doc.company,
 			},
@@ -164,10 +202,6 @@
 
 cur_frm.script_manager.make(erpnext.selling.QuotationController);
 
-cur_frm.fields_dict.lead.get_query = function(doc,cdt,cdn) {
-	return{	query: "erpnext.controllers.queries.lead_query" }
-}
-
 cur_frm.cscript['Make Sales Order'] = function() {
 	frappe.model.open_mapped_doc({
 		method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index ef5abdb..1b89545 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1,1028 +1,3441 @@
 {
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-05-24 19:29:08",
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "customer_section",
-  "title",
-  "naming_series",
-  "quotation_to",
-  "customer",
-  "lead",
-  "customer_name",
-  "column_break1",
-  "amended_from",
-  "company",
-  "transaction_date",
-  "valid_till",
-  "order_type",
-  "contact_section",
-  "customer_address",
-  "address_display",
-  "contact_person",
-  "contact_display",
-  "contact_mobile",
-  "contact_email",
-  "col_break98",
-  "shipping_address_name",
-  "shipping_address",
-  "customer_group",
-  "territory",
-  "currency_and_price_list",
-  "currency",
-  "conversion_rate",
-  "column_break2",
-  "selling_price_list",
-  "price_list_currency",
-  "plc_conversion_rate",
-  "ignore_pricing_rule",
-  "items_section",
-  "items",
-  "pricing_rule_details",
-  "pricing_rules",
-  "sec_break23",
-  "total_qty",
-  "base_total",
-  "base_net_total",
-  "column_break_28",
-  "total",
-  "net_total",
-  "total_net_weight",
-  "taxes_section",
-  "tax_category",
-  "column_break_34",
-  "shipping_rule",
-  "section_break_36",
-  "taxes_and_charges",
-  "taxes",
-  "sec_tax_breakup",
-  "other_charges_calculation",
-  "section_break_39",
-  "base_total_taxes_and_charges",
-  "column_break_42",
-  "total_taxes_and_charges",
-  "section_break_44",
-  "apply_discount_on",
-  "base_discount_amount",
-  "column_break_46",
-  "additional_discount_percentage",
-  "discount_amount",
-  "totals",
-  "base_grand_total",
-  "base_rounding_adjustment",
-  "base_in_words",
-  "base_rounded_total",
-  "column_break3",
-  "grand_total",
-  "rounding_adjustment",
-  "rounded_total",
-  "in_words",
-  "payment_schedule_section",
-  "payment_terms_template",
-  "payment_schedule",
-  "terms_section_break",
-  "tc_name",
-  "terms",
-  "print_settings",
-  "letter_head",
-  "group_same_items",
-  "column_break_73",
-  "select_print_heading",
-  "language",
-  "subscription_section",
-  "auto_repeat",
-  "update_auto_repeat_reference",
-  "more_info",
-  "campaign",
-  "source",
-  "order_lost_reason",
-  "column_break4",
-  "status",
-  "enq_det",
-  "supplier_quotation",
-  "opportunity",
-  "lost_reasons"
- ],
- "fields": [
-  {
-   "fieldname": "customer_section",
-   "fieldtype": "Section Break",
-   "options": "fa fa-user"
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "{customer_name}",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Title",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "SAL-QTN-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "default": "Customer",
-   "fieldname": "quotation_to",
-   "fieldtype": "Select",
-   "label": "Quotation To",
-   "oldfieldname": "quotation_to",
-   "oldfieldtype": "Select",
-   "options": "\nLead\nCustomer",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "bold": 1,
-   "depends_on": "eval:doc.quotation_to == \"Customer\"",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_standard_filter": 1,
-   "label": "Customer",
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "print_hide": 1,
-   "search_index": 1
-  },
-  {
-   "bold": 1,
-   "depends_on": "eval:doc.quotation_to == \"Lead\"",
-   "fieldname": "lead",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Lead",
-   "oldfieldname": "lead",
-   "oldfieldtype": "Link",
-   "options": "Lead",
-   "print_hide": 1
-  },
-  {
-   "bold": 1,
-   "fetch_from": "customer.customer_name",
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "in_global_search": 1,
-   "label": "Customer Name",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "options": "Quotation",
-   "print_hide": 1,
-   "read_only": 1,
-   "width": "150px"
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "print_hide": 1,
-   "remember_last_selected_value": 1,
-   "reqd": 1,
-   "width": "150px"
-  },
-  {
-   "default": "Today",
-   "fieldname": "transaction_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Date",
-   "no_copy": 1,
-   "oldfieldname": "transaction_date",
-   "oldfieldtype": "Date",
-   "reqd": 1,
-   "search_index": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "valid_till",
-   "fieldtype": "Date",
-   "label": "Valid Till"
-  },
-  {
-   "default": "Sales",
-   "fieldname": "order_type",
-   "fieldtype": "Select",
-   "in_standard_filter": 1,
-   "label": "Order Type",
-   "oldfieldname": "order_type",
-   "oldfieldtype": "Select",
-   "options": "\nSales\nMaintenance\nShopping Cart",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "collapsible": 1,
-   "depends_on": "eval:(doc.customer || doc.lead)",
-   "fieldname": "contact_section",
-   "fieldtype": "Section Break",
-   "label": "Address and Contact",
-   "options": "fa fa-bullhorn"
-  },
-  {
-   "fieldname": "customer_address",
-   "fieldtype": "Link",
-   "label": "Customer Address",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "address_display",
-   "fieldtype": "Small Text",
-   "label": "Address",
-   "oldfieldname": "customer_address",
-   "oldfieldtype": "Small Text",
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:doc.customer",
-   "fieldname": "contact_person",
-   "fieldtype": "Link",
-   "label": "Contact Person",
-   "oldfieldname": "contact_person",
-   "oldfieldtype": "Link",
-   "options": "Contact",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "contact_display",
-   "fieldtype": "Small Text",
-   "in_global_search": 1,
-   "label": "Contact",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_mobile",
-   "fieldtype": "Small Text",
-   "label": "Mobile No",
-   "read_only": 1
-  },
-  {
-   "fieldname": "contact_email",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Contact Email",
-   "options": "Email",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "customer",
-   "fieldname": "col_break98",
-   "fieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "shipping_address_name",
-   "fieldtype": "Link",
-   "label": "Shipping Address",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
-   "label": "Shipping Address",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "customer",
-   "fieldname": "customer_group",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Customer Group",
-   "oldfieldname": "customer_group",
-   "oldfieldtype": "Link",
-   "options": "Customer Group",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "territory",
-   "fieldtype": "Link",
-   "label": "Territory",
-   "options": "Territory",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "currency_and_price_list",
-   "fieldtype": "Section Break",
-   "label": "Currency and Price List",
-   "options": "fa fa-tag"
-  },
-  {
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "label": "Currency",
-   "oldfieldname": "currency",
-   "oldfieldtype": "Select",
-   "options": "Currency",
-   "print_hide": 1,
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "description": "Rate at which customer's currency is converted to company's base currency",
-   "fieldname": "conversion_rate",
-   "fieldtype": "Float",
-   "label": "Exchange Rate",
-   "oldfieldname": "conversion_rate",
-   "oldfieldtype": "Currency",
-   "precision": "9",
-   "print_hide": 1,
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "selling_price_list",
-   "fieldtype": "Link",
-   "label": "Price List",
-   "oldfieldname": "price_list_name",
-   "oldfieldtype": "Select",
-   "options": "Price List",
-   "print_hide": 1,
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "price_list_currency",
-   "fieldtype": "Link",
-   "label": "Price List Currency",
-   "options": "Currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "description": "Rate at which Price list currency is converted to company's base currency",
-   "fieldname": "plc_conversion_rate",
-   "fieldtype": "Float",
-   "label": "Price List Exchange Rate",
-   "precision": "9",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "ignore_pricing_rule",
-   "fieldtype": "Check",
-   "label": "Ignore Pricing Rule",
-   "no_copy": 1,
-   "permlevel": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "items_section",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart"
-  },
-  {
-   "allow_bulk_edit": 1,
-   "fieldname": "items",
-   "fieldtype": "Table",
-   "label": "Items",
-   "oldfieldname": "quotation_details",
-   "oldfieldtype": "Table",
-   "options": "Quotation Item",
-   "reqd": 1,
-   "width": "40px"
-  },
-  {
-   "fieldname": "pricing_rule_details",
-   "fieldtype": "Section Break",
-   "label": "Pricing Rules"
-  },
-  {
-   "fieldname": "pricing_rules",
-   "fieldtype": "Table",
-   "label": "Pricing Rule Detail",
-   "options": "Pricing Rule Detail",
-   "read_only": 1
-  },
-  {
-   "fieldname": "sec_break23",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "total_qty",
-   "fieldtype": "Float",
-   "label": "Total Quantity",
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_total",
-   "fieldtype": "Currency",
-   "label": "Total (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_net_total",
-   "fieldtype": "Currency",
-   "label": "Net Total (Company Currency)",
-   "oldfieldname": "net_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "column_break_28",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total",
-   "fieldtype": "Currency",
-   "label": "Total",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "net_total",
-   "fieldtype": "Currency",
-   "label": "Net Total",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "total_net_weight",
-   "fieldtype": "Float",
-   "label": "Total Net Weight",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "taxes_section",
-   "fieldtype": "Section Break",
-   "label": "Taxes and Charges",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money"
-  },
-  {
-   "fieldname": "tax_category",
-   "fieldtype": "Link",
-   "label": "Tax Category",
-   "options": "Tax Category",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_34",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "shipping_rule",
-   "fieldtype": "Link",
-   "label": "Shipping Rule",
-   "oldfieldtype": "Button",
-   "options": "Shipping Rule",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "section_break_36",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "taxes_and_charges",
-   "fieldtype": "Link",
-   "label": "Sales Taxes and Charges Template",
-   "oldfieldname": "charge",
-   "oldfieldtype": "Link",
-   "options": "Sales Taxes and Charges Template",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "label": "Sales Taxes and Charges",
-   "oldfieldname": "other_charges",
-   "oldfieldtype": "Table",
-   "options": "Sales Taxes and Charges"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sec_tax_breakup",
-   "fieldtype": "Section Break",
-   "label": "Tax Breakup"
-  },
-  {
-   "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
-   "label": "Taxes and Charges Calculation",
-   "no_copy": 1,
-   "oldfieldtype": "HTML",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_39",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "base_total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges (Company Currency)",
-   "oldfieldname": "other_charges_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_42",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "label": "Total Taxes and Charges",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "discount_amount",
-   "fieldname": "section_break_44",
-   "fieldtype": "Section Break",
-   "label": "Additional Discount"
-  },
-  {
-   "default": "Grand Total",
-   "fieldname": "apply_discount_on",
-   "fieldtype": "Select",
-   "label": "Apply Additional Discount On",
-   "options": "\nGrand Total\nNet Total",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_discount_amount",
-   "fieldtype": "Currency",
-   "label": "Additional Discount Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_46",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "additional_discount_percentage",
-   "fieldtype": "Float",
-   "label": "Additional Discount Percentage",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "discount_amount",
-   "fieldtype": "Currency",
-   "label": "Additional Discount Amount",
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "totals",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "base_grand_total",
-   "fieldtype": "Currency",
-   "label": "Grand Total (Company Currency)",
-   "oldfieldname": "grand_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "width": "200px"
-  },
-  {
-   "fieldname": "base_rounding_adjustment",
-   "fieldtype": "Currency",
-   "label": "Rounding Adjustment (Company Currency)",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "description": "In Words will be visible once you save the Quotation.",
-   "fieldname": "base_in_words",
-   "fieldtype": "Data",
-   "label": "In Words (Company Currency)",
-   "oldfieldname": "in_words",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "read_only": 1,
-   "width": "200px"
-  },
-  {
-   "fieldname": "base_rounded_total",
-   "fieldtype": "Currency",
-   "label": "Rounded Total (Company Currency)",
-   "oldfieldname": "rounded_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "width": "200px"
-  },
-  {
-   "fieldname": "column_break3",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_hide": 1,
-   "width": "50%"
-  },
-  {
-   "fieldname": "grand_total",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Grand Total",
-   "oldfieldname": "grand_total_export",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "read_only": 1,
-   "width": "200px"
-  },
-  {
-   "fieldname": "rounding_adjustment",
-   "fieldtype": "Currency",
-   "label": "Rounding Adjustment",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "rounded_total",
-   "fieldtype": "Currency",
-   "label": "Rounded Total",
-   "oldfieldname": "rounded_total_export",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "read_only": 1,
-   "width": "200px"
-  },
-  {
-   "fieldname": "in_words",
-   "fieldtype": "Data",
-   "label": "In Words",
-   "oldfieldname": "in_words_export",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "read_only": 1,
-   "width": "200px"
-  },
-  {
-   "fieldname": "payment_schedule_section",
-   "fieldtype": "Section Break",
-   "label": "Payment Terms"
-  },
-  {
-   "fieldname": "payment_terms_template",
-   "fieldtype": "Link",
-   "label": "Payment Terms Template",
-   "options": "Payment Terms Template",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "payment_schedule",
-   "fieldtype": "Table",
-   "label": "Payment Schedule",
-   "no_copy": 1,
-   "options": "Payment Schedule",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "terms",
-   "fieldname": "terms_section_break",
-   "fieldtype": "Section Break",
-   "label": "Terms and Conditions",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-legal"
-  },
-  {
-   "fieldname": "tc_name",
-   "fieldtype": "Link",
-   "label": "Terms",
-   "oldfieldname": "tc_name",
-   "oldfieldtype": "Link",
-   "options": "Terms and Conditions",
-   "print_hide": 1,
-   "report_hide": 1
-  },
-  {
-   "fieldname": "terms",
-   "fieldtype": "Text Editor",
-   "label": "Term Details",
-   "oldfieldname": "terms",
-   "oldfieldtype": "Text Editor"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "print_settings",
-   "fieldtype": "Section Break",
-   "label": "Print Settings"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "label": "Letter Head",
-   "oldfieldname": "letter_head",
-   "oldfieldtype": "Select",
-   "options": "Letter Head",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "0",
-   "fieldname": "group_same_items",
-   "fieldtype": "Check",
-   "label": "Group same items",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_73",
-   "fieldtype": "Column Break"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "select_print_heading",
-   "fieldtype": "Link",
-   "label": "Print Heading",
-   "no_copy": 1,
-   "oldfieldname": "select_print_heading",
-   "oldfieldtype": "Link",
-   "options": "Print Heading",
-   "print_hide": 1,
-   "report_hide": 1
-  },
-  {
-   "fieldname": "language",
-   "fieldtype": "Data",
-   "label": "Print Language",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat Section"
-  },
-  {
-   "fieldname": "auto_repeat",
-   "fieldtype": "Link",
-   "label": "Auto Repeat",
-   "no_copy": 1,
-   "options": "Auto Repeat",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "depends_on": "eval: doc.auto_repeat",
-   "fieldname": "update_auto_repeat_reference",
-   "fieldtype": "Button",
-   "label": "Update Auto Repeat Reference"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "More Information",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-file-text",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "campaign",
-   "fieldtype": "Link",
-   "label": "Campaign",
-   "oldfieldname": "campaign",
-   "oldfieldtype": "Link",
-   "options": "Campaign",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "source",
-   "fieldtype": "Link",
-   "label": "Source",
-   "oldfieldname": "source",
-   "oldfieldtype": "Select",
-   "options": "Lead Source",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "depends_on": "eval:doc.status===\"Lost\"",
-   "fieldname": "order_lost_reason",
-   "fieldtype": "Small Text",
-   "label": "Detailed Reason",
-   "no_copy": 1,
-   "oldfieldname": "order_lost_reason",
-   "oldfieldtype": "Small Text",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break4",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_hide": 1,
-   "width": "50%"
-  },
-  {
-   "default": "Draft",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Status",
-   "no_copy": 1,
-   "oldfieldname": "status",
-   "oldfieldtype": "Select",
-   "options": "Draft\nOpen\nReplied\nOrdered\nLost\nCancelled",
-   "print_hide": 1,
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "enq_det",
-   "fieldtype": "Text",
-   "hidden": 1,
-   "label": "Opportunity Item",
-   "oldfieldname": "enq_det",
-   "oldfieldtype": "Text",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "supplier_quotation",
-   "fieldtype": "Link",
-   "label": "Supplier Quotation",
-   "options": "Supplier Quotation"
-  },
-  {
-   "fieldname": "opportunity",
-   "fieldtype": "Link",
-   "label": "Opportunity",
-   "options": "Opportunity",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "lost_reasons",
-   "fieldtype": "Table MultiSelect",
-   "label": "Lost Reasons",
-   "options": "Lost Reason Detail",
-   "read_only": 1
+   "allow_copy": 0,
+   "allow_events_in_timeline": 0,
+   "allow_guest_to_view": 0,
+   "allow_import": 1,
+   "allow_rename": 0,
+   "autoname": "naming_series:",
+   "beta": 0,
+   "creation": "2013-05-24 19:29:08",
+   "custom": 0,
+   "docstatus": 0,
+   "doctype": "DocType",
+   "document_type": "Document",
+   "editable_grid": 1,
+   "fields": [
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "customer_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": "",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-user",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "{customer_name}",
+     "fieldname": "title",
+     "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": "Title",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "",
+     "fieldname": "naming_series",
+     "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": "Series",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "naming_series",
+     "oldfieldtype": "Select",
+     "options": "SAL-QTN-.YYYY.-",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 1,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Customer",
+     "fetch_if_empty": 0,
+     "fieldname": "quotation_to",
+     "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": 1,
+     "label": "Quotation To",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "quotation_to",
+     "oldfieldtype": "Select",
+     "options": "DocType",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0
+     },
+     {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "party_name",
+     "fieldtype": "Dynamic Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 0,
+     "in_standard_filter": 1,
+     "label": "Party",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "customer",
+     "oldfieldtype": "Link",
+     "options": "quotation_to",
+     "permlevel": 0,
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_from": "",
+     "fieldname": "customer_name",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Customer Name",
+     "length": 0,
+     "no_copy": 0,
+     "options": "",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break1",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "amended_from",
+     "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": "Amended From",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "amended_from",
+     "oldfieldtype": "Data",
+     "options": "Quotation",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "",
+     "fieldname": "company",
+     "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": "Company",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "company",
+     "oldfieldtype": "Link",
+     "options": "Company",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 1,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Today",
+     "fieldname": "transaction_date",
+     "fieldtype": "Date",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 1,
+     "in_standard_filter": 1,
+     "label": "Date",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "transaction_date",
+     "oldfieldtype": "Date",
+     "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": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "valid_till",
+     "fieldtype": "Date",
+     "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": "Valid Till",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Sales",
+     "fieldname": "order_type",
+     "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": 1,
+     "label": "Order Type",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "order_type",
+     "oldfieldtype": "Select",
+     "options": "\nSales\nMaintenance\nShopping Cart",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "",
+     "columns": 0,
+     "depends_on": "party_name",
+     "fieldname": "contact_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": "Address and Contact",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-bullhorn",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "customer_address",
+     "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": "Customer Address",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Address",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "address_display",
+     "fieldtype": "Small Text",
+     "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": "Address",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "customer_address",
+     "oldfieldtype": "Small Text",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "contact_person",
+     "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": "Contact Person",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "contact_person",
+     "oldfieldtype": "Link",
+     "options": "Contact",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "contact_display",
+     "fieldtype": "Small Text",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Contact",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "contact_mobile",
+     "fieldtype": "Small Text",
+     "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": "Mobile No",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "contact_email",
+     "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": "Contact Email",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Email",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:doc.quotaion_to=='Customer' && doc.party_name",
+     "fieldname": "col_break98",
+     "fieldtype": "Column 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,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "shipping_address_name",
+     "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": "Shipping Address",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Address",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "shipping_address",
+     "fieldtype": "Small Text",
+     "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": "Shipping Address",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:doc.quotaion_to=='Customer' && doc.party_name",
+     "description": "",
+     "fieldname": "customer_group",
+     "fieldtype": "Link",
+     "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": "Customer Group",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "customer_group",
+     "oldfieldtype": "Link",
+     "options": "Customer Group",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "",
+     "fieldname": "territory",
+     "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": "Territory",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Territory",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fieldname": "currency_and_price_list",
+     "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": "Currency and Price List",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-tag",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "currency",
+     "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": "Currency",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "currency",
+     "oldfieldtype": "Select",
+     "options": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Rate at which customer's currency is converted to company's base currency",
+     "fieldname": "conversion_rate",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Exchange Rate",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "conversion_rate",
+     "oldfieldtype": "Currency",
+     "permlevel": 0,
+     "precision": "9",
+     "print_hide": 1,
+     "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": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break2",
+     "fieldtype": "Column 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,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "selling_price_list",
+     "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": "Price List",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "price_list_name",
+     "oldfieldtype": "Select",
+     "options": "Price List",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "price_list_currency",
+     "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": "Price List Currency",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Rate at which Price list currency is converted to company's base currency",
+     "fieldname": "plc_conversion_rate",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Price List Exchange Rate",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "9",
+     "print_hide": 1,
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "ignore_pricing_rule",
+     "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": "Ignore Pricing Rule",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 1,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "items_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": "",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-shopping-cart",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 1,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "items",
+     "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": "Items",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "quotation_details",
+     "oldfieldtype": "Table",
+     "options": "Quotation Item",
+     "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": 0,
+     "width": "40px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "pricing_rule_details",
+     "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": "Pricing Rules",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "pricing_rules",
+     "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": "Pricing Rule Detail",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Pricing Rule Detail",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "sec_break23",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "total_qty",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Total Quantity",
+     "length": 0,
+     "no_copy": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_total",
+     "fieldtype": "Currency",
+     "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": "Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_net_total",
+     "fieldtype": "Currency",
+     "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": "Net Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "net_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_28",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "total",
+     "fieldtype": "Currency",
+     "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": "Total",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "net_total",
+     "fieldtype": "Currency",
+     "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": "Net Total",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "total_net_weight",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Total Net Weight",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "taxes_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": "Taxes and Charges",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "tax_category",
+     "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": "Tax Category",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Tax Category",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_34",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "shipping_rule",
+     "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": "Shipping Rule",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Button",
+     "options": "Shipping Rule",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "section_break_36",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "taxes_and_charges",
+     "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": "Sales Taxes and Charges Template",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "charge",
+     "oldfieldtype": "Link",
+     "options": "Sales Taxes and Charges Template",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "taxes",
+     "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": "Sales Taxes and Charges",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "other_charges",
+     "oldfieldtype": "Table",
+     "options": "Sales Taxes and Charges",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fieldname": "sec_tax_breakup",
+     "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": "Tax Breakup",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "other_charges_calculation",
+     "fieldtype": "Text",
+     "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": "Taxes and Charges Calculation",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldtype": "HTML",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "section_break_39",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "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": "Total Taxes and Charges (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "other_charges_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_42",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "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": "Total Taxes and Charges",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "discount_amount",
+     "columns": 0,
+     "fieldname": "section_break_44",
+     "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": "Additional Discount",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Grand Total",
+     "fieldname": "apply_discount_on",
+     "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": "Apply Additional Discount On",
+     "length": 0,
+     "no_copy": 0,
+     "options": "\nGrand Total\nNet Total",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_discount_amount",
+     "fieldtype": "Currency",
+     "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": "Additional Discount Amount (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_46",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "additional_discount_percentage",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Additional Discount Percentage",
+     "length": 0,
+     "no_copy": 0,
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "discount_amount",
+     "fieldtype": "Currency",
+     "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": "Additional Discount Amount",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "totals",
+     "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": "",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_grand_total",
+     "fieldtype": "Currency",
+     "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": "Grand Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "grand_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_rounding_adjustment",
+     "fieldtype": "Currency",
+     "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": "Rounding Adjustment (Company Currency)",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "In Words will be visible once you save the Quotation.",
+     "fieldname": "base_in_words",
+     "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": "In Words (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "in_words",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "base_rounded_total",
+     "fieldtype": "Currency",
+     "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": "Rounded Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "rounded_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break3",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "grand_total",
+     "fieldtype": "Currency",
+     "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": "Grand Total",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "grand_total_export",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "permlevel": 0,
+     "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,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "rounding_adjustment",
+     "fieldtype": "Currency",
+     "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": "Rounding Adjustment",
+     "length": 0,
+     "no_copy": 1,
+     "options": "currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "rounded_total",
+     "fieldtype": "Currency",
+     "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": "Rounded Total",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "rounded_total_export",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "permlevel": 0,
+     "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,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "in_words",
+     "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": "In Words",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "in_words_export",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "collapsible_depends_on": "",
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "payment_schedule_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": "Payment Terms",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "payment_terms_template",
+     "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": "Payment Terms Template",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Payment Terms Template",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "payment_schedule",
+     "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": "Payment Schedule",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Payment Schedule",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "terms",
+     "columns": 0,
+     "fieldname": "terms_section_break",
+     "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": "Terms and Conditions",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-legal",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "tc_name",
+     "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": "Terms",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "tc_name",
+     "oldfieldtype": "Link",
+     "options": "Terms and Conditions",
+     "permlevel": 0,
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "terms",
+     "fieldtype": "Text Editor",
+     "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": "Term Details",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "terms",
+     "oldfieldtype": "Text Editor",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fieldname": "print_settings",
+     "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": "Print Settings",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "letter_head",
+     "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": "Letter Head",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "letter_head",
+     "oldfieldtype": "Select",
+     "options": "Letter Head",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "group_same_items",
+     "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": "Group same items",
+     "length": 0,
+     "no_copy": 0,
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_73",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "select_print_heading",
+     "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": "Print Heading",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "select_print_heading",
+     "oldfieldtype": "Link",
+     "options": "Print Heading",
+     "permlevel": 0,
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "language",
+     "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": "Print Language",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "subscription_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": "Auto Repeat Section",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "auto_repeat",
+     "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": "Auto Repeat",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Auto Repeat",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval: doc.auto_repeat",
+     "fieldname": "update_auto_repeat_reference",
+     "fieldtype": "Button",
+     "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": "Update Auto Repeat Reference",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fieldname": "more_info",
+     "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": "More Information",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-file-text",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "campaign",
+     "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": "Campaign",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "campaign",
+     "oldfieldtype": "Link",
+     "options": "Campaign",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "source",
+     "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": "Source",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "source",
+     "oldfieldtype": "Select",
+     "options": "Lead Source",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:doc.status===\"Lost\"",
+     "fieldname": "order_lost_reason",
+     "fieldtype": "Small Text",
+     "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": "Detailed Reason",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "order_lost_reason",
+     "oldfieldtype": "Small Text",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break4",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Draft",
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "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": "Status",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "status",
+     "oldfieldtype": "Select",
+     "options": "Draft\nOpen\nReplied\nOrdered\nLost\nCancelled",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "enq_det",
+     "fieldtype": "Text",
+     "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": "Opportunity Item",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "enq_det",
+     "oldfieldtype": "Text",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "supplier_quotation",
+     "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": "Supplier Quotation",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Supplier Quotation",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "opportunity",
+     "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": "Opportunity",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Opportunity",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "lost_reasons",
+     "fieldtype": "Table MultiSelect",
+     "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": "Lost Reasons",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Lost Reason Detail",
+     "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
+    }
+   ],
+   "has_web_view": 0,
+   "hide_heading": 0,
+   "hide_toolbar": 0,
+   "icon": "fa fa-shopping-cart",
+   "idx": 82,
+   "image_view": 0,
+   "in_create": 0,
+   "is_submittable": 1,
+   "issingle": 0,
+   "istable": 0,
+   "max_attachments": 1,
+   "menu_index": 0,
+   "modified": "2019-06-26 01:00:21.545591",
+   "modified_by": "Administrator",
+   "module": "Selling",
+   "name": "Quotation",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Sales User",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "match": "",
+     "permlevel": 1,
+     "print": 0,
+     "read": 1,
+     "report": 1,
+     "role": "Sales User",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 0
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "match": "",
+     "permlevel": 1,
+     "print": 0,
+     "read": 1,
+     "report": 1,
+     "role": "Sales Manager",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 1,
+     "if_owner": 0,
+     "import": 1,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Sales Manager",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Maintenance Manager",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "match": "",
+     "permlevel": 1,
+     "print": 0,
+     "read": 1,
+     "report": 1,
+     "role": "Maintenance Manager",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 0
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Maintenance User",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "match": "",
+     "permlevel": 1,
+     "print": 0,
+     "read": 1,
+     "report": 1,
+     "role": "Maintenance User",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 0
+    }
+   ],
+   "quick_entry": 0,
+   "read_only": 0,
+   "read_only_onload": 1,
+   "search_fields": "status,transaction_date,party_name,order_type",
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "timeline_field": "party_name",
+   "title_field": "title",
+   "track_changes": 0,
+   "track_seen": 0,
+   "track_views": 0
   }
- ],
- "icon": "fa fa-shopping-cart",
- "idx": 82,
- "is_submittable": 1,
- "max_attachments": 1,
- "modified": "2019-06-25 16:03:17.603222",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Quotation",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User"
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "import": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance Manager"
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance User"
-  }
- ],
- "search_fields": "status,transaction_date,customer,lead,order_type",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "customer",
- "title_field": "title"
-}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 4e6c833..cc73e76 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -28,8 +28,8 @@
 		self.update_opportunity()
 		self.validate_order_type()
 		self.validate_uom_is_integer("stock_uom", "qty")
-		self.validate_quotation_to()
 		self.validate_valid_till()
+		self.set_customer_name()
 		if self.items:
 			self.with_items = 1
 
@@ -43,16 +43,16 @@
 	def validate_order_type(self):
 		super(Quotation, self).validate_order_type()
 
-	def validate_quotation_to(self):
-		if self.customer:
-			self.quotation_to = "Customer"
-			self.lead = None
-		elif self.lead:
-			self.quotation_to = "Lead"
-
 	def update_lead(self):
-		if self.lead:
-			frappe.get_doc("Lead", self.lead).set_status(update=True)
+		if self.quotation_to == "Lead" and self.party_name:
+			frappe.get_doc("Lead", self.party_name).set_status(update=True)
+
+	def set_customer_name(self):
+		if self.party_name and self.quotation_to == 'Customer':
+			self.customer_name = frappe.db.get_value("Customer", self.party_name, "customer_name")
+		elif self.party_name and self.quotation_to == 'Lead':
+			lead_name, company_name = frappe.db.get_value("Lead", self.party_name, ["lead_name", "company_name"])
+			self.customer_name = company_name or lead_name
 
 	def update_opportunity(self):
 		for opportunity in list(set([d.prevdoc_docname for d in self.get("items")])):
@@ -226,33 +226,38 @@
 	return doclist
 
 def _make_customer(source_name, ignore_permissions=False):
-	quotation = frappe.db.get_value("Quotation", source_name, ["lead", "order_type", "customer"])
-	if quotation and quotation[0] and not quotation[2]:
-		lead_name = quotation[0]
-		customer_name = frappe.db.get_value("Customer", {"lead_name": lead_name},
-			["name", "customer_name"], as_dict=True)
-		if not customer_name:
-			from erpnext.crm.doctype.lead.lead import _make_customer
-			customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
-			customer = frappe.get_doc(customer_doclist)
-			customer.flags.ignore_permissions = ignore_permissions
-			if quotation[1] == "Shopping Cart":
-				customer.customer_group = frappe.db.get_value("Shopping Cart Settings", None,
-					"default_customer_group")
+	quotation = frappe.db.get_value("Quotation",
+		source_name, ["order_type", "party_name", "customer_name"], as_dict=1)
 
-			try:
-				customer.insert()
-				return customer
-			except frappe.NameError:
-				if frappe.defaults.get_global_default('cust_master_name') == "Customer Name":
-					customer.run_method("autoname")
-					customer.name += "-" + lead_name
+	if quotation and quotation.get('party_name'):
+		if not frappe.db.exists("Customer", quotation.get("party_name")):
+			lead_name = quotation.get("party_name")
+			customer_name = frappe.db.get_value("Customer", {"lead_name": lead_name},
+				["name", "customer_name"], as_dict=True)
+			if not customer_name:
+				from erpnext.crm.doctype.lead.lead import _make_customer
+				customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
+				customer = frappe.get_doc(customer_doclist)
+				customer.flags.ignore_permissions = ignore_permissions
+				if quotation.get("party_name") == "Shopping Cart":
+					customer.customer_group = frappe.db.get_value("Shopping Cart Settings", None,
+						"default_customer_group")
+
+				try:
 					customer.insert()
 					return customer
-				else:
-					raise
-			except frappe.MandatoryError:
-				frappe.local.message_log = []
-				frappe.throw(_("Please create Customer from Lead {0}").format(lead_name))
+				except frappe.NameError:
+					if frappe.defaults.get_global_default('cust_master_name') == "Customer Name":
+						customer.run_method("autoname")
+						customer.name += "-" + lead_name
+						customer.insert()
+						return customer
+					else:
+						raise
+				except frappe.MandatoryError:
+					frappe.local.message_log = []
+					frappe.throw(_("Please create Customer from Lead {0}").format(lead_name))
+			else:
+				return customer_name
 		else:
-			return customer_name
+			return frappe.get_doc("Customer", quotation.get("party_name"))
diff --git a/erpnext/selling/doctype/quotation/quotation_list.js b/erpnext/selling/doctype/quotation/quotation_list.js
index aa6038c..5f4e254 100644
--- a/erpnext/selling/doctype/quotation/quotation_list.js
+++ b/erpnext/selling/doctype/quotation/quotation_list.js
@@ -1,6 +1,17 @@
 frappe.listview_settings['Quotation'] = {
 	add_fields: ["customer_name", "base_grand_total", "status",
 		"company", "currency", 'valid_till'],
+
+	onload: function(listview) {
+		listview.page.fields_dict.quotation_to.get_query = function() {
+			return {
+				"filters": {
+					"name": ["in", ["Customer", "Lead"]],
+				}
+			};
+		};
+	},
+
 	get_indicator: function(doc) {
 		if(doc.status==="Open") {
 			if (doc.valid_till && doc.valid_till < frappe.datetime.nowdate()) {
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index 7f88cf9..7ee4a76 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -203,15 +203,15 @@
 
 test_records = frappe.get_test_records('Quotation')
 
-def get_quotation_dict(customer=None, item_code=None):
-	if not customer:
-		customer = '_Test Customer'
+def get_quotation_dict(party_name=None, item_code=None):
+	if not party_name:
+		party_name = '_Test Customer'
 	if not item_code:
 		item_code = '_Test Item'
 
 	return {
 		'doctype': 'Quotation',
-		'customer': customer,
+		'party_name': party_name,
 		'items': [
 			{
 				'item_code': item_code,
@@ -229,7 +229,7 @@
 		qo.transaction_date = args.transaction_date
 
 	qo.company = args.company or "_Test Company"
-	qo.customer = args.customer or "_Test Customer"
+	qo.party_name = args.party_name or "_Test Customer"
 	qo.currency = args.currency or "INR"
 	if args.selling_price_list:
 		qo.selling_price_list = args.selling_price_list
diff --git a/erpnext/selling/doctype/quotation/test_records.json b/erpnext/selling/doctype/quotation/test_records.json
index 7a9d3eb..1564f7d 100644
--- a/erpnext/selling/doctype/quotation/test_records.json
+++ b/erpnext/selling/doctype/quotation/test_records.json
@@ -1,37 +1,37 @@
 [
- {
-  "company": "_Test Company", 
-  "conversion_rate": 1.0, 
-  "currency": "INR", 
-  "customer": "_Test Customer", 
-  "customer_group": "_Test Customer Group", 
-  "customer_name": "_Test Customer", 
-  "doctype": "Quotation", 
-  "base_grand_total": 1000.0, 
-  "grand_total": 1000.0, 
-  "order_type": "Sales", 
-  "plc_conversion_rate": 1.0, 
-  "price_list_currency": "INR", 
-  "items": [
-   {
-    "base_amount": 1000.0, 
-    "base_rate": 100.0, 
-    "description": "CPU", 
-    "doctype": "Quotation Item", 
-    "item_code": "_Test Item Home Desktop 100", 
-    "item_name": "CPU", 
-    "parentfield": "items", 
-    "qty": 10.0, 
-    "rate": 100.0,
-	"uom": "_Test UOM 1",
-    "stock_uom": "_Test UOM 1",
-	"conversion_factor": 1.0
-   }
-  ], 
-  "quotation_to": "Customer", 
-  "selling_price_list": "_Test Price List", 
-  "territory": "_Test Territory", 
-  "transaction_date": "2013-02-21",
-  "valid_till": "2013-03-21"
- }
+	{
+		"company": "_Test Company",
+		"conversion_rate": 1.0,
+		"currency": "INR",
+		"party_name": "_Test Customer",
+		"customer_group": "_Test Customer Group",
+		"customer_name": "_Test Customer",
+		"doctype": "Quotation",
+		"base_grand_total": 1000.0,
+		"grand_total": 1000.0,
+		"order_type": "Sales",
+		"plc_conversion_rate": 1.0,
+		"price_list_currency": "INR",
+		"items": [
+			{
+				"base_amount": 1000.0,
+				"base_rate": 100.0,
+				"description": "CPU",
+				"doctype": "Quotation Item",
+				"item_code": "_Test Item Home Desktop 100",
+				"item_name": "CPU",
+				"parentfield": "items",
+				"qty": 10.0,
+				"rate": 100.0,
+				"uom": "_Test UOM 1",
+				"stock_uom": "_Test UOM 1",
+				"conversion_factor": 1.0
+			}
+		],
+		"quotation_to": "Customer",
+		"selling_price_list": "_Test Price List",
+		"territory": "_Test Territory",
+		"transaction_date": "2013-02-21",
+		"valid_till": "2013-03-21"
+	}
 ]
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 38b7b56..26ca7c6 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -107,7 +107,6 @@
 	refresh: function(doc, dt, dn) {
 		var me = this;
 		this._super();
-		var allow_purchase = false;
 		var allow_delivery = false;
 
 		if(doc.docstatus==1) {
@@ -129,28 +128,9 @@
 					   me.frm.cscript.update_status('Re-open', 'Draft')
 				   }, __("Status"));
 			   }
-		    }
+			}
 			if(doc.status !== 'Closed') {
 				if(doc.status !== 'On Hold') {
-					for (var i in this.frm.doc.items) {
-						var item = this.frm.doc.items[i];
-						if(item.delivered_by_supplier === 1 || item.supplier){
-							if(item.qty > flt(item.ordered_qty)
-								&& item.qty > flt(item.delivered_qty)) {
-								allow_purchase = true;
-							}
-						}
-
-						if (item.delivered_by_supplier===0) {
-							if(item.qty > flt(item.delivered_qty)) {
-								allow_delivery = true;
-							}
-						}
-
-						if (allow_delivery && allow_purchase) {
-							break;
-						}
-					}
 
 					if (this.frm.has_perm("submit")) {
 						if(flt(doc.per_delivered, 6) < 100 || flt(doc.per_billed) < 100) {
@@ -180,9 +160,8 @@
 					}
 
 					// make purchase order
-					if(flt(doc.per_delivered, 6) < 100 && allow_purchase) {
 						this.frm.add_custom_button(__('Purchase Order'), () => this.make_purchase_order(), __('Create'));
-					}
+
 					// maintenance
 					if(flt(doc.per_delivered, 2) < 100 &&
 							["Sales", "Shopping Cart"].indexOf(doc.order_type)===-1) {
@@ -231,13 +210,19 @@
 						method: "erpnext.selling.doctype.quotation.quotation.make_sales_order",
 						source_doctype: "Quotation",
 						target: me.frm,
-						setters: {
-							customer: me.frm.doc.customer || undefined
-						},
+						setters: [
+							{
+								label: "Customer",
+								fieldname: "party_name",
+								fieldtype: "Link",
+								options: "Customer",
+								default: me.frm.doc.customer || undefined
+							}
+						],
 						get_query_filters: {
 							company: me.frm.doc.company,
 							docstatus: 1,
-							status: ["!=", "Lost"],
+							status: ["!=", "Lost"]
 						}
 					})
 				}, __("Get items from"));
@@ -537,6 +522,42 @@
 							filters: {'parent': me.frm.doc.name}
 						}
 					}},
+					{fieldname: 'items_for_po', fieldtype: 'Table', label: 'Select Items',
+					fields: [
+						{
+							fieldtype:'Data',
+							fieldname:'item_code',
+							label: __('Item'),
+							read_only:1,
+							in_list_view:1
+						},
+						{
+							fieldtype:'Data',
+							fieldname:'item_name',
+							label: __('Item name'),
+							read_only:1,
+							in_list_view:1
+						},
+						{
+							fieldtype:'Float',
+							fieldname:'qty',
+							label: __('Quantity'),
+							read_only: 1,
+							in_list_view:1
+						},
+						{
+							fieldtype:'Link',
+							read_only:1,
+							fieldname:'uom',
+							label: __('UOM'),
+							in_list_view:1
+						}
+					],
+					data: cur_frm.doc.items,
+					get_data: function() {
+						return cur_frm.doc.items
+					}
+				},
 
 				{"fieldtype": "Button", "label": __('Create Purchase Order'), "fieldname": "make_purchase_order", "cssClass": "btn-primary"},
 			]
@@ -544,13 +565,22 @@
 
 		dialog.fields_dict.make_purchase_order.$input.click(function() {
 			var args = dialog.get_values();
+			let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children()
+			if(selected_items.length == 0) {
+				frappe.throw({message: 'Please select Item form Table', title: __('Message'), indicator:'blue'})
+			}
+			let selected_items_list = []
+			for(let i in selected_items){
+				selected_items_list.push(selected_items[i].item_code)
+			}
 			dialog.hide();
 			return frappe.call({
 				type: "GET",
-				method: "erpnext.selling.doctype.sales_order.sales_order.make_purchase_order_for_drop_shipment",
+				method: "erpnext.selling.doctype.sales_order.sales_order.make_purchase_order",
 				args: {
 					"source_name": me.frm.doc.name,
-					"for_supplier": args.supplier
+					"for_supplier": args.supplier,
+					"selected_items": selected_items_list
 				},
 				freeze: true,
 				callback: function(r) {
@@ -570,6 +600,8 @@
 				}
 			})
 		});
+		dialog.get_field("items_for_po").grid.only_sortable()
+		dialog.get_field("items_for_po").refresh()
 		dialog.show();
 	},
 	hold_sales_order: function(){
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 95c803d..2481f31 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1,4472 +1,4472 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "beta": 0,
- "creation": "2013-06-18 12:39:59",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "customer_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": "",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-user",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break0",
-   "fieldtype": "Column 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,
-   "oldfieldtype": "Column Break",
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "{customer_name}",
-   "fetch_if_empty": 0,
-   "fieldname": "title",
-   "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": "Title",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fetch_if_empty": 0,
-   "fieldname": "naming_series",
-   "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": "Series",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "naming_series",
-   "oldfieldtype": "Select",
-   "options": "SAL-ORD-.YYYY.-",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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": 1,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Customer",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "customer",
-   "oldfieldtype": "Link",
-   "options": "Customer",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_from": "customer.customer_name",
-   "fetch_if_empty": 0,
-   "fieldname": "customer_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Customer Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Sales",
-   "depends_on": "",
-   "fetch_if_empty": 0,
-   "fieldname": "order_type",
-   "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": "Order Type",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "order_type",
-   "oldfieldtype": "Select",
-   "options": "\nSales\nMaintenance\nShopping Cart",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break1",
-   "fieldtype": "Column 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,
-   "oldfieldtype": "Column Break",
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "amended_from",
-   "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": "Amended From",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "amended_from",
-   "oldfieldtype": "Data",
-   "options": "Sales Order",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "company",
-   "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": 1,
-   "label": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "company",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Today",
-   "fetch_if_empty": 0,
-   "fieldname": "transaction_date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Date",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "transaction_date",
-   "oldfieldtype": "Date",
-   "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": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "160px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "delivery_date",
-   "fieldtype": "Date",
-   "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": "Delivery Date",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "po_no",
-   "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": "Customer's Purchase Order",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "po_no",
-   "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": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:doc.po_no",
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "po_date",
-   "fieldtype": "Date",
-   "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": "Customer's Purchase Order Date",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "po_date",
-   "oldfieldtype": "Date",
-   "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,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "tax_id",
-   "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": "Tax Id",
-   "length": 0,
-   "no_copy": 0,
-   "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,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "",
-   "columns": 0,
-   "depends_on": "customer",
-   "fetch_if_empty": 0,
-   "fieldname": "contact_info",
-   "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": "Address and Contact",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-bullhorn",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "customer_address",
-   "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": "Customer Address",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Address",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "address_display",
-   "fieldtype": "Small Text",
-   "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": "Address",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "contact_person",
-   "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": "Contact Person",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Contact",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "contact_display",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Contact",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "contact_mobile",
-   "fieldtype": "Small Text",
-   "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": "Mobile No",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "contact_email",
-   "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": "Contact Email",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
-   "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": "",
-   "length": 0,
-   "no_copy": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "company_address",
-   "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": "Company Address",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Address",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "col_break46",
-   "fieldtype": "Column 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,
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "shipping_address_name",
-   "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": "Shipping Address Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Address",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
-   "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": "Shipping Address",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "customer_group",
-   "fieldtype": "Link",
-   "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": "Customer Group",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Customer Group",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "territory",
-   "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": "Territory",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Territory",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "currency_and_price_list",
-   "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": "Currency and Price List",
-   "length": 0,
-   "no_copy": 0,
-   "options": "fa fa-tag",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "currency",
-   "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": "Currency",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "currency",
-   "oldfieldtype": "Select",
-   "options": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Rate at which customer's currency is converted to company's base currency",
-   "fetch_if_empty": 0,
-   "fieldname": "conversion_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Exchange Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "conversion_rate",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "precision": "9",
-   "print_hide": 1,
-   "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": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break2",
-   "fieldtype": "Column 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,
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "selling_price_list",
-   "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": "Price List",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "price_list_name",
-   "oldfieldtype": "Select",
-   "options": "Price List",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "price_list_currency",
-   "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": "Price List Currency",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Rate at which Price list currency is converted to company's base currency",
-   "fetch_if_empty": 0,
-   "fieldname": "plc_conversion_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Price List Exchange Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "9",
-   "print_hide": 1,
-   "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": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "ignore_pricing_rule",
-   "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": "Ignore Pricing Rule",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 1,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "sec_warehouse",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "set_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": "Set Source Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Warehouse",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "items_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": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "scan_barcode",
-   "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": "Scan Barcode",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 1,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "items",
-   "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": "Items",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "sales_order_details",
-   "oldfieldtype": "Table",
-   "options": "Sales Order Item",
-   "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": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "pricing_rule_details",
-   "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": "Pricing Rules",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "pricing_rules",
-   "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": "Pricing Rule Detail",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Pricing Rule Detail",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break_31",
-   "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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_33a",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "total_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Quantity",
-   "length": 0,
-   "no_copy": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_total",
-   "fieldtype": "Currency",
-   "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": "Total (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_net_total",
-   "fieldtype": "Currency",
-   "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": "Net Total (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "net_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_33",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "total",
-   "fieldtype": "Currency",
-   "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": "Total",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "net_total",
-   "fieldtype": "Currency",
-   "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": "Net Total",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "total_net_weight",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Total Net Weight",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "taxes_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": "Taxes and Charges",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "tax_category",
-   "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": "Tax Category",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Tax Category",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_38",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "shipping_rule",
-   "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": "Shipping Rule",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Button",
-   "options": "Shipping Rule",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break_40",
-   "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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "taxes_and_charges",
-   "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": "Sales Taxes and Charges Template",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "charge",
-   "oldfieldtype": "Link",
-   "options": "Sales Taxes and Charges Template",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "taxes",
-   "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": "Sales Taxes and Charges",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "other_charges",
-   "oldfieldtype": "Table",
-   "options": "Sales Taxes and Charges",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "sec_tax_breakup",
-   "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": "Tax Breakup",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "other_charges_calculation",
-   "fieldtype": "Text",
-   "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": "Taxes and Charges Calculation",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldtype": "HTML",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break_43",
-   "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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "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": "Total Taxes and Charges (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "other_charges_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_46",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "total_taxes_and_charges",
-   "fieldtype": "Currency",
-   "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": "Total Taxes and Charges",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "loyalty_points_redemption",
-   "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,
-   "label": "Loyalty Points Redemption",
-   "length": 0,
-   "no_copy": 0,
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "loyalty_points",
-   "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": "Loyalty Points",
-   "length": 0,
-   "no_copy": 0,
-   "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_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "loyalty_amount",
-   "fieldtype": "Currency",
-   "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": "Loyalty Amount",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "discount_amount",
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break_48",
-   "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": "Additional Discount",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Grand Total",
-   "fetch_if_empty": 0,
-   "fieldname": "apply_discount_on",
-   "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": "Apply Additional Discount On",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nGrand Total\nNet Total",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_discount_amount",
-   "fieldtype": "Currency",
-   "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": "Additional Discount Amount (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_50",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fetch_if_empty": 0,
-   "fieldname": "additional_discount_percentage",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Additional Discount Percentage",
-   "length": 0,
-   "no_copy": 0,
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fetch_if_empty": 0,
-   "fieldname": "discount_amount",
-   "fieldtype": "Currency",
-   "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": "Additional Discount Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "totals",
-   "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": "",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_grand_total",
-   "fieldtype": "Currency",
-   "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": "Grand Total (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "grand_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_rounding_adjustment",
-   "fieldtype": "Currency",
-   "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": "Rounding Adjustment (Company Currency)",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "base_rounded_total",
-   "fieldtype": "Currency",
-   "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": "Rounded Total (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "rounded_total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "In Words will be visible once you save the Sales Order.",
-   "fetch_if_empty": 0,
-   "fieldname": "base_in_words",
-   "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": "In Words (Company Currency)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "in_words",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "200px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break3",
-   "fieldtype": "Column 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,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "grand_total",
-   "fieldtype": "Currency",
-   "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": "Grand Total",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "grand_total_export",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "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,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fetch_if_empty": 0,
-   "fieldname": "rounding_adjustment",
-   "fieldtype": "Currency",
-   "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": "Rounding Adjustment",
-   "length": 0,
-   "no_copy": 1,
-   "options": "currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "rounded_total",
-   "fieldtype": "Currency",
-   "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": "Rounded Total",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "rounded_total_export",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "permlevel": 0,
-   "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,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "in_words",
-   "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": "In Words",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "in_words_export",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "200px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "advance_paid",
-   "fieldtype": "Currency",
-   "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": "Advance Paid",
-   "length": 0,
-   "no_copy": 1,
-   "options": "party_account_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "packed_items",
-   "columns": 0,
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "packing_list",
-   "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": "Packing List",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-suitcase",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "packed_items",
-   "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": "Packed Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Packed Item",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "collapsible_depends_on": "",
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "payment_schedule_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": "Payment Terms",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "payment_terms_template",
-   "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": "Payment Terms Template",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Payment Terms Template",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "payment_schedule",
-   "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": "Payment Schedule",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Payment Schedule",
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "terms",
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "terms_section_break",
-   "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": "Terms and Conditions",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-legal",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "tc_name",
-   "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": "Terms",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "tc_name",
-   "oldfieldtype": "Link",
-   "options": "Terms and Conditions",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "terms",
-   "fieldtype": "Text Editor",
-   "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": "Terms and Conditions Details",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "terms",
-   "oldfieldtype": "Text Editor",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "project",
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "more_info",
-   "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": "More Information",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-file-text",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "inter_company_order_reference",
-   "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": "Inter Company Order Reference",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Purchase Order",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Track this Sales Order against any Project",
-   "fetch_if_empty": 0,
-   "fieldname": "project",
-   "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": "Project",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "project",
-   "oldfieldtype": "Link",
-   "options": "Project",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "party_account_currency",
-   "fieldtype": "Link",
-   "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": "Party Account Currency",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_77",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "source",
-   "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": "Source",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "source",
-   "oldfieldtype": "Select",
-   "options": "Lead Source",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fetch_if_empty": 0,
-   "fieldname": "campaign",
-   "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": "Campaign",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "campaign",
-   "oldfieldtype": "Link",
-   "options": "Campaign",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "printing_details",
-   "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": "Printing Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "language",
-   "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": "Print Language",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "letter_head",
-   "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": "Letter Head",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "letter_head",
-   "oldfieldtype": "Select",
-   "options": "Letter Head",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break4",
-   "fieldtype": "Column 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,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "select_print_heading",
-   "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": "Print Heading",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "select_print_heading",
-   "oldfieldtype": "Link",
-   "options": "Print Heading",
-   "permlevel": 0,
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "group_same_items",
-   "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": "Group same items",
-   "length": 0,
-   "no_copy": 0,
-   "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": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break_78",
-   "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": "Billing and Delivery Status",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Column Break",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Draft",
-   "fetch_if_empty": 0,
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "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": "Status",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "status",
-   "oldfieldtype": "Select",
-   "options": "\nDraft\nOn Hold\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nCancelled\nClosed",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "delivery_status",
-   "fieldtype": "Select",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Delivery Status",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "description": "% of materials delivered against this Sales Order",
-   "fetch_if_empty": 0,
-   "fieldname": "per_delivered",
-   "fieldtype": "Percent",
-   "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": "%  Delivered",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "per_delivered",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_81",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:!doc.__islocal",
-   "description": "% of materials billed against this Sales Order",
-   "fetch_if_empty": 0,
-   "fieldname": "per_billed",
-   "fieldtype": "Percent",
-   "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": "% Amount Billed",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "per_billed",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fetch_if_empty": 0,
-   "fieldname": "billing_status",
-   "fieldtype": "Select",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Billing Status",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Not Billed\nFully Billed\nPartly Billed\nClosed",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "commission_rate",
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "sales_team_section_break",
-   "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": "Commission",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-group",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "sales_partner",
-   "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": "Sales Partner",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "sales_partner",
-   "oldfieldtype": "Link",
-   "options": "Sales Partner",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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,
-   "width": "150px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break7",
-   "fieldtype": "Column 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,
-   "print_hide": 1,
-   "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,
-   "width": "50%"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "commission_rate",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Commission Rate",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "commission_rate",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "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,
-   "width": "100px"
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "total_commission",
-   "fieldtype": "Currency",
-   "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": "Total Commission",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "total_commission",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "sales_team",
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "section_break1",
-   "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": "Sales Team",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "sales_team",
-   "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": "Sales Team1",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "sales_team",
-   "oldfieldtype": "Table",
-   "options": "Sales Team",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "subscription_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": "Auto Repeat Section",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "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": "From Date",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fetch_if_empty": 0,
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "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": "To Date",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "column_break_108",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
-   "fieldname": "auto_repeat",
-   "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": "Auto Repeat",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Auto Repeat",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval: doc.auto_repeat",
-   "fetch_if_empty": 0,
-   "fieldname": "update_auto_repeat_reference",
-   "fieldtype": "Button",
-   "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": "Update Auto Repeat Reference",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
+   "allow_copy": 0,
+   "allow_events_in_timeline": 0,
+   "allow_guest_to_view": 0,
+   "allow_import": 1,
+   "allow_rename": 0,
+   "autoname": "naming_series:",
+   "beta": 0,
+   "creation": "2013-06-18 12:39:59",
+   "custom": 0,
+   "docstatus": 0,
+   "doctype": "DocType",
+   "document_type": "Document",
+   "editable_grid": 1,
+   "engine": "InnoDB",
+   "fields": [
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "customer_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": "",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-user",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break0",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "{customer_name}",
+     "fetch_if_empty": 0,
+     "fieldname": "title",
+     "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": "Title",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "",
+     "fetch_if_empty": 0,
+     "fieldname": "naming_series",
+     "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": "Series",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "naming_series",
+     "oldfieldtype": "Select",
+     "options": "SAL-ORD-.YYYY.-",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 1,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "customer",
+     "fieldtype": "Link",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 0,
+     "in_standard_filter": 1,
+     "label": "Customer",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "customer",
+     "oldfieldtype": "Link",
+     "options": "Customer",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_from": "customer.customer_name",
+     "fetch_if_empty": 0,
+     "fieldname": "customer_name",
+     "fieldtype": "Data",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Customer Name",
+     "length": 0,
+     "no_copy": 0,
+     "options": "",
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Sales",
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "order_type",
+     "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": "Order Type",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "order_type",
+     "oldfieldtype": "Select",
+     "options": "\nSales\nMaintenance\nShopping Cart",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break1",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "amended_from",
+     "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": "Amended From",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "amended_from",
+     "oldfieldtype": "Data",
+     "options": "Sales Order",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "company",
+     "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": 1,
+     "label": "Company",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "company",
+     "oldfieldtype": "Link",
+     "options": "Company",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 1,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Today",
+     "fetch_if_empty": 0,
+     "fieldname": "transaction_date",
+     "fieldtype": "Date",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 1,
+     "label": "Date",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "transaction_date",
+     "oldfieldtype": "Date",
+     "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": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "160px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "delivery_date",
+     "fieldtype": "Date",
+     "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": "Delivery Date",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "po_no",
+     "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": "Customer's Purchase Order",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "po_no",
+     "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": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:doc.po_no",
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "po_date",
+     "fieldtype": "Date",
+     "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": "Customer's Purchase Order Date",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "po_date",
+     "oldfieldtype": "Date",
+     "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,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "tax_id",
+     "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": "Tax Id",
+     "length": 0,
+     "no_copy": 0,
+     "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,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "",
+     "columns": 0,
+     "depends_on": "customer",
+     "fetch_if_empty": 0,
+     "fieldname": "contact_info",
+     "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": "Address and Contact",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-bullhorn",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "customer_address",
+     "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": "Customer Address",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Address",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "address_display",
+     "fieldtype": "Small Text",
+     "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": "Address",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "contact_person",
+     "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": "Contact Person",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Contact",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "contact_display",
+     "fieldtype": "Small Text",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 1,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Contact",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "contact_mobile",
+     "fieldtype": "Small Text",
+     "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": "Mobile No",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "contact_email",
+     "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": "Contact Email",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Email",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "company_address_display",
+     "fieldtype": "Small Text",
+     "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": "",
+     "length": 0,
+     "no_copy": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "company_address",
+     "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": "Company Address",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Address",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "col_break46",
+     "fieldtype": "Column 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,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "shipping_address_name",
+     "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": "Shipping Address Name",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Address",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "shipping_address",
+     "fieldtype": "Small Text",
+     "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": "Shipping Address",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "customer_group",
+     "fieldtype": "Link",
+     "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": "Customer Group",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Customer Group",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "territory",
+     "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": "Territory",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Territory",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "currency_and_price_list",
+     "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": "Currency and Price List",
+     "length": 0,
+     "no_copy": 0,
+     "options": "fa fa-tag",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "currency",
+     "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": "Currency",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "currency",
+     "oldfieldtype": "Select",
+     "options": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Rate at which customer's currency is converted to company's base currency",
+     "fetch_if_empty": 0,
+     "fieldname": "conversion_rate",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Exchange Rate",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "conversion_rate",
+     "oldfieldtype": "Currency",
+     "permlevel": 0,
+     "precision": "9",
+     "print_hide": 1,
+     "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": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break2",
+     "fieldtype": "Column 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,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "selling_price_list",
+     "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": "Price List",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "price_list_name",
+     "oldfieldtype": "Select",
+     "options": "Price List",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "price_list_currency",
+     "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": "Price List Currency",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Rate at which Price list currency is converted to company's base currency",
+     "fetch_if_empty": 0,
+     "fieldname": "plc_conversion_rate",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Price List Exchange Rate",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "9",
+     "print_hide": 1,
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "ignore_pricing_rule",
+     "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": "Ignore Pricing Rule",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 1,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "sec_warehouse",
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "set_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": "Set Source Warehouse",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Warehouse",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "items_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": "",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-shopping-cart",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "scan_barcode",
+     "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": "Scan Barcode",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 1,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "items",
+     "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": "Items",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "sales_order_details",
+     "oldfieldtype": "Table",
+     "options": "Sales Order Item",
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "pricing_rule_details",
+     "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": "Pricing Rules",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "pricing_rules",
+     "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": "Pricing Rule Detail",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Pricing Rule Detail",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break_31",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_33a",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "total_qty",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Total Quantity",
+     "length": 0,
+     "no_copy": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_total",
+     "fieldtype": "Currency",
+     "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": "Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_net_total",
+     "fieldtype": "Currency",
+     "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": "Net Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "net_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_33",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "total",
+     "fieldtype": "Currency",
+     "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": "Total",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "net_total",
+     "fieldtype": "Currency",
+     "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": "Net Total",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "total_net_weight",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Total Net Weight",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "taxes_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": "Taxes and Charges",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "tax_category",
+     "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": "Tax Category",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Tax Category",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_38",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "shipping_rule",
+     "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": "Shipping Rule",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Button",
+     "options": "Shipping Rule",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break_40",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "taxes_and_charges",
+     "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": "Sales Taxes and Charges Template",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "charge",
+     "oldfieldtype": "Link",
+     "options": "Sales Taxes and Charges Template",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "taxes",
+     "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": "Sales Taxes and Charges",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "other_charges",
+     "oldfieldtype": "Table",
+     "options": "Sales Taxes and Charges",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "sec_tax_breakup",
+     "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": "Tax Breakup",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "other_charges_calculation",
+     "fieldtype": "Text",
+     "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": "Taxes and Charges Calculation",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldtype": "HTML",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break_43",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "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": "Total Taxes and Charges (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "other_charges_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_46",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "total_taxes_and_charges",
+     "fieldtype": "Currency",
+     "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": "Total Taxes and Charges",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "loyalty_points_redemption",
+     "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,
+     "label": "Loyalty Points Redemption",
+     "length": 0,
+     "no_copy": 0,
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "loyalty_points",
+     "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": "Loyalty Points",
+     "length": 0,
+     "no_copy": 0,
+     "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_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "loyalty_amount",
+     "fieldtype": "Currency",
+     "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": "Loyalty Amount",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "discount_amount",
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break_48",
+     "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": "Additional Discount",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Grand Total",
+     "fetch_if_empty": 0,
+     "fieldname": "apply_discount_on",
+     "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": "Apply Additional Discount On",
+     "length": 0,
+     "no_copy": 0,
+     "options": "\nGrand Total\nNet Total",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_discount_amount",
+     "fieldtype": "Currency",
+     "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": "Additional Discount Amount (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_50",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "additional_discount_percentage",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Additional Discount Percentage",
+     "length": 0,
+     "no_copy": 0,
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "discount_amount",
+     "fieldtype": "Currency",
+     "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": "Additional Discount Amount",
+     "length": 0,
+     "no_copy": 0,
+     "options": "currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "totals",
+     "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": "",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-money",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_grand_total",
+     "fieldtype": "Currency",
+     "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": "Grand Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "grand_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_rounding_adjustment",
+     "fieldtype": "Currency",
+     "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": "Rounding Adjustment (Company Currency)",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "base_rounded_total",
+     "fieldtype": "Currency",
+     "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": "Rounded Total (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "rounded_total",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "In Words will be visible once you save the Sales Order.",
+     "fetch_if_empty": 0,
+     "fieldname": "base_in_words",
+     "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": "In Words (Company Currency)",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "in_words",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break3",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "grand_total",
+     "fieldtype": "Currency",
+     "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": "Grand Total",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "grand_total_export",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "permlevel": 0,
+     "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,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "rounding_adjustment",
+     "fieldtype": "Currency",
+     "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": "Rounding Adjustment",
+     "length": 0,
+     "no_copy": 1,
+     "options": "currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 1,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "rounded_total",
+     "fieldtype": "Currency",
+     "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": "Rounded Total",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "rounded_total_export",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "permlevel": 0,
+     "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,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "in_words",
+     "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": "In Words",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "in_words_export",
+     "oldfieldtype": "Data",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "200px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "advance_paid",
+     "fieldtype": "Currency",
+     "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": "Advance Paid",
+     "length": 0,
+     "no_copy": 1,
+     "options": "party_account_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "packed_items",
+     "columns": 0,
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "packing_list",
+     "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": "Packing List",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-suitcase",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "packed_items",
+     "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": "Packed Items",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Packed Item",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "collapsible_depends_on": "",
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "payment_schedule_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": "Payment Terms",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "payment_terms_template",
+     "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": "Payment Terms Template",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Payment Terms Template",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "payment_schedule",
+     "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": "Payment Schedule",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Payment Schedule",
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "terms",
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "terms_section_break",
+     "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": "Terms and Conditions",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-legal",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "tc_name",
+     "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": "Terms",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "tc_name",
+     "oldfieldtype": "Link",
+     "options": "Terms and Conditions",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "terms",
+     "fieldtype": "Text Editor",
+     "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": "Terms and Conditions Details",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "terms",
+     "oldfieldtype": "Text Editor",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "project",
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "more_info",
+     "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": "More Information",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-file-text",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "inter_company_order_reference",
+     "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": "Inter Company Order Reference",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Purchase Order",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Track this Sales Order against any Project",
+     "fetch_if_empty": 0,
+     "fieldname": "project",
+     "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": "Project",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "project",
+     "oldfieldtype": "Link",
+     "options": "Project",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "party_account_currency",
+     "fieldtype": "Link",
+     "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": "Party Account Currency",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Currency",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_77",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "source",
+     "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": "Source",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "source",
+     "oldfieldtype": "Select",
+     "options": "Lead Source",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "campaign",
+     "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": "Campaign",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "campaign",
+     "oldfieldtype": "Link",
+     "options": "Campaign",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "printing_details",
+     "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": "Printing Details",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "language",
+     "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": "Print Language",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "letter_head",
+     "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": "Letter Head",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "letter_head",
+     "oldfieldtype": "Select",
+     "options": "Letter Head",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break4",
+     "fieldtype": "Column 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,
+     "oldfieldtype": "Column Break",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "select_print_heading",
+     "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": "Print Heading",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "select_print_heading",
+     "oldfieldtype": "Link",
+     "options": "Print Heading",
+     "permlevel": 0,
+     "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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "group_same_items",
+     "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": "Group same items",
+     "length": 0,
+     "no_copy": 0,
+     "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": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break_78",
+     "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": "Billing and Delivery Status",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Column Break",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Draft",
+     "fetch_if_empty": 0,
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "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": "Status",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "status",
+     "oldfieldtype": "Select",
+     "options": "\nDraft\nOn Hold\nTo Deliver and Bill\nTo Bill\nTo Deliver\nCompleted\nCancelled\nClosed",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 1,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "delivery_status",
+     "fieldtype": "Select",
+     "hidden": 1,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 1,
+     "label": "Delivery Status",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Not Delivered\nFully Delivered\nPartly Delivered\nClosed\nNot Applicable",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:!doc.__islocal",
+     "description": "% of materials delivered against this Sales Order",
+     "fetch_if_empty": 0,
+     "fieldname": "per_delivered",
+     "fieldtype": "Percent",
+     "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": "%  Delivered",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "per_delivered",
+     "oldfieldtype": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_81",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval:!doc.__islocal",
+     "description": "% of materials billed against this Sales Order",
+     "fetch_if_empty": 0,
+     "fieldname": "per_billed",
+     "fieldtype": "Percent",
+     "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": "% Amount Billed",
+     "length": 0,
+     "no_copy": 1,
+     "oldfieldname": "per_billed",
+     "oldfieldtype": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fetch_if_empty": 0,
+     "fieldname": "billing_status",
+     "fieldtype": "Select",
+     "hidden": 1,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 1,
+     "label": "Billing Status",
+     "length": 0,
+     "no_copy": 1,
+     "options": "Not Billed\nFully Billed\nPartly Billed\nClosed",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "commission_rate",
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "sales_team_section_break",
+     "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": "Commission",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldtype": "Section Break",
+     "options": "fa fa-group",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "sales_partner",
+     "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": "Sales Partner",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "sales_partner",
+     "oldfieldtype": "Link",
+     "options": "Sales Partner",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "150px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break7",
+     "fieldtype": "Column 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,
+     "print_hide": 1,
+     "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,
+     "width": "50%"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "commission_rate",
+     "fieldtype": "Float",
+     "hidden": 0,
+     "ignore_user_permissions": 0,
+     "ignore_xss_filter": 0,
+     "in_filter": 0,
+     "in_global_search": 0,
+     "in_list_view": 0,
+     "in_standard_filter": 0,
+     "label": "Commission Rate",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "commission_rate",
+     "oldfieldtype": "Currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "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,
+     "width": "100px"
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "total_commission",
+     "fieldtype": "Currency",
+     "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": "Total Commission",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "total_commission",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "sales_team",
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "section_break1",
+     "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": "Sales Team",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "sales_team",
+     "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": "Sales Team1",
+     "length": 0,
+     "no_copy": 0,
+     "oldfieldname": "sales_team",
+     "oldfieldtype": "Table",
+     "options": "Sales Team",
+     "permlevel": 0,
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "subscription_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": "Auto Repeat Section",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 1,
+     "print_hide_if_no_value": 0,
+     "read_only": 1,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "from_date",
+     "fieldtype": "Date",
+     "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": "From Date",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "description": "",
+     "fetch_if_empty": 0,
+     "fieldname": "to_date",
+     "fieldtype": "Date",
+     "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": "To Date",
+     "length": 0,
+     "no_copy": 1,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "column_break_108",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "auto_repeat",
+     "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": "Auto Repeat",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Auto Repeat",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 1,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "eval: doc.auto_repeat",
+     "fetch_if_empty": 0,
+     "fieldname": "update_auto_repeat_reference",
+     "fieldtype": "Button",
+     "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": "Update Auto Repeat Reference",
+     "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
+    }
+   ],
+   "has_web_view": 0,
+   "hide_toolbar": 0,
+   "icon": "fa fa-file-text",
+   "idx": 105,
+   "in_create": 0,
+   "is_submittable": 1,
+   "issingle": 0,
+   "istable": 0,
+   "max_attachments": 0,
+   "modified": "2019-04-18 12:05:23.464968",
+   "modified_by": "Administrator",
+   "module": "Selling",
+   "name": "Sales Order",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Sales User",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 1,
+     "if_owner": 0,
+     "import": 1,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Sales Manager",
+     "set_user_permissions": 1,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Maintenance User",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 0,
+     "role": "Accounts User",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 0
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 0,
+     "read": 1,
+     "report": 1,
+     "role": "Stock User",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 0
+    },
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 0,
+     "delete": 0,
+     "email": 0,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 1,
+     "print": 0,
+     "read": 1,
+     "report": 0,
+     "role": "Sales Manager",
+     "set_user_permissions": 0,
+     "share": 0,
+     "submit": 0,
+     "write": 1
+    }
+   ],
+   "quick_entry": 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
-  }
- ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-file-text",
- "idx": 105,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-04-18 12:05:23.464968",
- "modified_by": "Administrator",
- "module": "Selling",
- "name": "Sales Order",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 1,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "set_user_permissions": 1,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Maintenance User",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "Accounts User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
-   "read": 1,
-   "report": 1,
-   "role": "Stock User",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
-  },
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 1,
-   "print": 0,
-   "read": 1,
-   "report": 0,
-   "role": "Sales Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 1
-  }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "customer",
- "title_field": "title",
- "track_changes": 1,
- "track_seen": 1,
- "track_views": 0
-}
\ No newline at end of file
+   "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "timeline_field": "customer",
+   "title_field": "title",
+   "track_changes": 1,
+   "track_seen": 1,
+   "track_views": 0
+  }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index b87ad03..8ad3bf0 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -211,9 +211,8 @@
 
 		if self.project:
 			project = frappe.get_doc("Project", self.project)
-			project.flags.dont_sync_tasks = True
 			project.update_sales_amount()
-			project.save()
+			project.db_update()
 
 	def check_credit_limit(self):
 		# if bypass credit limit check is set to true (1) at sales order level,
@@ -765,7 +764,10 @@
 	return data
 
 @frappe.whitelist()
-def make_purchase_order_for_drop_shipment(source_name, for_supplier=None, target_doc=None):
+def make_purchase_order(source_name, for_supplier=None, selected_items=[], target_doc=None):
+	if isinstance(selected_items, string_types):
+		selected_items = json.loads(selected_items)
+
 	def set_missing_values(source, target):
 		target.supplier = supplier
 		target.apply_discount_on = ""
@@ -844,7 +846,7 @@
 						"price_list_rate"
 					],
 					"postprocess": update_item,
-					"condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == supplier
+					"condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == supplier and doc.item_code in selected_items
 				}
 			}, target_doc, set_missing_values)
 			if not for_supplier:
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 0f288b9..15c9eb5 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -34,17 +34,25 @@
 					"per_delivered,<,100|per_billed,=,100|status,!=,Closed"];
 			}
 
-		} else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 6) == 100)
+		} else if ((flt(doc.per_delivered, 6) == 100)
 			&& flt(doc.grand_total) !== 0 && flt(doc.per_billed, 6) < 100 && doc.status !== "Closed") {
 			// to bill
 
 			return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
 
-		} else if ((doc.order_type === "Maintenance" || flt(doc.per_delivered, 6) == 100)
+		} else if ((flt(doc.per_delivered, 6) === 100)
 			&& (flt(doc.grand_total) === 0 || flt(doc.per_billed, 6) == 100) && doc.status !== "Closed") {
-
 			return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"];
+
+		}else if (doc.order_type === "Maintenance" && flt(doc.per_delivered, 6) < 100 && doc.status !== "Closed"){
+
+			if(flt(doc.per_billed, 6) < 100 ){
+				return [__("To Deliver and Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Closed"];
+			}else if(flt(doc.per_billed, 6) == 100){
+				return [__("To Deliver"), "orange", "per_delivered,=,100|per_billed,=,100|status,!=,Closed"];
+			}
 		}
+
 	},
 	onload: function(listview) {
 		var method = "erpnext.selling.doctype.sales_order.sales_order.close_or_unclose_sales_orders";
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index e7697e2..569c53f 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -449,7 +449,7 @@
 		frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
 
 	def test_drop_shipping(self):
-		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_drop_shipment
+		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order
 		from erpnext.buying.doctype.purchase_order.purchase_order import update_status
 
 		make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
@@ -495,7 +495,7 @@
 		so = make_sales_order(item_list=so_items, do_not_submit=True)
 		so.submit()
 
-		po = make_purchase_order_for_drop_shipment(so.name, '_Test Supplier')
+		po = make_purchase_order(so.name, '_Test Supplier', selected_items=[so_items[0]['item_code']])
 		po.submit()
 
 		dn = create_dn_against_so(so.name, delivered_qty=1)
diff --git a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
index 1e45a73..32711b2 100644
--- a/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
+++ b/erpnext/selling/report/available_stock_for_packing_items/available_stock_for_packing_items.py
@@ -11,8 +11,7 @@
 	columns = get_columns()
 	iwq_map = get_item_warehouse_quantity_map()
 	item_map = get_item_details()
-
-	data = []	
+	data = []
 	for sbom, warehouse in iwq_map.items():
 		total = 0
 		total_qty = 0
@@ -20,8 +19,8 @@
 		for wh, item_qty in warehouse.items():
 			total += 1
 			row = [sbom, item_map.get(sbom).item_name, item_map.get(sbom).description, 
-				item_map.get(sbom).stock_uom, wh]
-			available_qty = min(item_qty.values())
+					item_map.get(sbom).stock_uom, wh]
+			available_qty = item_qty
 			total_qty += flt(available_qty)
 			row += [available_qty]
 			
@@ -30,51 +29,50 @@
 				if (total == len(warehouse)):
 					row = ["", "", "Total", "", "", total_qty]
 					data.append(row)
-
 	return columns, data
-	
+		
 def get_columns():
 	columns = ["Item Code:Link/Item:100", "Item Name::100", "Description::120", \
-			"UOM:Link/UOM:80", "Warehouse:Link/Warehouse:100", "Quantity::100"]
+				"UOM:Link/UOM:80", "Warehouse:Link/Warehouse:100", "Quantity::100"]
 
 	return columns
 
-def get_product_bundle_items():
-	sbom_item_map = {}
-	for sbom in frappe.db.sql("""select pb.new_item_code as parent, pbi.item_code, pbi.qty 
-			from `tabProduct Bundle Item` as pbi, `tabProduct Bundle` as pb
-		where pb.docstatus < 2 and pb.name = pbi.parent""", as_dict=1):
-			sbom_item_map.setdefault(sbom.parent, {}).setdefault(sbom.item_code, sbom.qty)
-			
-	return sbom_item_map
-
 def get_item_details():
 	item_map = {}
-	for item in frappe.db.sql("""select name, item_name, description, stock_uom 
-		from `tabItem`""", as_dict=1):
-			item_map.setdefault(item.name, item)
-			
+	for item in frappe.db.sql("""SELECT name, item_name, description, stock_uom
+								from `tabItem`""", as_dict=1):
+		item_map.setdefault(item.name, item)
 	return item_map
 
-def get_item_warehouse_quantity():
-	iwq_map = {}
-	bin = frappe.db.sql("""select item_code, warehouse, actual_qty from `tabBin` 
-		where actual_qty > 0""")
-	for item, wh, qty in bin:
-		iwq_map.setdefault(item, {}).setdefault(wh, qty)
-		
-	return iwq_map
-
 def get_item_warehouse_quantity_map():
+	query = """SELECT parent, warehouse, MIN(qty) AS qty
+			   FROM (SELECT b.parent, bi.item_code, bi.warehouse,
+							sum(bi.projected_qty) / b.qty AS qty
+					 FROM tabBin AS bi, (SELECT pb.new_item_code as parent, b.item_code, b.qty, w.name
+										 FROM `tabProduct Bundle Item` b, `tabWarehouse` w,
+											  `tabProduct Bundle` pb
+										 where b.parent = pb.name) AS b
+					 WHERE bi.item_code = b.item_code
+						   AND bi.warehouse = b.name
+					 GROUP BY b.parent, b.item_code, bi.warehouse
+					 UNION ALL
+					 SELECT b.parent, b.item_code, b.name, 0 AS qty
+					 FROM (SELECT pb.new_item_code as parent, b.item_code, b.qty, w.name
+						   FROM `tabProduct Bundle Item` b, `tabWarehouse` w,
+								`tabProduct Bundle` pb
+						   where b.parent = pb.name) AS b
+					 WHERE NOT EXISTS(SELECT *
+									  FROM `tabBin` AS bi
+									  WHERE bi.item_code = b.item_code
+											AND bi.warehouse = b.name)) AS r
+			   GROUP BY parent, warehouse
+			   HAVING MIN(qty) != 0"""
+	result = frappe.db.sql(query, as_dict=1)
+	last_sbom = ""
 	sbom_map = {}
-	iwq_map = get_item_warehouse_quantity()
-	sbom_item_map = get_product_bundle_items()
-	
-	for sbom, sbom_items in sbom_item_map.items():
-		for item, child_qty in sbom_items.items():
-			for wh, qty in iwq_map.get(item, {}).items():
-				avail_qty = flt(qty) / flt(child_qty)
-				sbom_map.setdefault(sbom, {}).setdefault(wh, {}) \
-					.setdefault(item, avail_qty)
-
+	for line in result:
+		if line.get("parent") != last_sbom:
+			last_sbom = line.get("parent")
+			actual_dict = sbom_map.setdefault(last_sbom, {})
+		actual_dict.setdefault(line.get("warehouse"), line.get("qty"))
 	return sbom_map
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index d85fc45..bb652ca 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,762 +1,769 @@
 {
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:company_name",
- "creation": "2013-04-10 08:35:39",
- "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
-  "details",
-  "company_name",
-  "abbr",
-  "change_abbr",
-  "is_group",
-  "cb0",
-  "domain",
-  "parent_company",
-  "charts_section",
-  "default_currency",
-  "default_letter_head",
-  "default_holiday_list",
-  "default_finance_book",
-  "standard_working_hours",
-  "default_terms",
-  "column_break_10",
-  "country",
-  "create_chart_of_accounts_based_on",
-  "chart_of_accounts",
-  "existing_company",
-  "tax_id",
-  "date_of_establishment",
-  "sales_settings",
-  "monthly_sales_target",
-  "sales_monthly_history",
-  "column_break_goals",
-  "transactions_annual_history",
-  "total_monthly_sales",
-  "default_settings",
-  "default_bank_account",
-  "default_cash_account",
-  "default_receivable_account",
-  "round_off_account",
-  "round_off_cost_center",
-  "write_off_account",
-  "discount_allowed_account",
-  "discount_received_account",
-  "exchange_gain_loss_account",
-  "unrealized_exchange_gain_loss_account",
-  "column_break0",
-  "allow_account_creation_against_child_company",
-  "default_payable_account",
-  "default_employee_advance_account",
-  "default_expense_account",
-  "default_income_account",
-  "default_deferred_revenue_account",
-  "default_deferred_expense_account",
-  "default_payroll_payable_account",
-  "default_expense_claim_payable_account",
-  "section_break_22",
-  "cost_center",
-  "column_break_26",
-  "credit_limit",
-  "payment_terms",
-  "auto_accounting_for_stock_settings",
-  "enable_perpetual_inventory",
-  "default_inventory_account",
-  "stock_adjustment_account",
-  "column_break_32",
-  "stock_received_but_not_billed",
-  "expenses_included_in_valuation",
-  "fixed_asset_depreciation_settings",
-  "accumulated_depreciation_account",
-  "depreciation_expense_account",
-  "series_for_depreciation_entry",
-  "expenses_included_in_asset_valuation",
-  "column_break_40",
-  "disposal_account",
-  "depreciation_cost_center",
-  "capital_work_in_progress_account",
-  "asset_received_but_not_billed",
-  "budget_detail",
-  "exception_budget_approver_role",
-  "company_info",
-  "company_logo",
-  "date_of_incorporation",
-  "address_html",
-  "date_of_commencement",
-  "phone_no",
-  "fax",
-  "email",
-  "website",
-  "column_break1",
-  "company_description",
-  "registration_info",
-  "registration_details",
-  "delete_company_transactions",
-  "lft",
-  "rgt",
-  "old_parent"
- ],
- "fields": [
-  {
-   "fieldname": "details",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break"
-  },
-  {
-   "fieldname": "company_name",
-   "fieldtype": "Data",
-   "label": "Company",
-   "oldfieldname": "company_name",
-   "oldfieldtype": "Data",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "abbr",
-   "fieldtype": "Data",
-   "label": "Abbr",
-   "oldfieldname": "abbr",
-   "oldfieldtype": "Data",
-   "reqd": 1
-  },
-  {
-   "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
-   "fieldname": "change_abbr",
-   "fieldtype": "Button",
-   "label": "Change Abbreviation"
-  },
-  {
-   "bold": 1,
-   "default": "0",
-   "fieldname": "is_group",
-   "fieldtype": "Check",
-   "label": "Is Group"
-  },
-  {
-   "fieldname": "default_finance_book",
-   "fieldtype": "Link",
-   "label": "Default Finance Book",
-   "options": "Finance Book"
-  },
-  {
-   "fieldname": "cb0",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "domain",
-   "fieldtype": "Link",
-   "label": "Domain",
-   "options": "Domain"
-  },
-  {
-   "fieldname": "parent_company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Parent Company",
-   "options": "Company"
-  },
-  {
-   "fieldname": "company_logo",
-   "fieldtype": "Attach Image",
-   "hidden": 1,
-   "label": "Company Logo"
-  },
-  {
-   "fieldname": "company_description",
-   "fieldtype": "Text Editor",
-   "label": "Company Description"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sales_settings",
-   "fieldtype": "Section Break",
-   "label": "Sales Settings"
-  },
-  {
-   "fieldname": "sales_monthly_history",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Sales Monthly History",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "transactions_annual_history",
-   "fieldtype": "Code",
-   "hidden": 1,
-   "label": "Transactions Annual History",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "monthly_sales_target",
-   "fieldtype": "Currency",
-   "label": "Monthly Sales Target",
-   "options": "default_currency"
-  },
-  {
-   "fieldname": "column_break_goals",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "total_monthly_sales",
-   "fieldtype": "Currency",
-   "label": "Total Monthly Sales",
-   "no_copy": 1,
-   "options": "default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "charts_section",
-   "fieldtype": "Section Break",
-   "label": "Default Values"
-  },
-  {
-   "fieldname": "default_currency",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Currency",
-   "options": "Currency",
-   "reqd": 1
-  },
-  {
-   "fieldname": "default_letter_head",
-   "fieldtype": "Link",
-   "label": "Default Letter Head",
-   "options": "Letter Head"
-  },
-  {
-   "fieldname": "default_holiday_list",
-   "fieldtype": "Link",
-   "label": "Default Holiday List",
-   "options": "Holiday List"
-  },
-  {
-   "fieldname": "standard_working_hours",
-   "fieldtype": "Float",
-   "label": "Standard Working Hours"
-  },
-  {
-   "fieldname": "default_terms",
-   "fieldtype": "Link",
-   "label": "Default Terms",
-   "options": "Terms and Conditions"
-  },
-  {
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "country",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Country",
-   "options": "Country",
-   "reqd": 1
-  },
-  {
-   "fieldname": "create_chart_of_accounts_based_on",
-   "fieldtype": "Select",
-   "label": "Create Chart Of Accounts Based On",
-   "options": "\nStandard Template\nExisting Company"
-  },
-  {
-   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
-   "fieldname": "chart_of_accounts",
-   "fieldtype": "Select",
-   "label": "Chart Of Accounts Template",
-   "no_copy": 1
-  },
-  {
-   "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
-   "fieldname": "existing_company",
-   "fieldtype": "Link",
-   "label": "Existing Company ",
-   "no_copy": 1,
-   "options": "Company"
-  },
-  {
-   "fieldname": "tax_id",
-   "fieldtype": "Data",
-   "label": "Tax ID"
-  },
-  {
-   "fieldname": "date_of_establishment",
-   "fieldtype": "Date",
-   "label": "Date of Establishment"
-  },
-  {
-   "fieldname": "default_settings",
-   "fieldtype": "Section Break",
-   "label": "Accounts Settings",
-   "oldfieldtype": "Section Break"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_bank_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Bank Account",
-   "no_copy": 1,
-   "oldfieldname": "default_bank_account",
-   "oldfieldtype": "Link",
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_cash_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Cash Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_receivable_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Receivable Account",
-   "no_copy": 1,
-   "oldfieldname": "receivables_group",
-   "oldfieldtype": "Link",
-   "options": "Account"
-  },
-  {
-   "fieldname": "round_off_account",
-   "fieldtype": "Link",
-   "label": "Round Off Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "round_off_cost_center",
-   "fieldtype": "Link",
-   "label": "Round Off Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "write_off_account",
-   "fieldtype": "Link",
-   "label": "Write Off Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "discount_allowed_account",
-   "fieldtype": "Link",
-   "label": "Discount Allowed Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "discount_received_account",
-   "fieldtype": "Link",
-   "label": "Discount Received Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "exchange_gain_loss_account",
-   "fieldtype": "Link",
-   "label": "Exchange Gain / Loss Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "unrealized_exchange_gain_loss_account",
-   "fieldtype": "Link",
-   "label": "Unrealized Exchange Gain/Loss Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.parent_company",
-   "fieldname": "allow_account_creation_against_child_company",
-   "fieldtype": "Check",
-   "label": "Allow Account Creation Against Child Company"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_payable_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Payable Account",
-   "no_copy": 1,
-   "oldfieldname": "payables_group",
-   "oldfieldtype": "Link",
-   "options": "Account"
-  },
-  {
-   "fieldname": "default_employee_advance_account",
-   "fieldtype": "Link",
-   "label": "Default Employee Advance Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_expense_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Cost of Goods Sold Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_income_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Income Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_deferred_revenue_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Deferred Revenue Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_deferred_expense_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Deferred Expense Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_payroll_payable_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Payroll Payable Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "default_expense_claim_payable_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Expense Claim Payable Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "fieldname": "section_break_22",
-   "fieldtype": "Section Break"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Cost Center",
-   "no_copy": 1,
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "column_break_26",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "credit_limit",
-   "fieldtype": "Currency",
-   "label": "Credit Limit",
-   "oldfieldname": "credit_limit",
-   "oldfieldtype": "Currency",
-   "options": "default_currency"
-  },
-  {
-   "fieldname": "payment_terms",
-   "fieldtype": "Link",
-   "label": "Default Payment Terms Template",
-   "options": "Payment Terms Template"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "auto_accounting_for_stock_settings",
-   "fieldtype": "Section Break",
-   "label": "Stock Settings"
-  },
-  {
-   "default": "1",
-   "fieldname": "enable_perpetual_inventory",
-   "fieldtype": "Check",
-   "label": "Enable Perpetual Inventory"
-  },
-  {
-   "fieldname": "default_inventory_account",
-   "fieldtype": "Link",
-   "label": "Default Inventory Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "stock_adjustment_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Stock Adjustment Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "fieldname": "column_break_32",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "stock_received_but_not_billed",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Stock Received But Not Billed",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "fieldname": "expenses_included_in_valuation",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Expenses Included In Valuation",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "fixed_asset_depreciation_settings",
-   "fieldtype": "Section Break",
-   "label": "Fixed Asset Depreciation Settings"
-  },
-  {
-   "fieldname": "accumulated_depreciation_account",
-   "fieldtype": "Link",
-   "label": "Accumulated Depreciation Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "fieldname": "depreciation_expense_account",
-   "fieldtype": "Link",
-   "label": "Depreciation Expense Account",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "fieldname": "series_for_depreciation_entry",
-   "fieldtype": "Data",
-   "label": "Series for Asset Depreciation Entry (Journal Entry)"
-  },
-  {
-   "fieldname": "expenses_included_in_asset_valuation",
-   "fieldtype": "Link",
-   "label": "Expenses Included In Asset Valuation",
-   "options": "Account"
-  },
-  {
-   "fieldname": "column_break_40",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "disposal_account",
-   "fieldtype": "Link",
-   "label": "Gain/Loss Account on Asset Disposal",
-   "no_copy": 1,
-   "options": "Account"
-  },
-  {
-   "fieldname": "depreciation_cost_center",
-   "fieldtype": "Link",
-   "label": "Asset Depreciation Cost Center",
-   "no_copy": 1,
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "capital_work_in_progress_account",
-   "fieldtype": "Link",
-   "label": "Capital Work In Progress Account",
-   "options": "Account"
-  },
-  {
-   "fieldname": "asset_received_but_not_billed",
-   "fieldtype": "Link",
-   "label": "Asset Received But Not Billed",
-   "options": "Account"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "budget_detail",
-   "fieldtype": "Section Break",
-   "label": "Budget Detail"
-  },
-  {
-   "fieldname": "exception_budget_approver_role",
-   "fieldtype": "Link",
-   "label": "Exception Budget Approver Role",
-   "options": "Role"
-  },
-  {
-   "collapsible": 1,
-   "description": "For reference only.",
-   "fieldname": "company_info",
-   "fieldtype": "Section Break",
-   "label": "Company Info"
-  },
-  {
-   "fieldname": "date_of_incorporation",
-   "fieldtype": "Date",
-   "label": "Date of Incorporation"
-  },
-  {
-   "fieldname": "address_html",
-   "fieldtype": "HTML"
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "depends_on": "eval:doc.date_of_incorporation",
-   "fieldname": "date_of_commencement",
-   "fieldtype": "Date",
-   "label": "Date of Commencement"
-  },
-  {
-   "fieldname": "phone_no",
-   "fieldtype": "Data",
-   "label": "Phone No",
-   "oldfieldname": "phone_no",
-   "oldfieldtype": "Data",
-   "options": "Phone"
-  },
-  {
-   "fieldname": "fax",
-   "fieldtype": "Data",
-   "label": "Fax",
-   "oldfieldname": "fax",
-   "oldfieldtype": "Data",
-   "options": "Phone"
-  },
-  {
-   "fieldname": "email",
-   "fieldtype": "Data",
-   "label": "Email",
-   "oldfieldname": "email",
-   "oldfieldtype": "Data",
-   "options": "Email"
-  },
-  {
-   "fieldname": "website",
-   "fieldtype": "Data",
-   "label": "Website",
-   "oldfieldname": "website",
-   "oldfieldtype": "Data"
-  },
-  {
-   "fieldname": "registration_info",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "width": "50%"
-  },
-  {
-   "description": "Company registration numbers for your reference. Tax numbers etc.",
-   "fieldname": "registration_details",
-   "fieldtype": "Code",
-   "label": "Registration Details",
-   "oldfieldname": "registration_details",
-   "oldfieldtype": "Code"
-  },
-  {
-   "fieldname": "delete_company_transactions",
-   "fieldtype": "Button",
-   "label": "Delete Company Transactions"
-  },
-  {
-   "fieldname": "lft",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "Lft",
-   "print_hide": 1,
-   "read_only": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "rgt",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "Rgt",
-   "print_hide": 1,
-   "read_only": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "old_parent",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "old_parent",
-   "print_hide": 1,
-   "read_only": 1
-  }
- ],
- "icon": "fa fa-building",
- "idx": 1,
- "image_field": "company_logo",
- "modified": "2019-06-14 14:36:11.363309",
- "modified_by": "Administrator",
- "module": "Setup",
- "name": "Company",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "role": "Accounts User"
-  },
-  {
-   "read": 1,
-   "role": "Employee"
-  },
-  {
-   "read": 1,
-   "role": "Sales User"
-  },
-  {
-   "read": 1,
-   "role": "Purchase User"
-  },
-  {
-   "read": 1,
-   "role": "Stock User"
-  },
-  {
-   "read": 1,
-   "role": "Projects User"
-  }
- ],
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "ASC",
- "track_changes": 1
-}
\ No newline at end of file
+  "allow_import": 1,
+  "allow_rename": 1,
+  "autoname": "field:company_name",
+  "creation": "2013-04-10 08:35:39",
+  "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
+  "doctype": "DocType",
+  "document_type": "Setup",
+  "engine": "InnoDB",
+  "field_order": [
+   "details",
+   "company_name",
+   "abbr",
+   "change_abbr",
+   "is_group",
+   "cb0",
+   "domain",
+   "parent_company",
+   "charts_section",
+   "default_currency",
+   "default_letter_head",
+   "default_holiday_list",
+   "default_finance_book",
+   "standard_working_hours",
+   "default_terms",
+   "default_warehouse_for_sales_return",
+   "column_break_10",
+   "country",
+   "create_chart_of_accounts_based_on",
+   "chart_of_accounts",
+   "existing_company",
+   "tax_id",
+   "date_of_establishment",
+   "sales_settings",
+   "monthly_sales_target",
+   "sales_monthly_history",
+   "column_break_goals",
+   "transactions_annual_history",
+   "total_monthly_sales",
+   "default_settings",
+   "default_bank_account",
+   "default_cash_account",
+   "default_receivable_account",
+   "round_off_account",
+   "round_off_cost_center",
+   "write_off_account",
+   "discount_allowed_account",
+   "discount_received_account",
+   "exchange_gain_loss_account",
+   "unrealized_exchange_gain_loss_account",
+   "column_break0",
+   "allow_account_creation_against_child_company",
+   "default_payable_account",
+   "default_employee_advance_account",
+   "default_expense_account",
+   "default_income_account",
+   "default_deferred_revenue_account",
+   "default_deferred_expense_account",
+   "default_payroll_payable_account",
+   "default_expense_claim_payable_account",
+   "section_break_22",
+   "cost_center",
+   "column_break_26",
+   "credit_limit",
+   "payment_terms",
+   "auto_accounting_for_stock_settings",
+   "enable_perpetual_inventory",
+   "default_inventory_account",
+   "stock_adjustment_account",
+   "column_break_32",
+   "stock_received_but_not_billed",
+   "expenses_included_in_valuation",
+   "fixed_asset_depreciation_settings",
+   "accumulated_depreciation_account",
+   "depreciation_expense_account",
+   "series_for_depreciation_entry",
+   "expenses_included_in_asset_valuation",
+   "column_break_40",
+   "disposal_account",
+   "depreciation_cost_center",
+   "capital_work_in_progress_account",
+   "asset_received_but_not_billed",
+   "budget_detail",
+   "exception_budget_approver_role",
+   "company_info",
+   "company_logo",
+   "date_of_incorporation",
+   "address_html",
+   "date_of_commencement",
+   "phone_no",
+   "fax",
+   "email",
+   "website",
+   "column_break1",
+   "company_description",
+   "registration_info",
+   "registration_details",
+   "delete_company_transactions",
+   "lft",
+   "rgt",
+   "old_parent"
+  ],
+  "fields": [
+   {
+    "fieldname": "details",
+    "fieldtype": "Section Break",
+    "oldfieldtype": "Section Break"
+   },
+   {
+    "fieldname": "company_name",
+    "fieldtype": "Data",
+    "label": "Company",
+    "oldfieldname": "company_name",
+    "oldfieldtype": "Data",
+    "reqd": 1,
+    "unique": 1
+   },
+   {
+    "fieldname": "abbr",
+    "fieldtype": "Data",
+    "label": "Abbr",
+    "oldfieldname": "abbr",
+    "oldfieldtype": "Data",
+    "reqd": 1
+   },
+   {
+    "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
+    "fieldname": "change_abbr",
+    "fieldtype": "Button",
+    "label": "Change Abbreviation"
+   },
+   {
+    "bold": 1,
+    "default": "0",
+    "fieldname": "is_group",
+    "fieldtype": "Check",
+    "label": "Is Group"
+   },
+   {
+    "fieldname": "default_finance_book",
+    "fieldtype": "Link",
+    "label": "Default Finance Book",
+    "options": "Finance Book"
+   },
+   {
+    "fieldname": "cb0",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "domain",
+    "fieldtype": "Link",
+    "label": "Domain",
+    "options": "Domain"
+   },
+   {
+    "fieldname": "parent_company",
+    "fieldtype": "Link",
+    "in_list_view": 1,
+    "label": "Parent Company",
+    "options": "Company"
+   },
+   {
+    "fieldname": "company_logo",
+    "fieldtype": "Attach Image",
+    "hidden": 1,
+    "label": "Company Logo"
+   },
+   {
+    "fieldname": "company_description",
+    "fieldtype": "Text Editor",
+    "label": "Company Description"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "sales_settings",
+    "fieldtype": "Section Break",
+    "label": "Sales Settings"
+   },
+   {
+    "fieldname": "sales_monthly_history",
+    "fieldtype": "Small Text",
+    "hidden": 1,
+    "label": "Sales Monthly History",
+    "no_copy": 1,
+    "read_only": 1
+   },
+   {
+    "fieldname": "transactions_annual_history",
+    "fieldtype": "Code",
+    "hidden": 1,
+    "label": "Transactions Annual History",
+    "no_copy": 1,
+    "read_only": 1
+   },
+   {
+    "fieldname": "monthly_sales_target",
+    "fieldtype": "Currency",
+    "label": "Monthly Sales Target",
+    "options": "default_currency"
+   },
+   {
+    "fieldname": "column_break_goals",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "total_monthly_sales",
+    "fieldtype": "Currency",
+    "label": "Total Monthly Sales",
+    "no_copy": 1,
+    "options": "default_currency",
+    "read_only": 1
+   },
+   {
+    "fieldname": "charts_section",
+    "fieldtype": "Section Break",
+    "label": "Default Values"
+   },
+   {
+    "fieldname": "default_currency",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Currency",
+    "options": "Currency",
+    "reqd": 1
+   },
+   {
+    "fieldname": "default_letter_head",
+    "fieldtype": "Link",
+    "label": "Default Letter Head",
+    "options": "Letter Head"
+   },
+   {
+    "fieldname": "default_holiday_list",
+    "fieldtype": "Link",
+    "label": "Default Holiday List",
+    "options": "Holiday List"
+   },
+   {
+    "fieldname": "standard_working_hours",
+    "fieldtype": "Float",
+    "label": "Standard Working Hours"
+   },
+   {
+    "fieldname": "default_terms",
+    "fieldtype": "Link",
+    "label": "Default Terms",
+    "options": "Terms and Conditions"
+   },
+   {
+    "fieldname": "default_warehouse_for_sales_return",
+    "fieldtype": "Link",
+    "label": "Default warehouse for Sales Return",
+    "options": "Warehouse"
+   },
+   {
+    "fieldname": "column_break_10",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "country",
+    "fieldtype": "Link",
+    "in_list_view": 1,
+    "label": "Country",
+    "options": "Country",
+    "reqd": 1
+   },
+   {
+    "fieldname": "create_chart_of_accounts_based_on",
+    "fieldtype": "Select",
+    "label": "Create Chart Of Accounts Based On",
+    "options": "\nStandard Template\nExisting Company"
+   },
+   {
+    "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
+    "fieldname": "chart_of_accounts",
+    "fieldtype": "Select",
+    "label": "Chart Of Accounts Template",
+    "no_copy": 1
+   },
+   {
+    "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
+    "fieldname": "existing_company",
+    "fieldtype": "Link",
+    "label": "Existing Company ",
+    "no_copy": 1,
+    "options": "Company"
+   },
+   {
+    "fieldname": "tax_id",
+    "fieldtype": "Data",
+    "label": "Tax ID"
+   },
+   {
+    "fieldname": "date_of_establishment",
+    "fieldtype": "Date",
+    "label": "Date of Establishment"
+   },
+   {
+    "fieldname": "default_settings",
+    "fieldtype": "Section Break",
+    "label": "Accounts Settings",
+    "oldfieldtype": "Section Break"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_bank_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Bank Account",
+    "no_copy": 1,
+    "oldfieldname": "default_bank_account",
+    "oldfieldtype": "Link",
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_cash_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Cash Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_receivable_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Receivable Account",
+    "no_copy": 1,
+    "oldfieldname": "receivables_group",
+    "oldfieldtype": "Link",
+    "options": "Account"
+   },
+   {
+    "fieldname": "round_off_account",
+    "fieldtype": "Link",
+    "label": "Round Off Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "round_off_cost_center",
+    "fieldtype": "Link",
+    "label": "Round Off Cost Center",
+    "options": "Cost Center"
+   },
+   {
+    "fieldname": "write_off_account",
+    "fieldtype": "Link",
+    "label": "Write Off Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "discount_allowed_account",
+    "fieldtype": "Link",
+    "label": "Discount Allowed Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "discount_received_account",
+    "fieldtype": "Link",
+    "label": "Discount Received Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "exchange_gain_loss_account",
+    "fieldtype": "Link",
+    "label": "Exchange Gain / Loss Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "unrealized_exchange_gain_loss_account",
+    "fieldtype": "Link",
+    "label": "Unrealized Exchange Gain/Loss Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "column_break0",
+    "fieldtype": "Column Break",
+    "oldfieldtype": "Column Break",
+    "width": "50%"
+   },
+   {
+    "default": "0",
+    "depends_on": "eval:doc.parent_company",
+    "fieldname": "allow_account_creation_against_child_company",
+    "fieldtype": "Check",
+    "label": "Allow Account Creation Against Child Company"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_payable_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Payable Account",
+    "no_copy": 1,
+    "oldfieldname": "payables_group",
+    "oldfieldtype": "Link",
+    "options": "Account"
+   },
+   {
+    "fieldname": "default_employee_advance_account",
+    "fieldtype": "Link",
+    "label": "Default Employee Advance Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_expense_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Cost of Goods Sold Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_income_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Income Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_deferred_revenue_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Deferred Revenue Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_deferred_expense_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Deferred Expense Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_payroll_payable_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Payroll Payable Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "default_expense_claim_payable_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Expense Claim Payable Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "fieldname": "section_break_22",
+    "fieldtype": "Section Break"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "cost_center",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Cost Center",
+    "no_copy": 1,
+    "options": "Cost Center"
+   },
+   {
+    "fieldname": "column_break_26",
+    "fieldtype": "Column Break"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "credit_limit",
+    "fieldtype": "Currency",
+    "label": "Credit Limit",
+    "oldfieldname": "credit_limit",
+    "oldfieldtype": "Currency",
+    "options": "default_currency"
+   },
+   {
+    "fieldname": "payment_terms",
+    "fieldtype": "Link",
+    "label": "Default Payment Terms Template",
+    "options": "Payment Terms Template"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "auto_accounting_for_stock_settings",
+    "fieldtype": "Section Break",
+    "label": "Stock Settings"
+   },
+   {
+    "default": "1",
+    "fieldname": "enable_perpetual_inventory",
+    "fieldtype": "Check",
+    "label": "Enable Perpetual Inventory"
+   },
+   {
+    "fieldname": "default_inventory_account",
+    "fieldtype": "Link",
+    "label": "Default Inventory Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "stock_adjustment_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Stock Adjustment Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "fieldname": "column_break_32",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "stock_received_but_not_billed",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Stock Received But Not Billed",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "fieldname": "expenses_included_in_valuation",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Expenses Included In Valuation",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "fixed_asset_depreciation_settings",
+    "fieldtype": "Section Break",
+    "label": "Fixed Asset Depreciation Settings"
+   },
+   {
+    "fieldname": "accumulated_depreciation_account",
+    "fieldtype": "Link",
+    "label": "Accumulated Depreciation Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "fieldname": "depreciation_expense_account",
+    "fieldtype": "Link",
+    "label": "Depreciation Expense Account",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "fieldname": "series_for_depreciation_entry",
+    "fieldtype": "Data",
+    "label": "Series for Asset Depreciation Entry (Journal Entry)"
+   },
+   {
+    "fieldname": "expenses_included_in_asset_valuation",
+    "fieldtype": "Link",
+    "label": "Expenses Included In Asset Valuation",
+    "options": "Account"
+   },
+   {
+    "fieldname": "column_break_40",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "disposal_account",
+    "fieldtype": "Link",
+    "label": "Gain/Loss Account on Asset Disposal",
+    "no_copy": 1,
+    "options": "Account"
+   },
+   {
+    "fieldname": "depreciation_cost_center",
+    "fieldtype": "Link",
+    "label": "Asset Depreciation Cost Center",
+    "no_copy": 1,
+    "options": "Cost Center"
+   },
+   {
+    "fieldname": "capital_work_in_progress_account",
+    "fieldtype": "Link",
+    "label": "Capital Work In Progress Account",
+    "options": "Account"
+   },
+   {
+    "fieldname": "asset_received_but_not_billed",
+    "fieldtype": "Link",
+    "label": "Asset Received But Not Billed",
+    "options": "Account"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "budget_detail",
+    "fieldtype": "Section Break",
+    "label": "Budget Detail"
+   },
+   {
+    "fieldname": "exception_budget_approver_role",
+    "fieldtype": "Link",
+    "label": "Exception Budget Approver Role",
+    "options": "Role"
+   },
+   {
+    "collapsible": 1,
+    "description": "For reference only.",
+    "fieldname": "company_info",
+    "fieldtype": "Section Break",
+    "label": "Company Info"
+   },
+   {
+    "fieldname": "date_of_incorporation",
+    "fieldtype": "Date",
+    "label": "Date of Incorporation"
+   },
+   {
+    "fieldname": "address_html",
+    "fieldtype": "HTML"
+   },
+   {
+    "fieldname": "column_break1",
+    "fieldtype": "Column Break",
+    "oldfieldtype": "Column Break",
+    "width": "50%"
+   },
+   {
+    "depends_on": "eval:doc.date_of_incorporation",
+    "fieldname": "date_of_commencement",
+    "fieldtype": "Date",
+    "label": "Date of Commencement"
+   },
+   {
+    "fieldname": "phone_no",
+    "fieldtype": "Data",
+    "label": "Phone No",
+    "oldfieldname": "phone_no",
+    "oldfieldtype": "Data",
+    "options": "Phone"
+   },
+   {
+    "fieldname": "fax",
+    "fieldtype": "Data",
+    "label": "Fax",
+    "oldfieldname": "fax",
+    "oldfieldtype": "Data",
+    "options": "Phone"
+   },
+   {
+    "fieldname": "email",
+    "fieldtype": "Data",
+    "label": "Email",
+    "oldfieldname": "email",
+    "oldfieldtype": "Data",
+    "options": "Email"
+   },
+   {
+    "fieldname": "website",
+    "fieldtype": "Data",
+    "label": "Website",
+    "oldfieldname": "website",
+    "oldfieldtype": "Data"
+   },
+   {
+    "fieldname": "registration_info",
+    "fieldtype": "Section Break",
+    "oldfieldtype": "Section Break",
+    "width": "50%"
+   },
+   {
+    "description": "Company registration numbers for your reference. Tax numbers etc.",
+    "fieldname": "registration_details",
+    "fieldtype": "Code",
+    "label": "Registration Details",
+    "oldfieldname": "registration_details",
+    "oldfieldtype": "Code"
+   },
+   {
+    "fieldname": "delete_company_transactions",
+    "fieldtype": "Button",
+    "label": "Delete Company Transactions"
+   },
+   {
+    "fieldname": "lft",
+    "fieldtype": "Int",
+    "hidden": 1,
+    "label": "Lft",
+    "print_hide": 1,
+    "read_only": 1,
+    "search_index": 1
+   },
+   {
+    "fieldname": "rgt",
+    "fieldtype": "Int",
+    "hidden": 1,
+    "label": "Rgt",
+    "print_hide": 1,
+    "read_only": 1,
+    "search_index": 1
+   },
+   {
+    "fieldname": "old_parent",
+    "fieldtype": "Data",
+    "hidden": 1,
+    "label": "old_parent",
+    "print_hide": 1,
+    "read_only": 1
+   }
+  ],
+  "icon": "fa fa-building",
+  "idx": 1,
+  "image_field": "company_logo",
+  "modified": "2019-06-14 14:36:11.363309",
+  "modified_by": "Administrator",
+  "module": "Setup",
+  "name": "Company",
+  "owner": "Administrator",
+  "permissions": [
+   {
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "System Manager",
+    "share": 1,
+    "write": 1
+   },
+   {
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "role": "Accounts User"
+   },
+   {
+    "read": 1,
+    "role": "Employee"
+   },
+   {
+    "read": 1,
+    "role": "Sales User"
+   },
+   {
+    "read": 1,
+    "role": "Purchase User"
+   },
+   {
+    "read": 1,
+    "role": "Stock User"
+   },
+   {
+    "read": 1,
+    "role": "Projects User"
+   }
+  ],
+  "show_name_in_global_search": 1,
+  "sort_field": "modified",
+  "sort_order": "ASC",
+  "track_changes": 1
+ }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 27c93ba..da29d20 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -252,7 +252,7 @@
 	def set_mode_of_payment_account(self):
 		cash = frappe.db.get_value('Mode of Payment', {'type': 'Cash'}, 'name')
 		if cash and self.default_cash_account \
-				and not frappe.db.get_value('Mode of Payment Account', {'company': self.name}):
+				and not frappe.db.get_value('Mode of Payment Account', {'company': self.name, 'parent': 'Cash'}):
 			mode_of_payment = frappe.get_doc('Mode of Payment', cash)
 			mode_of_payment.append('accounts', {
 				'company': self.name,
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index 1b08a22..8debef5 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -4,6 +4,8 @@
 
 import frappe
 import unittest
+import json
+from frappe import _
 from frappe.utils import random_string
 from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import get_charts_for_country
 
@@ -78,7 +80,10 @@
 						if account_type in ["Bank", "Cash"]:
 							filters["is_group"] = 1
 
-						self.assertTrue(frappe.get_all("Account", filters))
+						has_matching_accounts = frappe.get_all("Account", filters)
+						error_message = _("No Account matched these filters: {}".format(json.dumps(filters)))
+
+						self.assertTrue(has_matching_accounts, msg=error_message)
 				finally:
 					self.delete_mode_of_payment(template)
 					frappe.delete_doc("Company", template)
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index cab2116..8fbeac8 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -69,7 +69,8 @@
 			"items": get_product_list_for_group(product_group = self.name, start=start,
 				limit=context.page_length + 1, search=frappe.form_dict.get("search")),
 			"parents": get_parent_item_groups(self.parent_item_group),
-			"title": self.name
+			"title": self.name,
+			"products_as_list": cint(frappe.db.get_single_value('Products Settings', 'products_as_list'))
 		})
 
 		if self.slideshow:
diff --git a/erpnext/setup/setup_wizard/operations/sample_data.py b/erpnext/setup/setup_wizard/operations/sample_data.py
index 3f78734..c11a388 100644
--- a/erpnext/setup/setup_wizard/operations/sample_data.py
+++ b/erpnext/setup/setup_wizard/operations/sample_data.py
@@ -33,7 +33,7 @@
 def make_opportunity(items, customer):
 	b = frappe.get_doc({
 		"doctype": "Opportunity",
-		"enquiry_from": "Customer",
+		"opportunity_from": "Customer",
 		"customer": customer,
 		"opportunity_type": _("Sales"),
 		"with_items": 1
@@ -52,7 +52,7 @@
 	qtn = frappe.get_doc({
 		"doctype": "Quotation",
 		"quotation_to": "Customer",
-		"customer": customer,
+		"party_name": customer,
 		"order_type": "Sales"
 	})
 
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 8e8c79c..95bd9ba 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -52,7 +52,9 @@
 @frappe.whitelist()
 def place_order():
 	quotation = _get_cart_quotation()
-	quotation.company = frappe.db.get_value("Shopping Cart Settings", None, "company")
+	cart_settings = frappe.db.get_value("Shopping Cart Settings", None,
+		["company", "allow_items_not_in_stock"], as_dict=1)
+	quotation.company = cart_settings.company
 	if not quotation.get("customer_address"):
 		throw(_("{0} is required").format(_(quotation.meta.get_label("customer_address"))))
 
@@ -65,14 +67,16 @@
 
 	from erpnext.selling.doctype.quotation.quotation import _make_sales_order
 	sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
-	for item in sales_order.get("items"):
-		item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
-			item.item_code, ["website_warehouse", "is_stock_item"])
 
-		if is_stock_item:
-			item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
-			if item.qty > item_stock.stock_qty[0][0]:
-				throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
+	if not cart_settings.allow_items_not_in_stock:
+		for item in sales_order.get("items"):
+			item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
+				item.item_code, ["website_warehouse", "is_stock_item"])
+
+			if is_stock_item:
+				item_stock = get_qty_in_stock(item.item_code, "website_warehouse")
+				if item.qty > item_stock.stock_qty[0][0]:
+					throw(_("Only {0} in stock for item {1}").format(item_stock.stock_qty[0][0], item.item_code))
 
 	sales_order.flags.ignore_permissions = True
 	sales_order.insert()
@@ -241,7 +245,7 @@
 		party = get_party()
 
 	quotation = frappe.get_all("Quotation", fields=["name"], filters=
-		{party.doctype.lower(): party.name, "order_type": "Shopping Cart", "docstatus": 0},
+		{"party_name": party.name, "order_type": "Shopping Cart", "docstatus": 0},
 		order_by="modified desc", limit_page_length=1)
 
 	if quotation:
@@ -256,7 +260,7 @@
 			"status": "Draft",
 			"docstatus": 0,
 			"__islocal": 1,
-			(party.doctype.lower()): party.name
+			"party_name": party.name
 		})
 
 		qdoc.contact_person = frappe.db.get_value("Contact", {"email_id": frappe.session.user})
@@ -336,9 +340,9 @@
 
 	# check if customer price list exists
 	selling_price_list = None
-	if quotation.customer:
+	if quotation.party_name:
 		from erpnext.accounts.party import get_default_price_list
-		selling_price_list = get_default_price_list(frappe.get_doc("Customer", quotation.customer))
+		selling_price_list = get_default_price_list(frappe.get_doc("Customer", quotation.party_name))
 
 	# else check for territory based price list
 	if not selling_price_list:
@@ -350,9 +354,9 @@
 	"""set taxes based on billing territory"""
 	from erpnext.accounts.party import set_taxes
 
-	customer_group = frappe.db.get_value("Customer", quotation.customer, "customer_group")
+	customer_group = frappe.db.get_value("Customer", quotation.party_name, "customer_group")
 
-	quotation.taxes_and_charges = set_taxes(quotation.customer, "Customer",
+	quotation.taxes_and_charges = set_taxes(quotation.party_name, "Customer",
 		quotation.transaction_date, quotation.company, customer_group=customer_group, supplier_group=None,
 		tax_category=quotation.tax_category, billing_address=quotation.customer_address,
 		shipping_address=quotation.shipping_address_name, use_for_shopping_cart=1)
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index e6b47a6..8b9299e 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -1,683 +1,716 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2013-06-19 15:57:32",
- "custom": 0,
- "description": "Default settings for Shopping Cart",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "System",
- "editable_grid": 0,
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "enabled",
-   "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": "Enable Shopping Cart",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
+   "allow_copy": 0,
+   "allow_events_in_timeline": 0,
+   "allow_guest_to_view": 0,
+   "allow_import": 0,
+   "allow_rename": 0,
+   "beta": 0,
+   "creation": "2013-06-19 15:57:32",
+   "custom": 0,
+   "description": "Default settings for Shopping Cart",
+   "docstatus": 0,
+   "doctype": "DocType",
+   "document_type": "System",
+   "editable_grid": 0,
+   "fields": [
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "enabled",
+     "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": "Enable Shopping Cart",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "description": "",
+     "fieldname": "display_settings",
+     "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": "Display Settings",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "description": "",
+     "fieldname": "show_attachments",
+     "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": "Show Public Attachments",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "description": "",
+     "fieldname": "show_price",
+     "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": "Show Price",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "show_stock_availability",
+     "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": "Show Stock Availability",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "show_configure_button",
+     "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": "Show Configure Button",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "show_contact_us_button",
+     "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": "Show Contact Us Button",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "show_stock_availability",
+     "fieldname": "show_quantity_in_website",
+     "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": "Show Stock Quantity",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fetch_if_empty": 0,
+     "fieldname": "allow_items_not_in_stock",
+     "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 items not in stock to be added to cart",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+     },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "enabled",
+     "fieldname": "section_break_2",
+     "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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "company",
+     "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": "Company",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Company",
+     "permlevel": 0,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 1,
+     "report_hide": 0,
+     "reqd": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "Prices will not be shown if Price List is not set",
+     "fieldname": "price_list",
+     "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": "Price List",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Price List",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_4",
+     "fieldtype": "Column 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,
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "description": "",
+     "fieldname": "default_customer_group",
+     "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": "Default Customer Group",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Customer Group",
+     "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": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "quotation_series",
+     "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": "Quotation Series",
+     "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": 1,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 1,
+     "collapsible_depends_on": "eval:doc.enable_checkout",
+     "columns": 0,
+     "depends_on": "enabled",
+     "fieldname": "section_break_8",
+     "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": "Checkout Settings",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "collapsible_depends_on": "",
+     "columns": 0,
+     "depends_on": "",
+     "fieldname": "enable_checkout",
+     "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": "Enable Checkout",
+     "length": 0,
+     "no_copy": 0,
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "default": "Orders",
+     "description": "After payment completion redirect user to selected page.",
+     "fieldname": "payment_success_url",
+     "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": "Payment Success Url",
+     "length": 0,
+     "no_copy": 0,
+     "options": "\nOrders\nInvoices\nMy Account",
+     "permlevel": 0,
+     "precision": "",
+     "print_hide": 0,
+     "print_hide_if_no_value": 0,
+     "read_only": 0,
+     "remember_last_selected_value": 0,
+     "report_hide": 0,
+     "reqd": 0,
+     "search_index": 0,
+     "set_only_once": 0,
+     "translatable": 0,
+     "unique": 0
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "column_break_11",
+     "fieldtype": "Column 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
+    },
+    {
+     "allow_bulk_edit": 0,
+     "allow_in_quick_entry": 0,
+     "allow_on_submit": 0,
+     "bold": 0,
+     "collapsible": 0,
+     "columns": 0,
+     "fieldname": "payment_gateway_account",
+     "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": "Payment Gateway Account",
+     "length": 0,
+     "no_copy": 0,
+     "options": "Payment Gateway Account",
+     "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
+    }
+   ],
+   "has_web_view": 0,
+   "hide_heading": 0,
+   "hide_toolbar": 0,
+   "icon": "fa fa-shopping-cart",
+   "idx": 1,
+   "image_view": 0,
+   "in_create": 0,
+   "is_submittable": 0,
+   "issingle": 1,
+   "istable": 0,
+   "max_attachments": 0,
+   "modified": "2019-01-26 13:54:24.575322",
+   "modified_by": "Administrator",
+   "module": "Shopping Cart",
+   "name": "Shopping Cart Settings",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 0,
+     "cancel": 0,
+     "create": 1,
+     "delete": 0,
+     "email": 1,
+     "export": 0,
+     "if_owner": 0,
+     "import": 0,
+     "permlevel": 0,
+     "print": 1,
+     "read": 1,
+     "report": 0,
+     "role": "Website Manager",
+     "set_user_permissions": 0,
+     "share": 1,
+     "submit": 0,
+     "write": 1
+    }
+   ],
+   "quick_entry": 0,
    "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "display_settings",
-   "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": "Display Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "show_attachments",
-   "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": "Show Public Attachments",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "description": "",
-   "fieldname": "show_price",
-   "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": "Show Price",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "show_stock_availability",
-   "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": "Show Stock Availability",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "show_configure_button",
-   "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": "Show Configure Button",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "show_contact_us_button",
-   "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": "Show Contact Us Button",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "show_stock_availability",
-   "fieldname": "show_quantity_in_website",
-   "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": "Show Stock Quantity",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "enabled",
-   "fieldname": "section_break_2",
-   "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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "company",
-   "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": "Company",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 1,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Prices will not be shown if Price List is not set",
-   "fieldname": "price_list",
-   "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": "Price List",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Price List",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_4",
-   "fieldtype": "Column 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,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "",
-   "fieldname": "default_customer_group",
-   "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": "Default Customer Group",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Customer Group",
-   "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": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "quotation_series",
-   "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": "Quotation Series",
-   "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": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.enable_checkout",
-   "columns": 0,
-   "depends_on": "enabled",
-   "fieldname": "section_break_8",
-   "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": "Checkout Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "collapsible_depends_on": "",
-   "columns": 0,
-   "depends_on": "",
-   "fieldname": "enable_checkout",
-   "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": "Enable Checkout",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Orders",
-   "description": "After payment completion redirect user to selected page.",
-   "fieldname": "payment_success_url",
-   "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": "Payment Success Url",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nOrders\nInvoices\nMy Account",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_11",
-   "fieldtype": "Column 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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "payment_gateway_account",
-   "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": "Payment Gateway Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Payment Gateway Account",
-   "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
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-shopping-cart",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-01-26 13:54:24.575322",
- "modified_by": "Administrator",
- "module": "Shopping Cart",
- "name": "Shopping Cart Settings",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 0,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "Website Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "ASC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
-}
\ No newline at end of file
+   "read_only_onload": 0,
+   "show_name_in_global_search": 0,
+   "sort_order": "ASC",
+   "track_changes": 0,
+   "track_seen": 0,
+   "track_views": 0
+  }
\ No newline at end of file
diff --git a/erpnext/shopping_cart/test_shopping_cart.py b/erpnext/shopping_cart/test_shopping_cart.py
index daad799..cf59a52 100644
--- a/erpnext/shopping_cart/test_shopping_cart.py
+++ b/erpnext/shopping_cart/test_shopping_cart.py
@@ -33,7 +33,6 @@
 		self.assertEqual(quotation.quotation_to, "Customer")
 		self.assertEqual(quotation.contact_person,
 			frappe.db.get_value("Contact", dict(email_id="test_cart_user@example.com")))
-		self.assertEqual(quotation.lead, None)
 		self.assertEqual(quotation.contact_email, frappe.session.user)
 
 		return quotation
@@ -44,8 +43,7 @@
 		# test if quotation with customer is fetched
 		quotation = _get_cart_quotation()
 		self.assertEqual(quotation.quotation_to, "Customer")
-		self.assertEqual(quotation.customer, "_Test Customer")
-		self.assertEqual(quotation.lead, None)
+		self.assertEqual(quotation.party_name, "_Test Customer")
 		self.assertEqual(quotation.contact_email, frappe.session.user)
 
 		return quotation
@@ -107,10 +105,11 @@
 
 		from erpnext.accounts.party import set_taxes
 
-		tax_rule_master = set_taxes(quotation.customer, "Customer",
+		tax_rule_master = set_taxes(quotation.party_name, "Customer",
 			quotation.transaction_date, quotation.company, customer_group=None, supplier_group=None,
 			tax_category=quotation.tax_category, billing_address=quotation.customer_address,
 			shipping_address=quotation.shipping_address_name, use_for_shopping_cart=1)
+
 		self.assertEqual(quotation.taxes_and_charges, tax_rule_master)
 		self.assertEqual(quotation.total_taxes_and_charges, 1000.0)
 
@@ -123,7 +122,7 @@
 			"doctype": "Quotation",
 			"quotation_to": "Customer",
 			"order_type": "Shopping Cart",
-			"customer": get_party(frappe.session.user).name,
+			"party_name": get_party(frappe.session.user).name,
 			"docstatus": 0,
 			"contact_email": frappe.session.user,
 			"selling_price_list": "_Test Price List Rest of the World",
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 4881983..bd24257 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -10,6 +10,7 @@
 from frappe.utils import flt, cint
 from frappe.utils.jinja import render_template
 from frappe.utils.data import add_days
+from six import string_types
 
 class UnableToSelectBatchError(frappe.ValidationError):
 	pass
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 78bc06a..6bcdc2b 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -101,8 +101,7 @@
 	refresh: function(doc, dt, dn) {
 		var me = this;
 		this._super();
-
-		if ((!doc.is_return) && (doc.status!="Closed" || doc.is_new())) {
+		if ((!doc.is_return) && (doc.status!="Closed" || this.frm.is_new())) {
 			if (this.frm.doc.docstatus===0) {
 				this.frm.add_custom_button(__('Sales Order'),
 					function() {
@@ -303,4 +302,3 @@
 			dn_fields['taxes'].print_hide = 0;
 	}
 }
-
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index fc715c9..164ffa4 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,1099 +1,1093 @@
 {
- "allow_guest_to_view": 1,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:item_code",
- "creation": "2013-05-03 10:45:46",
- "description": "A Product or a Service that is bought, sold or kept in stock.",
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "name_and_description_section",
-  "naming_series",
-  "item_code",
-  "variant_of",
-  "item_name",
-  "item_group",
-  "is_item_from_hub",
-  "stock_uom",
-  "column_break0",
-  "disabled",
-  "allow_alternative_item",
-  "is_stock_item",
-  "include_item_in_manufacturing",
-  "opening_stock",
-  "valuation_rate",
-  "standard_rate",
-  "is_fixed_asset",
-  "asset_category",
-  "asset_naming_series",
-  "tolerance",
-  "image",
-  "section_break_11",
-  "brand",
-  "description",
-  "sb_barcodes",
-  "barcodes",
-  "inventory_section",
-  "shelf_life_in_days",
-  "end_of_life",
-  "default_material_request_type",
-  "valuation_method",
-  "column_break1",
-  "warranty_period",
-  "weight_per_unit",
-  "weight_uom",
-  "reorder_section",
-  "reorder_levels",
-  "unit_of_measure_conversion",
-  "uoms",
-  "serial_nos_and_batches",
-  "has_batch_no",
-  "create_new_batch",
-  "batch_number_series",
-  "has_expiry_date",
-  "retain_sample",
-  "sample_quantity",
-  "column_break_37",
-  "has_serial_no",
-  "serial_no_series",
-  "variants_section",
-  "has_variants",
-  "variant_based_on",
-  "attributes",
-  "defaults",
-  "item_defaults",
-  "purchase_details",
-  "is_purchase_item",
-  "purchase_uom",
-  "min_order_qty",
-  "safety_stock",
-  "purchase_details_cb",
-  "lead_time_days",
-  "last_purchase_rate",
-  "is_customer_provided_item",
-  "customer",
-  "supplier_details",
-  "manufacturers",
-  "delivered_by_supplier",
-  "column_break2",
-  "supplier_items",
-  "foreign_trade_details",
-  "country_of_origin",
-  "column_break_59",
-  "customs_tariff_number",
-  "sales_details",
-  "sales_uom",
-  "is_sales_item",
-  "column_break3",
-  "max_discount",
-  "deferred_revenue",
-  "deferred_revenue_account",
-  "enable_deferred_revenue",
-  "column_break_85",
-  "no_of_months",
-  "deferred_expense_section",
-  "deferred_expense_account",
-  "enable_deferred_expense",
-  "column_break_88",
-  "no_of_months_exp",
-  "customer_details",
-  "customer_items",
-  "item_tax_section_break",
-  "taxes",
-  "inspection_criteria",
-  "inspection_required_before_purchase",
-  "inspection_required_before_delivery",
-  "quality_inspection_template",
-  "manufacturing",
-  "default_bom",
-  "is_sub_contracted_item",
-  "column_break_74",
-  "customer_code",
-  "website_section",
-  "show_in_website",
-  "show_variant_in_website",
-  "route",
-  "weightage",
-  "slideshow",
-  "website_image",
-  "thumbnail",
-  "cb72",
-  "website_warehouse",
-  "website_item_groups",
-  "set_meta_tags",
-  "sb72",
-  "copy_from_item_group",
-  "website_specifications",
-  "web_long_description",
-  "website_content",
-  "total_projected_qty",
-  "hub_publishing_sb",
-  "publish_in_hub",
-  "hub_category_to_publish",
-  "hub_warehouse",
-  "synced_with_hub"
- ],
- "fields": [
-  {
-   "fieldname": "name_and_description_section",
-   "fieldtype": "Section Break",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-flag"
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "options": "STO-ITEM-.YYYY.-",
-   "set_only_once": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "item_code",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Item Code",
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Data",
-   "unique": 1
-  },
-  {
-   "depends_on": "variant_of",
-   "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
-   "fieldname": "variant_of",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "in_standard_filter": 1,
-   "label": "Variant Of",
-   "options": "Item",
-   "read_only": 1,
-   "search_index": 1,
-   "set_only_once": 1
-  },
-  {
-   "bold": 1,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Item Name",
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "search_index": 1
-  },
-  {
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "in_preview": 1,
-   "in_standard_filter": 1,
-   "label": "Item Group",
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_item_from_hub",
-   "fieldtype": "Check",
-   "label": "Is Item from Hub",
-   "read_only": 1
-  },
-  {
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default Unit of Measure",
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
-  },
-  {
-   "default": "0",
-   "fieldname": "allow_alternative_item",
-   "fieldtype": "Check",
-   "label": "Allow Alternative Item"
-  },
-  {
-   "bold": 1,
-   "default": "1",
-   "fieldname": "is_stock_item",
-   "fieldtype": "Check",
-   "label": "Maintain Stock",
-   "oldfieldname": "is_stock_item",
-   "oldfieldtype": "Select"
-  },
-  {
-   "default": "1",
-   "fieldname": "include_item_in_manufacturing",
-   "fieldtype": "Check",
-   "label": "Include Item In Manufacturing"
-  },
-  {
-   "bold": 1,
-   "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
-   "fieldname": "opening_stock",
-   "fieldtype": "Float",
-   "label": "Opening Stock"
-  },
-  {
-   "depends_on": "is_stock_item",
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "label": "Valuation Rate"
-  },
-  {
-   "bold": 1,
-   "depends_on": "eval:doc.__islocal",
-   "fieldname": "standard_rate",
-   "fieldtype": "Currency",
-   "label": "Standard Selling Rate"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_fixed_asset",
-   "fieldtype": "Check",
-   "label": "Is Fixed Asset",
-   "set_only_once": 1
-  },
-  {
-   "depends_on": "is_fixed_asset",
-   "fieldname": "asset_category",
-   "fieldtype": "Link",
-   "label": "Asset Category",
-   "options": "Asset Category"
-  },
-  {
-   "depends_on": "is_fixed_asset",
-   "fieldname": "asset_naming_series",
-   "fieldtype": "Select",
-   "label": "Asset Naming Series"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "tolerance",
-   "fieldtype": "Float",
-   "label": "Allow over delivery or receipt upto this percent",
-   "oldfieldname": "tolerance",
-   "oldfieldtype": "Currency"
-  },
-  {
-   "fieldname": "image",
-   "fieldtype": "Attach Image",
-   "hidden": 1,
-   "in_preview": 1,
-   "label": "Image",
-   "options": "image",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break",
-   "label": "Description"
-  },
-  {
-   "fieldname": "brand",
-   "fieldtype": "Link",
-   "label": "Brand",
-   "oldfieldname": "brand",
-   "oldfieldtype": "Link",
-   "options": "Brand",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "in_preview": 1,
-   "label": "Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Text"
-  },
-  {
-   "fieldname": "sb_barcodes",
-   "fieldtype": "Section Break",
-   "label": "Barcodes"
-  },
-  {
-   "fieldname": "barcodes",
-   "fieldtype": "Table",
-   "label": "Barcodes",
-   "options": "Item Barcode"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "is_stock_item",
-   "depends_on": "is_stock_item",
-   "fieldname": "inventory_section",
-   "fieldtype": "Section Break",
-   "label": "Inventory",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-truck"
-  },
-  {
-   "fieldname": "shelf_life_in_days",
-   "fieldtype": "Int",
-   "label": "Shelf Life In Days"
-  },
-  {
-   "default": "2099-12-31",
-   "depends_on": "is_stock_item",
-   "fieldname": "end_of_life",
-   "fieldtype": "Date",
-   "label": "End of Life",
-   "oldfieldname": "end_of_life",
-   "oldfieldtype": "Date"
-  },
-  {
-   "default": "Purchase",
-   "fieldname": "default_material_request_type",
-   "fieldtype": "Select",
-   "label": "Default Material Request Type",
-   "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture\nCustomer Provided"
-  },
-  {
-   "depends_on": "is_stock_item",
-   "fieldname": "valuation_method",
-   "fieldtype": "Select",
-   "label": "Valuation Method",
-   "options": "\nFIFO\nMoving Average",
-   "set_only_once": 1
-  },
-  {
-   "depends_on": "is_stock_item",
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "warranty_period",
-   "fieldtype": "Data",
-   "label": "Warranty Period (in days)",
-   "oldfieldname": "warranty_period",
-   "oldfieldtype": "Data"
-  },
-  {
-   "depends_on": "is_stock_item",
-   "fieldname": "weight_per_unit",
-   "fieldtype": "Float",
-   "label": "Weight Per Unit"
-  },
-  {
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "weight_uom",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Weight UOM",
-   "options": "UOM"
-  },
-  {
-   "collapsible": 1,
-   "depends_on": "is_stock_item",
-   "fieldname": "reorder_section",
-   "fieldtype": "Section Break",
-   "label": "Auto re-order",
-   "options": "fa fa-rss"
-  },
-  {
-   "description": "Will also apply for variants unless overrridden",
-   "fieldname": "reorder_levels",
-   "fieldtype": "Table",
-   "label": "Reorder level based on Warehouse",
-   "options": "Item Reorder"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "unit_of_measure_conversion",
-   "fieldtype": "Section Break",
-   "label": "Units of Measure"
-  },
-  {
-   "description": "Will also apply for variants",
-   "fieldname": "uoms",
-   "fieldtype": "Table",
-   "label": "UOMs",
-   "oldfieldname": "uom_conversion_details",
-   "oldfieldtype": "Table",
-   "options": "UOM Conversion Detail"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no || doc.is_fixed_asset",
-   "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset",
-   "fieldname": "serial_nos_and_batches",
-   "fieldtype": "Section Break",
-   "label": "Serial Nos and Batches"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.is_stock_item",
-   "fieldname": "has_batch_no",
-   "fieldtype": "Check",
-   "label": "Has Batch No",
-   "no_copy": 1,
-   "oldfieldname": "has_batch_no",
-   "oldfieldtype": "Select"
-  },
-  {
-   "default": "0",
-   "depends_on": "has_batch_no",
-   "fieldname": "create_new_batch",
-   "fieldtype": "Check",
-   "label": "Automatically Create New Batch"
-  },
-  {
-   "depends_on": "eval:doc.has_batch_no==1 && doc.create_new_batch==1",
-   "description": "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",
-   "fieldname": "batch_number_series",
-   "fieldtype": "Data",
-   "label": "Batch Number Series",
-   "translatable": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "has_batch_no",
-   "fieldname": "has_expiry_date",
-   "fieldtype": "Check",
-   "label": "Has Expiry Date"
-  },
-  {
-   "default": "0",
-   "depends_on": "has_batch_no",
-   "fieldname": "retain_sample",
-   "fieldtype": "Check",
-   "label": "Retain Sample"
-  },
-  {
-   "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)",
-   "description": "Maximum sample quantity that can be retained",
-   "fieldname": "sample_quantity",
-   "fieldtype": "Int",
-   "label": "Max Sample Quantity"
-  },
-  {
-   "fieldname": "column_break_37",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset",
-   "fieldname": "has_serial_no",
-   "fieldtype": "Check",
-   "label": "Has Serial No",
-   "no_copy": 1,
-   "oldfieldname": "has_serial_no",
-   "oldfieldtype": "Select"
-  },
-  {
-   "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset",
-   "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
-   "fieldname": "serial_no_series",
-   "fieldtype": "Data",
-   "label": "Serial Number Series"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "attributes",
-   "fieldname": "variants_section",
-   "fieldtype": "Section Break",
-   "label": "Variants"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:!doc.variant_of",
-   "description": "If this item has variants, then it cannot be selected in sales orders etc.",
-   "fieldname": "has_variants",
-   "fieldtype": "Check",
-   "in_standard_filter": 1,
-   "label": "Has Variants",
-   "no_copy": 1
-  },
-  {
-   "default": "Item Attribute",
-   "depends_on": "has_variants",
-   "fieldname": "variant_based_on",
-   "fieldtype": "Select",
-   "label": "Variant Based On",
-   "options": "Item Attribute\nManufacturer"
-  },
-  {
-   "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'",
-   "fieldname": "attributes",
-   "fieldtype": "Table",
-   "hidden": 1,
-   "label": "Attributes",
-   "no_copy": 1,
-   "options": "Item Variant Attribute"
-  },
-  {
-   "fieldname": "defaults",
-   "fieldtype": "Section Break",
-   "label": "Sales, Purchase, Accounting Defaults"
-  },
-  {
-   "fieldname": "item_defaults",
-   "fieldtype": "Table",
-   "label": "Item Defaults",
-   "options": "Item Default"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "purchase_details",
-   "fieldtype": "Section Break",
-   "label": "Purchase, Replenishment Details",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-shopping-cart"
-  },
-  {
-   "default": "1",
-   "fieldname": "is_purchase_item",
-   "fieldtype": "Check",
-   "label": "Is Purchase Item"
-  },
-  {
-   "fieldname": "purchase_uom",
-   "fieldtype": "Link",
-   "label": "Default Purchase Unit of Measure",
-   "options": "UOM"
-  },
-  {
-   "default": "0.00",
-   "depends_on": "is_stock_item",
-   "fieldname": "min_order_qty",
-   "fieldtype": "Float",
-   "label": "Minimum Order Qty",
-   "oldfieldname": "min_order_qty",
-   "oldfieldtype": "Currency"
-  },
-  {
-   "fieldname": "safety_stock",
-   "fieldtype": "Float",
-   "label": "Safety Stock"
-  },
-  {
-   "fieldname": "purchase_details_cb",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "Average time taken by the supplier to deliver",
-   "fieldname": "lead_time_days",
-   "fieldtype": "Int",
-   "label": "Lead Time in days",
-   "oldfieldname": "lead_time_days",
-   "oldfieldtype": "Int"
-  },
-  {
-   "fieldname": "last_purchase_rate",
-   "fieldtype": "Float",
-   "label": "Last Purchase Rate",
-   "no_copy": 1,
-   "oldfieldname": "last_purchase_rate",
-   "oldfieldtype": "Currency",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_customer_provided_item",
-   "fieldtype": "Check",
-   "label": "Is Customer Provided Item"
-  },
-  {
-   "depends_on": "eval:doc.is_customer_provided_item==1",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "label": "Customer",
-   "options": "Customer"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "supplier_details",
-   "fieldtype": "Section Break",
-   "label": "Supplier Details"
-  },
-  {
-   "default": "0",
-   "fieldname": "delivered_by_supplier",
-   "fieldtype": "Check",
-   "label": "Delivered by Supplier (Drop Ship)",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "supplier_items",
-   "fieldtype": "Table",
-   "label": "Supplier Items",
-   "options": "Item Supplier"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "foreign_trade_details",
-   "fieldtype": "Section Break",
-   "label": "Foreign Trade Details"
-  },
-  {
-   "fieldname": "country_of_origin",
-   "fieldtype": "Link",
-   "label": "Country of Origin",
-   "options": "Country"
-  },
-  {
-   "fieldname": "column_break_59",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "customs_tariff_number",
-   "fieldtype": "Link",
-   "label": "Customs Tariff Number",
-   "options": "Customs Tariff Number"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "sales_details",
-   "fieldtype": "Section Break",
-   "label": "Sales Details",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-tag"
-  },
-  {
-   "fieldname": "sales_uom",
-   "fieldtype": "Link",
-   "label": "Default Sales Unit of Measure",
-   "options": "UOM"
-  },
-  {
-   "default": "1",
-   "fieldname": "is_sales_item",
-   "fieldtype": "Check",
-   "label": "Is Sales Item"
-  },
-  {
-   "fieldname": "column_break3",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "max_discount",
-   "fieldtype": "Float",
-   "label": "Max Discount (%)",
-   "oldfieldname": "max_discount",
-   "oldfieldtype": "Currency"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "deferred_revenue",
-   "fieldtype": "Section Break",
-   "label": "Deferred Revenue"
-  },
-  {
-   "depends_on": "enable_deferred_revenue",
-   "fieldname": "deferred_revenue_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Deferred Revenue Account",
-   "options": "Account"
-  },
-  {
-   "default": "0",
-   "fieldname": "enable_deferred_revenue",
-   "fieldtype": "Check",
-   "label": "Enable Deferred Revenue"
-  },
-  {
-   "fieldname": "column_break_85",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "enable_deferred_revenue",
-   "fieldname": "no_of_months",
-   "fieldtype": "Int",
-   "label": "No of Months"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "deferred_expense_section",
-   "fieldtype": "Section Break",
-   "label": "Deferred Expense"
-  },
-  {
-   "depends_on": "enable_deferred_expense",
-   "fieldname": "deferred_expense_account",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Deferred Expense Account",
-   "options": "Account"
-  },
-  {
-   "default": "0",
-   "fieldname": "enable_deferred_expense",
-   "fieldtype": "Check",
-   "label": "Enable Deferred Expense"
-  },
-  {
-   "fieldname": "column_break_88",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "enable_deferred_expense",
-   "fieldname": "no_of_months_exp",
-   "fieldtype": "Int",
-   "label": "No of Months"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "customer_details",
-   "fieldtype": "Section Break",
-   "label": "Customer Details"
-  },
-  {
-   "fieldname": "customer_items",
-   "fieldtype": "Table",
-   "label": "Customer Items",
-   "options": "Item Customer Detail"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "taxes",
-   "fieldname": "item_tax_section_break",
-   "fieldtype": "Section Break",
-   "label": "Item Tax",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-money"
-  },
-  {
-   "description": "Will also apply for variants",
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "label": "Taxes",
-   "oldfieldname": "item_tax",
-   "oldfieldtype": "Table",
-   "options": "Item Tax"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "inspection_criteria",
-   "fieldtype": "Section Break",
-   "label": "Inspection Criteria",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-search"
-  },
-  {
-   "default": "0",
-   "fieldname": "inspection_required_before_purchase",
-   "fieldtype": "Check",
-   "label": "Inspection Required before Purchase",
-   "oldfieldname": "inspection_required",
-   "oldfieldtype": "Select"
-  },
-  {
-   "default": "0",
-   "fieldname": "inspection_required_before_delivery",
-   "fieldtype": "Check",
-   "label": "Inspection Required before Delivery"
-  },
-  {
-   "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
-   "fieldname": "quality_inspection_template",
-   "fieldtype": "Link",
-   "label": "Quality Inspection Template",
-   "options": "Quality Inspection Template",
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "depends_on": "is_stock_item",
-   "fieldname": "manufacturing",
-   "fieldtype": "Section Break",
-   "label": "Manufacturing",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-cogs"
-  },
-  {
-   "fieldname": "default_bom",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Default BOM",
-   "no_copy": 1,
-   "oldfieldname": "default_bom",
-   "oldfieldtype": "Link",
-   "options": "BOM",
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "description": "If subcontracted to a vendor",
-   "fieldname": "is_sub_contracted_item",
-   "fieldtype": "Check",
-   "label": "Supply Raw Materials for Purchase",
-   "oldfieldname": "is_sub_contracted_item",
-   "oldfieldtype": "Select"
-  },
-  {
-   "fieldname": "column_break_74",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "customer_code",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Customer Code",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "website_section",
-   "fieldtype": "Section Break",
-   "label": "Website",
-   "options": "fa fa-globe"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:!doc.variant_of",
-   "fieldname": "show_in_website",
-   "fieldtype": "Check",
-   "label": "Show in Website",
-   "search_index": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "variant_of",
-   "fieldname": "show_variant_in_website",
-   "fieldtype": "Check",
-   "label": "Show in Website (Variant)",
-   "search_index": 1
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "route",
-   "fieldtype": "Small Text",
-   "label": "Route",
-   "no_copy": 1
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Items with higher weightage will be shown higher",
-   "fieldname": "weightage",
-   "fieldtype": "Int",
-   "label": "Weightage"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Show a slideshow at the top of the page",
-   "fieldname": "slideshow",
-   "fieldtype": "Link",
-   "label": "Slideshow",
-   "options": "Website Slideshow"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Item Image (if not slideshow)",
-   "fieldname": "website_image",
-   "fieldtype": "Attach",
-   "label": "Image"
-  },
-  {
-   "fieldname": "thumbnail",
-   "fieldtype": "Data",
-   "label": "Thumbnail",
-   "read_only": 1
-  },
-  {
-   "fieldname": "cb72",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
-   "fieldname": "website_warehouse",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Website Warehouse",
-   "options": "Warehouse"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "description": "List this Item in multiple groups on the website.",
-   "fieldname": "website_item_groups",
-   "fieldtype": "Table",
-   "label": "Website Item Groups",
-   "options": "Website Item Group"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "set_meta_tags",
-   "fieldtype": "Button",
-   "label": "Set Meta Tags"
-  },
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "website_specifications",
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "sb72",
-   "fieldtype": "Section Break",
-   "label": "Website Specifications"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "copy_from_item_group",
-   "fieldtype": "Button",
-   "label": "Copy From Item Group"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "website_specifications",
-   "fieldtype": "Table",
-   "label": "Website Specifications",
-   "options": "Item Website Specification"
-  },
-  {
-   "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
-   "fieldname": "web_long_description",
-   "fieldtype": "Text Editor",
-   "label": "Website Description"
-  },
-  {
-   "description": "You can use any valid Bootstrap 4 markup in this field. It will be shown on your Item Page.",
-   "fieldname": "website_content",
-   "fieldtype": "HTML Editor",
-   "label": "Website Content"
-  },
-  {
-   "fieldname": "total_projected_qty",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "Total Projected Qty",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "eval:(!doc.is_item_from_hub)",
-   "fieldname": "hub_publishing_sb",
-   "fieldtype": "Section Break",
-   "label": "Hub Publishing Details"
-  },
-  {
-   "default": "0",
-   "description": "Publish Item to hub.erpnext.com",
-   "fieldname": "publish_in_hub",
-   "fieldtype": "Check",
-   "label": "Publish in Hub"
-  },
-  {
-   "fieldname": "hub_category_to_publish",
-   "fieldtype": "Data",
-   "label": "Hub Category to Publish",
-   "read_only": 1
-  },
-  {
-   "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.",
-   "fieldname": "hub_warehouse",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Hub Warehouse",
-   "options": "Warehouse"
-  },
-  {
-   "default": "0",
-   "fieldname": "synced_with_hub",
-   "fieldtype": "Check",
-   "label": "Synced With Hub",
-   "read_only": 1
-  },
-  {
-   "fieldname": "manufacturers",
-   "fieldtype": "Table",
-   "label": "Manufacturers",
-   "options": "Item Manufacturer"
-  }
- ],
- "has_web_view": 1,
- "icon": "fa fa-tag",
- "idx": 2,
- "image_field": "image",
- "max_attachments": 1,
- "modified": "2019-06-02 04:45:59.911507",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "import": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Item Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock Manager"
-  },
-  {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock User"
-  },
-  {
-   "read": 1,
-   "role": "Sales User"
-  },
-  {
-   "read": 1,
-   "role": "Purchase User"
-  },
-  {
-   "read": 1,
-   "role": "Maintenance User"
-  },
-  {
-   "read": 1,
-   "role": "Accounts User"
-  },
-  {
-   "read": 1,
-   "role": "Manufacturing User"
-  }
- ],
- "quick_entry": 1,
- "search_fields": "item_name,description,item_group,customer_code",
- "show_name_in_global_search": 1,
- "show_preview_popup": 1,
- "sort_field": "idx desc,modified desc",
- "sort_order": "DESC",
- "title_field": "item_name",
- "track_changes": 1
-}
\ No newline at end of file
+  "allow_guest_to_view": 1,
+  "allow_import": 1,
+  "allow_rename": 1,
+  "autoname": "field:item_code",
+  "creation": "2013-05-03 10:45:46",
+  "description": "A Product or a Service that is bought, sold or kept in stock.",
+  "doctype": "DocType",
+  "document_type": "Setup",
+  "editable_grid": 1,
+  "engine": "InnoDB",
+  "field_order": [
+   "name_and_description_section",
+   "naming_series",
+   "item_code",
+   "variant_of",
+   "item_name",
+   "item_group",
+   "is_item_from_hub",
+   "stock_uom",
+   "column_break0",
+   "disabled",
+   "allow_alternative_item",
+   "is_stock_item",
+   "include_item_in_manufacturing",
+   "opening_stock",
+   "valuation_rate",
+   "standard_rate",
+   "is_fixed_asset",
+   "asset_category",
+   "asset_naming_series",
+   "tolerance",
+   "image",
+   "section_break_11",
+   "brand",
+   "description",
+   "sb_barcodes",
+   "barcodes",
+   "inventory_section",
+   "shelf_life_in_days",
+   "end_of_life",
+   "default_material_request_type",
+   "valuation_method",
+   "column_break1",
+   "warranty_period",
+   "weight_per_unit",
+   "weight_uom",
+   "reorder_section",
+   "reorder_levels",
+   "unit_of_measure_conversion",
+   "uoms",
+   "serial_nos_and_batches",
+   "has_batch_no",
+   "create_new_batch",
+   "batch_number_series",
+   "has_expiry_date",
+   "retain_sample",
+   "sample_quantity",
+   "column_break_37",
+   "has_serial_no",
+   "serial_no_series",
+   "variants_section",
+   "has_variants",
+   "variant_based_on",
+   "attributes",
+   "defaults",
+   "item_defaults",
+   "purchase_details",
+   "is_purchase_item",
+   "purchase_uom",
+   "min_order_qty",
+   "safety_stock",
+   "purchase_details_cb",
+   "lead_time_days",
+   "last_purchase_rate",
+   "is_customer_provided_item",
+   "customer",
+   "supplier_details",
+   "delivered_by_supplier",
+   "column_break2",
+   "supplier_items",
+   "foreign_trade_details",
+   "country_of_origin",
+   "column_break_59",
+   "customs_tariff_number",
+   "sales_details",
+   "sales_uom",
+   "is_sales_item",
+   "column_break3",
+   "max_discount",
+   "deferred_revenue",
+   "deferred_revenue_account",
+   "enable_deferred_revenue",
+   "column_break_85",
+   "no_of_months",
+   "deferred_expense_section",
+   "deferred_expense_account",
+   "enable_deferred_expense",
+   "column_break_88",
+   "no_of_months_exp",
+   "customer_details",
+   "customer_items",
+   "item_tax_section_break",
+   "taxes",
+   "inspection_criteria",
+   "inspection_required_before_purchase",
+   "inspection_required_before_delivery",
+   "quality_inspection_template",
+   "manufacturing",
+   "default_bom",
+   "is_sub_contracted_item",
+   "column_break_74",
+   "customer_code",
+   "website_section",
+   "show_in_website",
+   "show_variant_in_website",
+   "route",
+   "weightage",
+   "slideshow",
+   "website_image",
+   "thumbnail",
+   "cb72",
+   "website_warehouse",
+   "website_item_groups",
+   "set_meta_tags",
+   "sb72",
+   "copy_from_item_group",
+   "website_specifications",
+   "web_long_description",
+   "website_content",
+   "total_projected_qty",
+   "hub_publishing_sb",
+   "publish_in_hub",
+   "hub_category_to_publish",
+   "hub_warehouse",
+   "synced_with_hub"
+  ],
+  "fields": [
+   {
+    "fieldname": "name_and_description_section",
+    "fieldtype": "Section Break",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-flag"
+   },
+   {
+    "fieldname": "naming_series",
+    "fieldtype": "Select",
+    "label": "Series",
+    "options": "STO-ITEM-.YYYY.-",
+    "set_only_once": 1
+   },
+   {
+    "bold": 1,
+    "fieldname": "item_code",
+    "fieldtype": "Data",
+    "in_global_search": 1,
+    "label": "Item Code",
+    "oldfieldname": "item_code",
+    "oldfieldtype": "Data",
+    "unique": 1,
+    "reqd": 1
+   },
+   {
+    "depends_on": "variant_of",
+    "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
+    "fieldname": "variant_of",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "in_standard_filter": 1,
+    "label": "Variant Of",
+    "options": "Item",
+    "read_only": 1,
+    "search_index": 1,
+    "set_only_once": 1
+   },
+   {
+    "bold": 1,
+    "fieldname": "item_name",
+    "fieldtype": "Data",
+    "in_global_search": 1,
+    "label": "Item Name",
+    "oldfieldname": "item_name",
+    "oldfieldtype": "Data",
+    "search_index": 1
+   },
+   {
+    "fieldname": "item_group",
+    "fieldtype": "Link",
+    "in_list_view": 1,
+    "in_preview": 1,
+    "in_standard_filter": 1,
+    "label": "Item Group",
+    "oldfieldname": "item_group",
+    "oldfieldtype": "Link",
+    "options": "Item Group",
+    "reqd": 1,
+    "search_index": 1
+   },
+   {
+    "default": "0",
+    "fieldname": "is_item_from_hub",
+    "fieldtype": "Check",
+    "label": "Is Item from Hub",
+    "read_only": 1
+   },
+   {
+    "fieldname": "stock_uom",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default Unit of Measure",
+    "oldfieldname": "stock_uom",
+    "oldfieldtype": "Link",
+    "options": "UOM",
+    "reqd": 1
+   },
+   {
+    "fieldname": "column_break0",
+    "fieldtype": "Column Break"
+   },
+   {
+    "default": "0",
+    "fieldname": "disabled",
+    "fieldtype": "Check",
+    "label": "Disabled"
+   },
+   {
+    "default": "0",
+    "fieldname": "allow_alternative_item",
+    "fieldtype": "Check",
+    "label": "Allow Alternative Item"
+   },
+   {
+    "bold": 1,
+    "default": "1",
+    "fieldname": "is_stock_item",
+    "fieldtype": "Check",
+    "label": "Maintain Stock",
+    "oldfieldname": "is_stock_item",
+    "oldfieldtype": "Select"
+   },
+   {
+    "default": "1",
+    "fieldname": "include_item_in_manufacturing",
+    "fieldtype": "Check",
+    "label": "Include Item In Manufacturing"
+   },
+   {
+    "bold": 1,
+    "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
+    "fieldname": "opening_stock",
+    "fieldtype": "Float",
+    "label": "Opening Stock"
+   },
+   {
+    "depends_on": "is_stock_item",
+    "fieldname": "valuation_rate",
+    "fieldtype": "Currency",
+    "label": "Valuation Rate"
+   },
+   {
+    "bold": 1,
+    "depends_on": "eval:doc.__islocal",
+    "fieldname": "standard_rate",
+    "fieldtype": "Currency",
+    "label": "Standard Selling Rate"
+   },
+   {
+    "default": "0",
+    "fieldname": "is_fixed_asset",
+    "fieldtype": "Check",
+    "label": "Is Fixed Asset",
+    "set_only_once": 1
+   },
+   {
+    "depends_on": "is_fixed_asset",
+    "fieldname": "asset_category",
+    "fieldtype": "Link",
+    "label": "Asset Category",
+    "options": "Asset Category"
+   },
+   {
+    "depends_on": "is_fixed_asset",
+    "fieldname": "asset_naming_series",
+    "fieldtype": "Select",
+    "label": "Asset Naming Series"
+   },
+   {
+    "depends_on": "eval:!doc.__islocal",
+    "fieldname": "tolerance",
+    "fieldtype": "Float",
+    "label": "Allow over delivery or receipt upto this percent",
+    "oldfieldname": "tolerance",
+    "oldfieldtype": "Currency"
+   },
+   {
+    "fieldname": "image",
+    "fieldtype": "Attach Image",
+    "hidden": 1,
+    "in_preview": 1,
+    "label": "Image",
+    "options": "image",
+    "print_hide": 1
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "section_break_11",
+    "fieldtype": "Section Break",
+    "label": "Description"
+   },
+   {
+    "fieldname": "brand",
+    "fieldtype": "Link",
+    "label": "Brand",
+    "oldfieldname": "brand",
+    "oldfieldtype": "Link",
+    "options": "Brand",
+    "print_hide": 1
+   },
+   {
+    "fieldname": "description",
+    "fieldtype": "Text Editor",
+    "in_preview": 1,
+    "label": "Description",
+    "oldfieldname": "description",
+    "oldfieldtype": "Text"
+   },
+   {
+    "fieldname": "sb_barcodes",
+    "fieldtype": "Section Break",
+    "label": "Barcodes"
+   },
+   {
+    "fieldname": "barcodes",
+    "fieldtype": "Table",
+    "label": "Barcodes",
+    "options": "Item Barcode"
+   },
+   {
+    "collapsible": 1,
+    "collapsible_depends_on": "is_stock_item",
+    "depends_on": "is_stock_item",
+    "fieldname": "inventory_section",
+    "fieldtype": "Section Break",
+    "label": "Inventory",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-truck"
+   },
+   {
+    "fieldname": "shelf_life_in_days",
+    "fieldtype": "Int",
+    "label": "Shelf Life In Days"
+   },
+   {
+    "default": "2099-12-31",
+    "depends_on": "is_stock_item",
+    "fieldname": "end_of_life",
+    "fieldtype": "Date",
+    "label": "End of Life",
+    "oldfieldname": "end_of_life",
+    "oldfieldtype": "Date"
+   },
+   {
+    "default": "Purchase",
+    "fieldname": "default_material_request_type",
+    "fieldtype": "Select",
+    "label": "Default Material Request Type",
+    "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture\nCustomer Provided"
+   },
+   {
+    "depends_on": "is_stock_item",
+    "fieldname": "valuation_method",
+    "fieldtype": "Select",
+    "label": "Valuation Method",
+    "options": "\nFIFO\nMoving Average",
+    "set_only_once": 1
+   },
+   {
+    "depends_on": "is_stock_item",
+    "fieldname": "column_break1",
+    "fieldtype": "Column Break",
+    "oldfieldtype": "Column Break",
+    "width": "50%"
+   },
+   {
+    "depends_on": "eval:doc.is_stock_item",
+    "fieldname": "warranty_period",
+    "fieldtype": "Data",
+    "label": "Warranty Period (in days)",
+    "oldfieldname": "warranty_period",
+    "oldfieldtype": "Data"
+   },
+   {
+    "depends_on": "is_stock_item",
+    "fieldname": "weight_per_unit",
+    "fieldtype": "Float",
+    "label": "Weight Per Unit"
+   },
+   {
+    "depends_on": "eval:doc.is_stock_item",
+    "fieldname": "weight_uom",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Weight UOM",
+    "options": "UOM"
+   },
+   {
+    "collapsible": 1,
+    "depends_on": "is_stock_item",
+    "fieldname": "reorder_section",
+    "fieldtype": "Section Break",
+    "label": "Auto re-order",
+    "options": "fa fa-rss"
+   },
+   {
+    "description": "Will also apply for variants unless overrridden",
+    "fieldname": "reorder_levels",
+    "fieldtype": "Table",
+    "label": "Reorder level based on Warehouse",
+    "options": "Item Reorder"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "unit_of_measure_conversion",
+    "fieldtype": "Section Break",
+    "label": "Units of Measure"
+   },
+   {
+    "description": "Will also apply for variants",
+    "fieldname": "uoms",
+    "fieldtype": "Table",
+    "label": "UOMs",
+    "oldfieldname": "uom_conversion_details",
+    "oldfieldtype": "Table",
+    "options": "UOM Conversion Detail"
+   },
+   {
+    "collapsible": 1,
+    "collapsible_depends_on": "eval:doc.has_batch_no || doc.has_serial_no || doc.is_fixed_asset",
+    "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset",
+    "fieldname": "serial_nos_and_batches",
+    "fieldtype": "Section Break",
+    "label": "Serial Nos and Batches"
+   },
+   {
+    "default": "0",
+    "depends_on": "eval:doc.is_stock_item",
+    "fieldname": "has_batch_no",
+    "fieldtype": "Check",
+    "label": "Has Batch No",
+    "no_copy": 1,
+    "oldfieldname": "has_batch_no",
+    "oldfieldtype": "Select"
+   },
+   {
+    "default": "0",
+    "depends_on": "has_batch_no",
+    "fieldname": "create_new_batch",
+    "fieldtype": "Check",
+    "label": "Automatically Create New Batch"
+   },
+   {
+    "depends_on": "eval:doc.has_batch_no==1 && doc.create_new_batch==1",
+    "description": "Example: ABCD.#####. If series is set and Batch No is not mentioned in transactions, then automatic batch number will be created based on this series. If you always want to explicitly mention Batch No for this item, leave this blank. Note: this setting will take priority over the Naming Series Prefix in Stock Settings.",
+    "fieldname": "batch_number_series",
+    "fieldtype": "Data",
+    "label": "Batch Number Series",
+    "translatable": 1
+   },
+   {
+    "default": "0",
+    "depends_on": "has_batch_no",
+    "fieldname": "has_expiry_date",
+    "fieldtype": "Check",
+    "label": "Has Expiry Date"
+   },
+   {
+    "default": "0",
+    "depends_on": "has_batch_no",
+    "fieldname": "retain_sample",
+    "fieldtype": "Check",
+    "label": "Retain Sample"
+   },
+   {
+    "depends_on": "eval: (doc.retain_sample && doc.has_batch_no)",
+    "description": "Maximum sample quantity that can be retained",
+    "fieldname": "sample_quantity",
+    "fieldtype": "Int",
+    "label": "Max Sample Quantity"
+   },
+   {
+    "fieldname": "column_break_37",
+    "fieldtype": "Column Break"
+   },
+   {
+    "default": "0",
+    "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset",
+    "fieldname": "has_serial_no",
+    "fieldtype": "Check",
+    "label": "Has Serial No",
+    "no_copy": 1,
+    "oldfieldname": "has_serial_no",
+    "oldfieldtype": "Select"
+   },
+   {
+    "depends_on": "eval:doc.is_stock_item || doc.is_fixed_asset",
+    "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
+    "fieldname": "serial_no_series",
+    "fieldtype": "Data",
+    "label": "Serial Number Series"
+   },
+   {
+    "collapsible": 1,
+    "collapsible_depends_on": "attributes",
+    "fieldname": "variants_section",
+    "fieldtype": "Section Break",
+    "label": "Variants"
+   },
+   {
+    "default": "0",
+    "depends_on": "eval:!doc.variant_of",
+    "description": "If this item has variants, then it cannot be selected in sales orders etc.",
+    "fieldname": "has_variants",
+    "fieldtype": "Check",
+    "in_standard_filter": 1,
+    "label": "Has Variants",
+    "no_copy": 1
+   },
+   {
+    "default": "Item Attribute",
+    "depends_on": "has_variants",
+    "fieldname": "variant_based_on",
+    "fieldtype": "Select",
+    "label": "Variant Based On",
+    "options": "Item Attribute\nManufacturer"
+   },
+   {
+    "depends_on": "eval:(doc.has_variants || doc.variant_of) && doc.variant_based_on==='Item Attribute'",
+    "fieldname": "attributes",
+    "fieldtype": "Table",
+    "hidden": 1,
+    "label": "Attributes",
+    "no_copy": 1,
+    "options": "Item Variant Attribute"
+   },
+   {
+    "fieldname": "defaults",
+    "fieldtype": "Section Break",
+    "label": "Sales, Purchase, Accounting Defaults"
+   },
+   {
+    "fieldname": "item_defaults",
+    "fieldtype": "Table",
+    "label": "Item Defaults",
+    "options": "Item Default"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "purchase_details",
+    "fieldtype": "Section Break",
+    "label": "Purchase, Replenishment Details",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-shopping-cart"
+   },
+   {
+    "default": "1",
+    "fieldname": "is_purchase_item",
+    "fieldtype": "Check",
+    "label": "Is Purchase Item"
+   },
+   {
+    "fieldname": "purchase_uom",
+    "fieldtype": "Link",
+    "label": "Default Purchase Unit of Measure",
+    "options": "UOM"
+   },
+   {
+    "default": "0.00",
+    "depends_on": "is_stock_item",
+    "fieldname": "min_order_qty",
+    "fieldtype": "Float",
+    "label": "Minimum Order Qty",
+    "oldfieldname": "min_order_qty",
+    "oldfieldtype": "Currency"
+   },
+   {
+    "fieldname": "safety_stock",
+    "fieldtype": "Float",
+    "label": "Safety Stock"
+   },
+   {
+    "fieldname": "purchase_details_cb",
+    "fieldtype": "Column Break"
+   },
+   {
+    "description": "Average time taken by the supplier to deliver",
+    "fieldname": "lead_time_days",
+    "fieldtype": "Int",
+    "label": "Lead Time in days",
+    "oldfieldname": "lead_time_days",
+    "oldfieldtype": "Int"
+   },
+   {
+    "fieldname": "last_purchase_rate",
+    "fieldtype": "Float",
+    "label": "Last Purchase Rate",
+    "no_copy": 1,
+    "oldfieldname": "last_purchase_rate",
+    "oldfieldtype": "Currency",
+    "read_only": 1
+   },
+   {
+    "default": "0",
+    "fieldname": "is_customer_provided_item",
+    "fieldtype": "Check",
+    "label": "Is Customer Provided Item"
+   },
+   {
+    "depends_on": "eval:doc.is_customer_provided_item==1",
+    "fieldname": "customer",
+    "fieldtype": "Link",
+    "label": "Customer",
+    "options": "Customer"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "supplier_details",
+    "fieldtype": "Section Break",
+    "label": "Supplier Details"
+   },
+   {
+    "default": "0",
+    "fieldname": "delivered_by_supplier",
+    "fieldtype": "Check",
+    "label": "Delivered by Supplier (Drop Ship)",
+    "print_hide": 1
+   },
+   {
+    "fieldname": "column_break2",
+    "fieldtype": "Column Break",
+    "oldfieldtype": "Column Break",
+    "width": "50%"
+   },
+   {
+    "fieldname": "supplier_items",
+    "fieldtype": "Table",
+    "label": "Supplier Items",
+    "options": "Item Supplier"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "foreign_trade_details",
+    "fieldtype": "Section Break",
+    "label": "Foreign Trade Details"
+   },
+   {
+    "fieldname": "country_of_origin",
+    "fieldtype": "Link",
+    "label": "Country of Origin",
+    "options": "Country"
+   },
+   {
+    "fieldname": "column_break_59",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "customs_tariff_number",
+    "fieldtype": "Link",
+    "label": "Customs Tariff Number",
+    "options": "Customs Tariff Number"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "sales_details",
+    "fieldtype": "Section Break",
+    "label": "Sales Details",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-tag"
+   },
+   {
+    "fieldname": "sales_uom",
+    "fieldtype": "Link",
+    "label": "Default Sales Unit of Measure",
+    "options": "UOM"
+   },
+   {
+    "default": "1",
+    "fieldname": "is_sales_item",
+    "fieldtype": "Check",
+    "label": "Is Sales Item"
+   },
+   {
+    "fieldname": "column_break3",
+    "fieldtype": "Column Break",
+    "oldfieldtype": "Column Break",
+    "width": "50%"
+   },
+   {
+    "fieldname": "max_discount",
+    "fieldtype": "Float",
+    "label": "Max Discount (%)",
+    "oldfieldname": "max_discount",
+    "oldfieldtype": "Currency"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "deferred_revenue",
+    "fieldtype": "Section Break",
+    "label": "Deferred Revenue"
+   },
+   {
+    "depends_on": "enable_deferred_revenue",
+    "fieldname": "deferred_revenue_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Deferred Revenue Account",
+    "options": "Account"
+   },
+   {
+    "default": "0",
+    "fieldname": "enable_deferred_revenue",
+    "fieldtype": "Check",
+    "label": "Enable Deferred Revenue"
+   },
+   {
+    "fieldname": "column_break_85",
+    "fieldtype": "Column Break"
+   },
+   {
+    "depends_on": "enable_deferred_revenue",
+    "fieldname": "no_of_months",
+    "fieldtype": "Int",
+    "label": "No of Months"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "deferred_expense_section",
+    "fieldtype": "Section Break",
+    "label": "Deferred Expense"
+   },
+   {
+    "depends_on": "enable_deferred_expense",
+    "fieldname": "deferred_expense_account",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Deferred Expense Account",
+    "options": "Account"
+   },
+   {
+    "default": "0",
+    "fieldname": "enable_deferred_expense",
+    "fieldtype": "Check",
+    "label": "Enable Deferred Expense"
+   },
+   {
+    "fieldname": "column_break_88",
+    "fieldtype": "Column Break"
+   },
+   {
+    "depends_on": "enable_deferred_expense",
+    "fieldname": "no_of_months_exp",
+    "fieldtype": "Int",
+    "label": "No of Months"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "customer_details",
+    "fieldtype": "Section Break",
+    "label": "Customer Details"
+   },
+   {
+    "fieldname": "customer_items",
+    "fieldtype": "Table",
+    "label": "Customer Items",
+    "options": "Item Customer Detail"
+   },
+   {
+    "collapsible": 1,
+    "collapsible_depends_on": "taxes",
+    "fieldname": "item_tax_section_break",
+    "fieldtype": "Section Break",
+    "label": "Item Tax",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-money"
+   },
+   {
+    "description": "Will also apply for variants",
+    "fieldname": "taxes",
+    "fieldtype": "Table",
+    "label": "Taxes",
+    "oldfieldname": "item_tax",
+    "oldfieldtype": "Table",
+    "options": "Item Tax"
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "inspection_criteria",
+    "fieldtype": "Section Break",
+    "label": "Inspection Criteria",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-search"
+   },
+   {
+    "default": "0",
+    "fieldname": "inspection_required_before_purchase",
+    "fieldtype": "Check",
+    "label": "Inspection Required before Purchase",
+    "oldfieldname": "inspection_required",
+    "oldfieldtype": "Select"
+   },
+   {
+    "default": "0",
+    "fieldname": "inspection_required_before_delivery",
+    "fieldtype": "Check",
+    "label": "Inspection Required before Delivery"
+   },
+   {
+    "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
+    "fieldname": "quality_inspection_template",
+    "fieldtype": "Link",
+    "label": "Quality Inspection Template",
+    "options": "Quality Inspection Template",
+    "print_hide": 1
+   },
+   {
+    "collapsible": 1,
+    "depends_on": "is_stock_item",
+    "fieldname": "manufacturing",
+    "fieldtype": "Section Break",
+    "label": "Manufacturing",
+    "oldfieldtype": "Section Break",
+    "options": "fa fa-cogs"
+   },
+   {
+    "fieldname": "default_bom",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Default BOM",
+    "no_copy": 1,
+    "oldfieldname": "default_bom",
+    "oldfieldtype": "Link",
+    "options": "BOM",
+    "read_only": 1
+   },
+   {
+    "default": "0",
+    "description": "If subcontracted to a vendor",
+    "fieldname": "is_sub_contracted_item",
+    "fieldtype": "Check",
+    "label": "Supply Raw Materials for Purchase",
+    "oldfieldname": "is_sub_contracted_item",
+    "oldfieldtype": "Select"
+   },
+   {
+    "fieldname": "column_break_74",
+    "fieldtype": "Column Break"
+   },
+   {
+    "fieldname": "customer_code",
+    "fieldtype": "Data",
+    "hidden": 1,
+    "label": "Customer Code",
+    "no_copy": 1,
+    "print_hide": 1
+   },
+   {
+    "collapsible": 1,
+    "fieldname": "website_section",
+    "fieldtype": "Section Break",
+    "label": "Website",
+    "options": "fa fa-globe"
+   },
+   {
+    "default": "0",
+    "depends_on": "eval:!doc.variant_of",
+    "fieldname": "show_in_website",
+    "fieldtype": "Check",
+    "label": "Show in Website",
+    "search_index": 1
+   },
+   {
+    "default": "0",
+    "depends_on": "variant_of",
+    "fieldname": "show_variant_in_website",
+    "fieldtype": "Check",
+    "label": "Show in Website (Variant)",
+    "search_index": 1
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "fieldname": "route",
+    "fieldtype": "Small Text",
+    "label": "Route",
+    "no_copy": 1
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "description": "Items with higher weightage will be shown higher",
+    "fieldname": "weightage",
+    "fieldtype": "Int",
+    "label": "Weightage"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "description": "Show a slideshow at the top of the page",
+    "fieldname": "slideshow",
+    "fieldtype": "Link",
+    "label": "Slideshow",
+    "options": "Website Slideshow"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "description": "Item Image (if not slideshow)",
+    "fieldname": "website_image",
+    "fieldtype": "Attach",
+    "label": "Image"
+   },
+   {
+    "fieldname": "thumbnail",
+    "fieldtype": "Data",
+    "label": "Thumbnail",
+    "read_only": 1
+   },
+   {
+    "fieldname": "cb72",
+    "fieldtype": "Column Break"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
+    "fieldname": "website_warehouse",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Website Warehouse",
+    "options": "Warehouse"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "description": "List this Item in multiple groups on the website.",
+    "fieldname": "website_item_groups",
+    "fieldtype": "Table",
+    "label": "Website Item Groups",
+    "options": "Website Item Group"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "fieldname": "set_meta_tags",
+    "fieldtype": "Button",
+    "label": "Set Meta Tags"
+   },
+   {
+    "collapsible": 1,
+    "collapsible_depends_on": "website_specifications",
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "fieldname": "sb72",
+    "fieldtype": "Section Break",
+    "label": "Website Specifications"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "fieldname": "copy_from_item_group",
+    "fieldtype": "Button",
+    "label": "Copy From Item Group"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "fieldname": "website_specifications",
+    "fieldtype": "Table",
+    "label": "Website Specifications",
+    "options": "Item Website Specification"
+   },
+   {
+    "depends_on": "eval: doc.show_in_website || doc.show_variant_in_website",
+    "fieldname": "web_long_description",
+    "fieldtype": "Text Editor",
+    "label": "Website Description"
+   },
+   {
+    "description": "You can use any valid Bootstrap 4 markup in this field. It will be shown on your Item Page.",
+    "fieldname": "website_content",
+    "fieldtype": "HTML Editor",
+    "label": "Website Content"
+   },
+   {
+    "fieldname": "total_projected_qty",
+    "fieldtype": "Float",
+    "hidden": 1,
+    "label": "Total Projected Qty",
+    "print_hide": 1,
+    "read_only": 1
+   },
+   {
+    "depends_on": "eval:(!doc.is_item_from_hub)",
+    "fieldname": "hub_publishing_sb",
+    "fieldtype": "Section Break",
+    "label": "Hub Publishing Details"
+   },
+   {
+    "default": "0",
+    "description": "Publish Item to hub.erpnext.com",
+    "fieldname": "publish_in_hub",
+    "fieldtype": "Check",
+    "label": "Publish in Hub"
+   },
+   {
+    "fieldname": "hub_category_to_publish",
+    "fieldtype": "Data",
+    "label": "Hub Category to Publish",
+    "read_only": 1
+   },
+   {
+    "description": "Publish \"In Stock\" or \"Not in Stock\" on Hub based on stock available in this warehouse.",
+    "fieldname": "hub_warehouse",
+    "fieldtype": "Link",
+    "ignore_user_permissions": 1,
+    "label": "Hub Warehouse",
+    "options": "Warehouse"
+   },
+   {
+    "default": "0",
+    "fieldname": "synced_with_hub",
+    "fieldtype": "Check",
+    "label": "Synced With Hub",
+    "read_only": 1
+   }
+  ],
+  "has_web_view": 1,
+  "icon": "fa fa-tag",
+  "idx": 2,
+  "image_field": "image",
+  "max_attachments": 1,
+  "modified": "2019-07-05 12:18:13.977931",
+  "modified_by": "Administrator",
+  "module": "Stock",
+  "name": "Item",
+  "owner": "Administrator",
+  "permissions": [
+   {
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "export": 1,
+    "import": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Item Manager",
+    "share": 1,
+    "write": 1
+   },
+   {
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Stock Manager"
+   },
+   {
+    "email": 1,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Stock User"
+   },
+   {
+    "read": 1,
+    "role": "Sales User"
+   },
+   {
+    "read": 1,
+    "role": "Purchase User"
+   },
+   {
+    "read": 1,
+    "role": "Maintenance User"
+   },
+   {
+    "read": 1,
+    "role": "Accounts User"
+   },
+   {
+    "read": 1,
+    "role": "Manufacturing User"
+   }
+  ],
+  "quick_entry": 1,
+  "search_fields": "item_name,description,item_group,customer_code",
+  "show_name_in_global_search": 1,
+  "show_preview_popup": 1,
+  "sort_field": "idx desc,modified desc",
+  "sort_order": "DESC",
+  "title_field": "item_name",
+  "track_changes": 1
+ }
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 2ed25d0..0ed039a 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -1,264 +1,264 @@
 {
- "allow_import": 1,
- "autoname": "MAT-PAC-.YYYY.-.#####",
- "creation": "2013-04-11 15:32:24",
- "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
- "doctype": "DocType",
- "document_type": "Document",
- "engine": "InnoDB",
- "field_order": [
-  "packing_slip_details",
-  "column_break0",
-  "delivery_note",
-  "column_break1",
-  "naming_series",
-  "section_break0",
-  "column_break2",
-  "from_case_no",
-  "column_break3",
-  "to_case_no",
-  "package_item_details",
-  "get_items",
-  "items",
-  "package_weight_details",
-  "net_weight_pkg",
-  "net_weight_uom",
-  "column_break4",
-  "gross_weight_pkg",
-  "gross_weight_uom",
-  "letter_head_details",
-  "letter_head",
-  "misc_details",
-  "amended_from"
- ],
- "fields": [
-  {
-   "fieldname": "packing_slip_details",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break0",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "Indicates that the package is a part of this delivery (Only Draft)",
-   "fieldname": "delivery_note",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "label": "Delivery Note",
-   "options": "Delivery Note",
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "options": "MAT-PAC-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "fieldname": "section_break0",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break2",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "Identification of the package for the delivery (for print)",
-   "fieldname": "from_case_no",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "From Package No.",
-   "no_copy": 1,
-   "reqd": 1,
-   "width": "50px"
-  },
-  {
-   "fieldname": "column_break3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "If more than one package of the same type (for print)",
-   "fieldname": "to_case_no",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "To Package No.",
-   "no_copy": 1,
-   "width": "50px"
-  },
-  {
-   "fieldname": "package_item_details",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "get_items",
-   "fieldtype": "Button",
-   "label": "Get Items"
-  },
-  {
-   "fieldname": "items",
-   "fieldtype": "Table",
-   "label": "Items",
-   "options": "Packing Slip Item",
-   "reqd": 1
-  },
-  {
-   "fieldname": "package_weight_details",
-   "fieldtype": "Section Break",
-   "label": "Package Weight Details"
-  },
-  {
-   "description": "The net weight of this package. (calculated automatically as sum of net weight of items)",
-   "fieldname": "net_weight_pkg",
-   "fieldtype": "Float",
-   "label": "Net Weight",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "net_weight_uom",
-   "fieldtype": "Link",
-   "label": "Net Weight UOM",
-   "no_copy": 1,
-   "options": "UOM",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)",
-   "fieldname": "gross_weight_pkg",
-   "fieldtype": "Float",
-   "label": "Gross Weight",
-   "no_copy": 1
-  },
-  {
-   "fieldname": "gross_weight_uom",
-   "fieldtype": "Link",
-   "label": "Gross Weight UOM",
-   "no_copy": 1,
-   "options": "UOM"
-  },
-  {
-   "fieldname": "letter_head_details",
-   "fieldtype": "Section Break",
-   "label": "Letter Head"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "label": "Letter Head",
-   "options": "Letter Head",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "misc_details",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Packing Slip",
-   "print_hide": 1,
-   "read_only": 1
-  }
- ],
- "icon": "fa fa-suitcase",
- "idx": 1,
- "is_submittable": 1,
- "modified": "2019-05-31 04:45:08.082862",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Packing Slip",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales User",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Item Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Stock Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  }
- ],
- "search_fields": "delivery_note",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
-}
\ No newline at end of file
+   "allow_import": 1,
+   "autoname": "MAT-PAC-.YYYY.-.#####",
+   "creation": "2013-04-11 15:32:24",
+   "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",
+   "doctype": "DocType",
+   "document_type": "Document",
+   "engine": "InnoDB",
+   "field_order": [
+    "packing_slip_details",
+    "column_break0",
+    "delivery_note",
+    "column_break1",
+    "naming_series",
+    "section_break0",
+    "column_break2",
+    "from_case_no",
+    "column_break3",
+    "to_case_no",
+    "package_item_details",
+    "get_items",
+    "items",
+    "package_weight_details",
+    "net_weight_pkg",
+    "net_weight_uom",
+    "column_break4",
+    "gross_weight_pkg",
+    "gross_weight_uom",
+    "letter_head_details",
+    "letter_head",
+    "misc_details",
+    "amended_from"
+   ],
+   "fields": [
+    {
+     "fieldname": "packing_slip_details",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "column_break0",
+     "fieldtype": "Column Break"
+    },
+    {
+     "description": "Indicates that the package is a part of this delivery (Only Draft)",
+     "fieldname": "delivery_note",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "in_list_view": 1,
+     "label": "Delivery Note",
+     "options": "Delivery Note",
+     "reqd": 1
+    },
+    {
+     "fieldname": "column_break1",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "naming_series",
+     "fieldtype": "Select",
+     "label": "Series",
+     "options": "MAT-PAC-.YYYY.-",
+     "print_hide": 1,
+     "reqd": 1,
+     "set_only_once": 1
+    },
+    {
+     "fieldname": "section_break0",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "column_break2",
+     "fieldtype": "Column Break"
+    },
+    {
+     "description": "Identification of the package for the delivery (for print)",
+     "fieldname": "from_case_no",
+     "fieldtype": "Data",
+     "in_list_view": 1,
+     "label": "From Package No.",
+     "no_copy": 1,
+     "reqd": 1,
+     "width": "50px"
+    },
+    {
+     "fieldname": "column_break3",
+     "fieldtype": "Column Break"
+    },
+    {
+     "description": "If more than one package of the same type (for print)",
+     "fieldname": "to_case_no",
+     "fieldtype": "Data",
+     "in_list_view": 1,
+     "label": "To Package No.",
+     "no_copy": 1,
+     "width": "50px"
+    },
+    {
+     "fieldname": "package_item_details",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "get_items",
+     "fieldtype": "Button",
+     "label": "Get Items"
+    },
+    {
+     "fieldname": "items",
+     "fieldtype": "Table",
+     "label": "Items",
+     "options": "Packing Slip Item",
+     "reqd": 1
+    },
+    {
+     "fieldname": "package_weight_details",
+     "fieldtype": "Section Break",
+     "label": "Package Weight Details"
+    },
+    {
+     "description": "The net weight of this package. (calculated automatically as sum of net weight of items)",
+     "fieldname": "net_weight_pkg",
+     "fieldtype": "Float",
+     "label": "Net Weight",
+     "no_copy": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "net_weight_uom",
+     "fieldtype": "Link",
+     "label": "Net Weight UOM",
+     "no_copy": 1,
+     "options": "UOM",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break4",
+     "fieldtype": "Column Break"
+    },
+    {
+     "description": "The gross weight of the package. Usually net weight + packaging material weight. (for print)",
+     "fieldname": "gross_weight_pkg",
+     "fieldtype": "Float",
+     "label": "Gross Weight",
+     "no_copy": 1
+    },
+    {
+     "fieldname": "gross_weight_uom",
+     "fieldtype": "Link",
+     "label": "Gross Weight UOM",
+     "no_copy": 1,
+     "options": "UOM"
+    },
+    {
+     "fieldname": "letter_head_details",
+     "fieldtype": "Section Break",
+     "label": "Letter Head"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "letter_head",
+     "fieldtype": "Link",
+     "label": "Letter Head",
+     "options": "Letter Head",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "misc_details",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "amended_from",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Amended From",
+     "no_copy": 1,
+     "options": "Packing Slip",
+     "print_hide": 1,
+     "read_only": 1
+    }
+   ],
+   "icon": "fa fa-suitcase",
+   "idx": 1,
+   "is_submittable": 1,
+   "modified": "2019-05-31 04:45:08.082862",
+   "modified_by": "Administrator",
+   "module": "Stock",
+   "name": "Packing Slip",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Stock User",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Sales User",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Item Manager",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Stock Manager",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Sales Manager",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    }
+   ],
+   "search_fields": "delivery_note",
+   "show_name_in_global_search": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC"
+  }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index cdca44d..67cd7f8 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -51,15 +51,6 @@
 			'target_ref_field': 'qty',
 			'source_field': 'qty',
 			'percent_join_field': 'material_request'
-		},
-		{
-			'source_dt': 'Purchase Receipt Item',
-			'target_dt': 'Purchase Order Item',
-			'join_field': 'purchase_order_item',
-			'target_field': 'returned_qty',
-			'target_parent_dt': 'Purchase Order',
-			'source_field': '-1 * qty',
-			'extra_cond': """ and exists (select name from `tabPurchase Receipt` where name=`tabPurchase Receipt Item`.parent and is_return=1)"""
 		}]
 		if cint(self.is_return):
 			self.status_updater.append({
@@ -445,6 +436,7 @@
 
 		doc = frappe.get_doc(target)
 		doc.ignore_pricing_rule = 1
+		doc.run_method("onload")
 		doc.run_method("set_missing_values")
 		doc.run_method("calculate_taxes_and_totals")
 
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 bb5cd52..70b62b0 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -1,830 +1,830 @@
 {
- "autoname": "hash",
- "creation": "2013-05-24 19:29:10",
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "barcode",
-  "section_break_2",
-  "item_code",
-  "supplier_part_no",
-  "column_break_2",
-  "item_name",
-  "section_break_4",
-  "description",
-  "item_group",
-  "brand",
-  "image_section",
-  "image",
-  "image_view",
-  "manufacture_details",
-  "manufacturer",
-  "column_break_16",
-  "manufacturer_part_no",
-  "received_and_accepted",
-  "received_qty",
-  "qty",
-  "rejected_qty",
-  "col_break2",
-  "uom",
-  "stock_uom",
-  "conversion_factor",
-  "retain_sample",
-  "sample_quantity",
-  "rate_and_amount",
-  "price_list_rate",
-  "discount_percentage",
-  "discount_amount",
-  "col_break3",
-  "base_price_list_rate",
-  "sec_break1",
-  "rate",
-  "amount",
-  "col_break4",
-  "base_rate",
-  "base_amount",
-  "pricing_rules",
-  "is_free_item",
-  "section_break_29",
-  "net_rate",
-  "net_amount",
-  "item_tax_template",
-  "column_break_32",
-  "base_net_rate",
-  "base_net_amount",
-  "valuation_rate",
-  "item_tax_amount",
-  "rm_supp_cost",
-  "landed_cost_voucher_amount",
-  "billed_amt",
-  "item_weight_details",
-  "weight_per_unit",
-  "total_weight",
-  "column_break_41",
-  "weight_uom",
-  "warehouse_and_reference",
-  "warehouse",
-  "rejected_warehouse",
-  "quality_inspection",
-  "purchase_order",
-  "material_request",
-  "purchase_order_item",
-  "material_request_item",
-  "column_break_40",
-  "is_fixed_asset",
-  "asset",
-  "asset_location",
-  "schedule_date",
-  "stock_qty",
-  "section_break_45",
-  "serial_no",
-  "batch_no",
-  "column_break_48",
-  "rejected_serial_no",
-  "expense_account",
-  "col_break5",
-  "allow_zero_valuation_rate",
-  "bom",
-  "include_exploded_items",
-  "item_tax_rate",
-  "accounting_dimensions_section",
-  "project",
-  "dimension_col_break",
-  "cost_center",
-  "section_break_80",
-  "page_break"
- ],
- "fields": [
-  {
-   "fieldname": "barcode",
-   "fieldtype": "Data",
-   "label": "Barcode"
-  },
-  {
-   "fieldname": "section_break_2",
-   "fieldtype": "Section Break"
-  },
-  {
-   "bold": 1,
-   "columns": 3,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "label": "Item Code",
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "print_width": "100px",
-   "reqd": 1,
-   "search_index": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "supplier_part_no",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Supplier Part Number",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Item Name",
-   "oldfieldname": "item_name",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "reqd": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "section_break_4",
-   "fieldtype": "Section Break",
-   "label": "Description"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "label": "Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "print_width": "300px",
-   "reqd": 1,
-   "width": "300px"
-  },
-  {
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "hidden": 1,
-   "label": "Image"
-  },
-  {
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "label": "Image View",
-   "options": "image",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "received_and_accepted",
-   "fieldtype": "Section Break",
-   "label": "Received and Accepted"
-  },
-  {
-   "bold": 1,
-   "fieldname": "received_qty",
-   "fieldtype": "Float",
-   "label": "Received Quantity",
-   "oldfieldname": "received_qty",
-   "oldfieldtype": "Currency",
-   "print_hide": 1,
-   "print_width": "100px",
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "columns": 2,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "in_list_view": 1,
-   "label": "Accepted Quantity",
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "print_width": "100px",
-   "width": "100px"
-  },
-  {
-   "fieldname": "rejected_qty",
-   "fieldtype": "Float",
-   "label": "Rejected Quantity",
-   "oldfieldname": "rejected_qty",
-   "oldfieldtype": "Currency",
-   "print_hide": 1,
-   "print_width": "100px",
-   "width": "100px"
-  },
-  {
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "uom",
-   "fieldtype": "Link",
-   "label": "UOM",
-   "oldfieldname": "uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "print_hide": 1,
-   "print_width": "100px",
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "label": "Stock UOM",
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Data",
-   "options": "UOM",
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "conversion_factor",
-   "fieldtype": "Float",
-   "label": "Conversion Factor",
-   "oldfieldname": "conversion_factor",
-   "oldfieldtype": "Currency",
-   "print_hide": 1,
-   "print_width": "100px",
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "default": "0",
-   "fetch_from": "item_code.retain_sample",
-   "fieldname": "retain_sample",
-   "fieldtype": "Check",
-   "label": "Retain Sample",
-   "read_only": 1
-  },
-  {
-   "depends_on": "retain_sample",
-   "fetch_from": "item_code.sample_quantity",
-   "fieldname": "sample_quantity",
-   "fieldtype": "Int",
-   "label": "Sample Quantity"
-  },
-  {
-   "fieldname": "rate_and_amount",
-   "fieldtype": "Section Break",
-   "label": "Rate and Amount"
-  },
-  {
-   "fieldname": "price_list_rate",
-   "fieldtype": "Currency",
-   "label": "Price List Rate",
-   "options": "currency",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "price_list_rate",
-   "fieldname": "discount_percentage",
-   "fieldtype": "Percent",
-   "label": "Discount on Price List Rate (%)",
-   "print_hide": 1
-  },
-  {
-   "depends_on": "price_list_rate",
-   "fieldname": "discount_amount",
-   "fieldtype": "Currency",
-   "label": "Discount Amount",
-   "options": "currency"
-  },
-  {
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "base_price_list_rate",
-   "fieldtype": "Currency",
-   "label": "Price List Rate (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "sec_break1",
-   "fieldtype": "Section Break"
-  },
-  {
-   "bold": 1,
-   "columns": 3,
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Rate",
-   "oldfieldname": "import_rate",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "print_width": "100px",
-   "width": "100px"
-  },
-  {
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Amount",
-   "oldfieldname": "import_amount",
-   "oldfieldtype": "Currency",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "base_rate",
-   "fieldtype": "Currency",
-   "label": "Rate (Company Currency)",
-   "oldfieldname": "purchase_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "reqd": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "base_amount",
-   "fieldtype": "Currency",
-   "label": "Amount (Company Currency)",
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "pricing_rules",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Pricing Rules",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_free_item",
-   "fieldtype": "Check",
-   "label": "Is Free Item",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_29",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "net_rate",
-   "fieldtype": "Currency",
-   "label": "Net Rate",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "columns": 2,
-   "fieldname": "net_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Net Amount",
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_32",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "base_net_rate",
-   "fieldtype": "Currency",
-   "label": "Net Rate (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_net_amount",
-   "fieldtype": "Currency",
-   "label": "Net Amount (Company Currency)",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "item_weight_details",
-   "fieldtype": "Section Break",
-   "label": "Item Weight Details"
-  },
-  {
-   "fieldname": "weight_per_unit",
-   "fieldtype": "Float",
-   "label": "Weight Per Unit"
-  },
-  {
-   "fieldname": "total_weight",
-   "fieldtype": "Float",
-   "label": "Total Weight",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_41",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "weight_uom",
-   "fieldtype": "Link",
-   "label": "Weight UOM",
-   "options": "UOM"
-  },
-  {
-   "fieldname": "warehouse_and_reference",
-   "fieldtype": "Section Break",
-   "label": "Warehouse and Reference"
-  },
-  {
-   "bold": 1,
-   "fieldname": "warehouse",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Accepted Warehouse",
-   "oldfieldname": "warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "print_hide": 1,
-   "print_width": "100px",
-   "width": "100px"
-  },
-  {
-   "fieldname": "rejected_warehouse",
-   "fieldtype": "Link",
-   "label": "Rejected Warehouse",
-   "no_copy": 1,
-   "oldfieldname": "rejected_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "print_hide": 1,
-   "print_width": "100px",
-   "width": "100px"
-  },
-  {
-   "depends_on": "eval:!doc.__islocal",
-   "fieldname": "quality_inspection",
-   "fieldtype": "Link",
-   "label": "Quality Inspection",
-   "no_copy": 1,
-   "oldfieldname": "qa_no",
-   "oldfieldtype": "Link",
-   "options": "Quality Inspection",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_40",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "is_fixed_asset",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Is Fixed Asset",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "depends_on": "is_fixed_asset",
-   "fieldname": "asset",
-   "fieldtype": "Link",
-   "label": "Asset",
-   "no_copy": 1,
-   "options": "Asset"
-  },
-  {
-   "depends_on": "is_fixed_asset",
-   "fieldname": "asset_location",
-   "fieldtype": "Link",
-   "label": "Asset Location",
-   "options": "Location"
-  },
-  {
-   "fieldname": "purchase_order",
-   "fieldtype": "Link",
-   "label": "Purchase Order",
-   "no_copy": 1,
-   "oldfieldname": "prevdoc_docname",
-   "oldfieldtype": "Link",
-   "options": "Purchase Order",
-   "print_hide": 1,
-   "print_width": "150px",
-   "read_only": 1,
-   "search_index": 1,
-   "width": "150px"
-  },
-  {
-   "fieldname": "schedule_date",
-   "fieldtype": "Date",
-   "label": "Required By",
-   "oldfieldname": "schedule_date",
-   "oldfieldtype": "Date",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "stock_qty",
-   "fieldtype": "Float",
-   "label": "Qty as per Stock UOM",
-   "oldfieldname": "stock_qty",
-   "oldfieldtype": "Currency",
-   "print_hide": 1,
-   "print_width": "100px",
-   "read_only": 1,
-   "width": "100px"
-  },
-  {
-   "fieldname": "section_break_45",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "serial_no",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Serial No",
-   "no_copy": 1,
-   "oldfieldname": "serial_no",
-   "oldfieldtype": "Text"
-  },
-  {
-   "fieldname": "batch_no",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Batch No",
-   "no_copy": 1,
-   "oldfieldname": "batch_no",
-   "oldfieldtype": "Link",
-   "options": "Batch",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_48",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "rejected_serial_no",
-   "fieldtype": "Small Text",
-   "label": "Rejected Serial No",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "item_tax_template",
-   "fieldtype": "Link",
-   "label": "Item Tax Template",
-   "options": "Item Tax Template",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project",
-   "print_hide": 1
-  },
-  {
-   "default": ":Company",
-   "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "purchase_order_item",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Purchase Order Item",
-   "no_copy": 1,
-   "oldfieldname": "prevdoc_detail_docname",
-   "oldfieldtype": "Data",
-   "print_hide": 1,
-   "print_width": "150px",
-   "read_only": 1,
-   "search_index": 1,
-   "width": "150px"
-  },
-  {
-   "fieldname": "col_break5",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "allow_zero_valuation_rate",
-   "fieldtype": "Check",
-   "label": "Allow Zero Valuation Rate",
-   "no_copy": 1,
-   "print_hide": 1
-  },
-  {
-   "fieldname": "bom",
-   "fieldtype": "Link",
-   "label": "BOM",
-   "no_copy": 1,
-   "options": "BOM",
-   "print_hide": 1
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:parent.is_subcontracted == 'Yes'",
-   "fieldname": "include_exploded_items",
-   "fieldtype": "Check",
-   "label": "Include Exploded Items",
-   "read_only": 1
-  },
-  {
-   "fieldname": "billed_amt",
-   "fieldtype": "Currency",
-   "label": "Billed Amt",
-   "no_copy": 1,
-   "options": "currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "landed_cost_voucher_amount",
-   "fieldtype": "Currency",
-   "label": "Landed Cost Voucher Amount",
-   "no_copy": 1,
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "brand",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Brand",
-   "oldfieldname": "brand",
-   "oldfieldtype": "Link",
-   "options": "Brand",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "item_group",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Item Group",
-   "oldfieldname": "item_group",
-   "oldfieldtype": "Link",
-   "options": "Item Group",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "rm_supp_cost",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Raw Materials Supplied Cost",
-   "no_copy": 1,
-   "oldfieldname": "rm_supp_cost",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "print_width": "150px",
-   "read_only": 1,
-   "width": "150px"
-  },
-  {
-   "fieldname": "item_tax_amount",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Item Tax Amount Included in Value",
-   "no_copy": 1,
-   "oldfieldname": "item_tax_amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "print_width": "150px",
-   "read_only": 1,
-   "width": "150px"
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "hidden": 1,
-   "label": "Valuation Rate",
-   "no_copy": 1,
-   "oldfieldname": "valuation_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "print_hide": 1,
-   "print_width": "80px",
-   "read_only": 1,
-   "width": "80px"
-  },
-  {
-   "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
-   "fieldname": "item_tax_rate",
-   "fieldtype": "Code",
-   "hidden": 1,
-   "label": "Item Tax Rate",
-   "oldfieldname": "item_tax_rate",
-   "oldfieldtype": "Small Text",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "0",
-   "fieldname": "page_break",
-   "fieldtype": "Check",
-   "label": "Page Break",
-   "oldfieldname": "page_break",
-   "oldfieldtype": "Check",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "section_break_80",
-   "fieldtype": "Section Break"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "image_section",
-   "fieldtype": "Section Break",
-   "label": "Image"
-  },
-  {
-   "fieldname": "material_request",
-   "fieldtype": "Link",
-   "label": "Material Request",
-   "options": "Material Request"
-  },
-  {
-   "fieldname": "material_request_item",
-   "fieldtype": "Data",
-   "label": "Material Request Item"
-  },
-  {
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Expense Account",
-   "options": "Account",
-   "read_only": 1
-  },
-  {
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "manufacture_details",
-   "fieldtype": "Section Break",
-   "label": "Manufacture"
-  },
-  {
-   "fieldname": "manufacturer",
-   "fieldtype": "Link",
-   "label": "Manufacturer",
-   "options": "Manufacturer"
-  },
-  {
-   "fieldname": "column_break_16",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "manufacturer_part_no",
-   "fieldtype": "Data",
-   "label": "Manufacturer Part Number",
-   "read_only": 1
-  }
- ],
- "idx": 1,
- "istable": 1,
- "modified": "2019-06-02 06:37:48.198745",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Purchase Receipt Item",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
-}
\ No newline at end of file
+   "autoname": "hash",
+   "creation": "2013-05-24 19:29:10",
+   "doctype": "DocType",
+   "document_type": "Document",
+   "editable_grid": 1,
+   "engine": "InnoDB",
+   "field_order": [
+    "barcode",
+    "section_break_2",
+    "item_code",
+    "supplier_part_no",
+    "column_break_2",
+    "item_name",
+    "section_break_4",
+    "description",
+    "item_group",
+    "brand",
+    "image_section",
+    "image",
+    "image_view",
+    "manufacture_details",
+    "manufacturer",
+    "column_break_16",
+    "manufacturer_part_no",
+    "received_and_accepted",
+    "received_qty",
+    "qty",
+    "rejected_qty",
+    "col_break2",
+    "uom",
+    "stock_uom",
+    "conversion_factor",
+    "retain_sample",
+    "sample_quantity",
+    "rate_and_amount",
+    "price_list_rate",
+    "discount_percentage",
+    "discount_amount",
+    "col_break3",
+    "base_price_list_rate",
+    "sec_break1",
+    "rate",
+    "amount",
+    "col_break4",
+    "base_rate",
+    "base_amount",
+    "pricing_rules",
+    "is_free_item",
+    "section_break_29",
+    "net_rate",
+    "net_amount",
+    "item_tax_template",
+    "column_break_32",
+    "base_net_rate",
+    "base_net_amount",
+    "valuation_rate",
+    "item_tax_amount",
+    "rm_supp_cost",
+    "landed_cost_voucher_amount",
+    "billed_amt",
+    "item_weight_details",
+    "weight_per_unit",
+    "total_weight",
+    "column_break_41",
+    "weight_uom",
+    "warehouse_and_reference",
+    "warehouse",
+    "rejected_warehouse",
+    "quality_inspection",
+    "purchase_order",
+    "material_request",
+    "purchase_order_item",
+    "material_request_item",
+    "column_break_40",
+    "is_fixed_asset",
+    "asset",
+    "asset_location",
+    "schedule_date",
+    "stock_qty",
+    "section_break_45",
+    "serial_no",
+    "batch_no",
+    "column_break_48",
+    "rejected_serial_no",
+    "expense_account",
+    "col_break5",
+    "allow_zero_valuation_rate",
+    "bom",
+    "include_exploded_items",
+    "item_tax_rate",
+    "accounting_dimensions_section",
+    "project",
+    "dimension_col_break",
+    "cost_center",
+    "section_break_80",
+    "page_break"
+   ],
+   "fields": [
+    {
+     "fieldname": "barcode",
+     "fieldtype": "Data",
+     "label": "Barcode"
+    },
+    {
+     "fieldname": "section_break_2",
+     "fieldtype": "Section Break"
+    },
+    {
+     "bold": 1,
+     "columns": 3,
+     "fieldname": "item_code",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "in_list_view": 1,
+     "label": "Item Code",
+     "oldfieldname": "item_code",
+     "oldfieldtype": "Link",
+     "options": "Item",
+     "print_width": "100px",
+     "reqd": 1,
+     "search_index": 1,
+     "width": "100px"
+    },
+    {
+     "fieldname": "supplier_part_no",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Supplier Part Number",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_2",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "item_name",
+     "fieldtype": "Data",
+     "in_global_search": 1,
+     "label": "Item Name",
+     "oldfieldname": "item_name",
+     "oldfieldtype": "Data",
+     "print_hide": 1,
+     "reqd": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "section_break_4",
+     "fieldtype": "Section Break",
+     "label": "Description"
+    },
+    {
+     "fieldname": "description",
+     "fieldtype": "Text Editor",
+     "label": "Description",
+     "oldfieldname": "description",
+     "oldfieldtype": "Text",
+     "print_width": "300px",
+     "reqd": 1,
+     "width": "300px"
+    },
+    {
+     "fieldname": "image",
+     "fieldtype": "Attach",
+     "hidden": 1,
+     "label": "Image"
+    },
+    {
+     "fieldname": "image_view",
+     "fieldtype": "Image",
+     "label": "Image View",
+     "options": "image",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "received_and_accepted",
+     "fieldtype": "Section Break",
+     "label": "Received and Accepted"
+    },
+    {
+     "bold": 1,
+     "fieldname": "received_qty",
+     "fieldtype": "Float",
+     "label": "Received Quantity",
+     "oldfieldname": "received_qty",
+     "oldfieldtype": "Currency",
+     "print_hide": 1,
+     "print_width": "100px",
+     "reqd": 1,
+     "width": "100px"
+    },
+    {
+     "columns": 2,
+     "fieldname": "qty",
+     "fieldtype": "Float",
+     "in_list_view": 1,
+     "label": "Accepted Quantity",
+     "oldfieldname": "qty",
+     "oldfieldtype": "Currency",
+     "print_width": "100px",
+     "width": "100px"
+    },
+    {
+     "fieldname": "rejected_qty",
+     "fieldtype": "Float",
+     "label": "Rejected Quantity",
+     "oldfieldname": "rejected_qty",
+     "oldfieldtype": "Currency",
+     "print_hide": 1,
+     "print_width": "100px",
+     "width": "100px"
+    },
+    {
+     "fieldname": "col_break2",
+     "fieldtype": "Column Break",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "uom",
+     "fieldtype": "Link",
+     "label": "UOM",
+     "oldfieldname": "uom",
+     "oldfieldtype": "Link",
+     "options": "UOM",
+     "print_hide": 1,
+     "print_width": "100px",
+     "reqd": 1,
+     "width": "100px"
+    },
+    {
+     "fieldname": "stock_uom",
+     "fieldtype": "Link",
+     "label": "Stock UOM",
+     "oldfieldname": "stock_uom",
+     "oldfieldtype": "Data",
+     "options": "UOM",
+     "print_hide": 1,
+     "print_width": "100px",
+     "read_only": 1,
+     "reqd": 1,
+     "width": "100px"
+    },
+    {
+     "fieldname": "conversion_factor",
+     "fieldtype": "Float",
+     "label": "Conversion Factor",
+     "oldfieldname": "conversion_factor",
+     "oldfieldtype": "Currency",
+     "print_hide": 1,
+     "print_width": "100px",
+     "reqd": 1,
+     "width": "100px"
+    },
+    {
+     "default": "0",
+     "fetch_from": "item_code.retain_sample",
+     "fieldname": "retain_sample",
+     "fieldtype": "Check",
+     "label": "Retain Sample",
+     "read_only": 1
+    },
+    {
+     "depends_on": "retain_sample",
+     "fetch_from": "item_code.sample_quantity",
+     "fieldname": "sample_quantity",
+     "fieldtype": "Int",
+     "label": "Sample Quantity"
+    },
+    {
+     "fieldname": "rate_and_amount",
+     "fieldtype": "Section Break",
+     "label": "Rate and Amount"
+    },
+    {
+     "fieldname": "price_list_rate",
+     "fieldtype": "Currency",
+     "label": "Price List Rate",
+     "options": "currency",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "price_list_rate",
+     "fieldname": "discount_percentage",
+     "fieldtype": "Percent",
+     "label": "Discount on Price List Rate (%)",
+     "print_hide": 1
+    },
+    {
+     "depends_on": "price_list_rate",
+     "fieldname": "discount_amount",
+     "fieldtype": "Currency",
+     "label": "Discount Amount",
+     "options": "currency"
+    },
+    {
+     "fieldname": "col_break3",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "base_price_list_rate",
+     "fieldtype": "Currency",
+     "label": "Price List Rate (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "sec_break1",
+     "fieldtype": "Section Break"
+    },
+    {
+     "bold": 1,
+     "columns": 3,
+     "fieldname": "rate",
+     "fieldtype": "Currency",
+     "in_list_view": 1,
+     "label": "Rate",
+     "oldfieldname": "import_rate",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "print_width": "100px",
+     "width": "100px"
+    },
+    {
+     "fieldname": "amount",
+     "fieldtype": "Currency",
+     "in_list_view": 1,
+     "label": "Amount",
+     "oldfieldname": "import_amount",
+     "oldfieldtype": "Currency",
+     "options": "currency",
+     "read_only": 1
+    },
+    {
+     "fieldname": "col_break4",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "base_rate",
+     "fieldtype": "Currency",
+     "label": "Rate (Company Currency)",
+     "oldfieldname": "purchase_rate",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "print_width": "100px",
+     "read_only": 1,
+     "reqd": 1,
+     "width": "100px"
+    },
+    {
+     "fieldname": "base_amount",
+     "fieldtype": "Currency",
+     "label": "Amount (Company Currency)",
+     "oldfieldname": "amount",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "print_width": "100px",
+     "read_only": 1,
+     "width": "100px"
+    },
+    {
+     "fieldname": "pricing_rules",
+     "fieldtype": "Small Text",
+     "hidden": 1,
+     "label": "Pricing Rules",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "is_free_item",
+     "fieldtype": "Check",
+     "label": "Is Free Item",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_29",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "net_rate",
+     "fieldtype": "Currency",
+     "label": "Net Rate",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "columns": 2,
+     "fieldname": "net_amount",
+     "fieldtype": "Currency",
+     "in_list_view": 1,
+     "label": "Net Amount",
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_32",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "base_net_rate",
+     "fieldtype": "Currency",
+     "label": "Net Rate (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "base_net_amount",
+     "fieldtype": "Currency",
+     "label": "Net Amount (Company Currency)",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "item_weight_details",
+     "fieldtype": "Section Break",
+     "label": "Item Weight Details"
+    },
+    {
+     "fieldname": "weight_per_unit",
+     "fieldtype": "Float",
+     "label": "Weight Per Unit"
+    },
+    {
+     "fieldname": "total_weight",
+     "fieldtype": "Float",
+     "label": "Total Weight",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_41",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "weight_uom",
+     "fieldtype": "Link",
+     "label": "Weight UOM",
+     "options": "UOM"
+    },
+    {
+     "fieldname": "warehouse_and_reference",
+     "fieldtype": "Section Break",
+     "label": "Warehouse and Reference"
+    },
+    {
+     "bold": 1,
+     "fieldname": "warehouse",
+     "fieldtype": "Link",
+     "in_list_view": 1,
+     "label": "Accepted Warehouse",
+     "oldfieldname": "warehouse",
+     "oldfieldtype": "Link",
+     "options": "Warehouse",
+     "print_hide": 1,
+     "print_width": "100px",
+     "width": "100px"
+    },
+    {
+     "fieldname": "rejected_warehouse",
+     "fieldtype": "Link",
+     "label": "Rejected Warehouse",
+     "no_copy": 1,
+     "oldfieldname": "rejected_warehouse",
+     "oldfieldtype": "Link",
+     "options": "Warehouse",
+     "print_hide": 1,
+     "print_width": "100px",
+     "width": "100px"
+    },
+    {
+     "depends_on": "eval:!doc.__islocal",
+     "fieldname": "quality_inspection",
+     "fieldtype": "Link",
+     "label": "Quality Inspection",
+     "no_copy": 1,
+     "oldfieldname": "qa_no",
+     "oldfieldtype": "Link",
+     "options": "Quality Inspection",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_40",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "0",
+     "fieldname": "is_fixed_asset",
+     "fieldtype": "Check",
+     "hidden": 1,
+     "label": "Is Fixed Asset",
+     "no_copy": 1,
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "depends_on": "is_fixed_asset",
+     "fieldname": "asset",
+     "fieldtype": "Link",
+     "label": "Asset",
+     "no_copy": 1,
+     "options": "Asset"
+    },
+    {
+     "depends_on": "is_fixed_asset",
+     "fieldname": "asset_location",
+     "fieldtype": "Link",
+     "label": "Asset Location",
+     "options": "Location"
+    },
+    {
+     "fieldname": "purchase_order",
+     "fieldtype": "Link",
+     "label": "Purchase Order",
+     "no_copy": 1,
+     "oldfieldname": "prevdoc_docname",
+     "oldfieldtype": "Link",
+     "options": "Purchase Order",
+     "print_hide": 1,
+     "print_width": "150px",
+     "read_only": 1,
+     "search_index": 1,
+     "width": "150px"
+    },
+    {
+     "fieldname": "schedule_date",
+     "fieldtype": "Date",
+     "label": "Required By",
+     "oldfieldname": "schedule_date",
+     "oldfieldtype": "Date",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "stock_qty",
+     "fieldtype": "Float",
+     "label": "Qty as per Stock UOM",
+     "oldfieldname": "stock_qty",
+     "oldfieldtype": "Currency",
+     "print_hide": 1,
+     "print_width": "100px",
+     "read_only": 1,
+     "width": "100px"
+    },
+    {
+     "fieldname": "section_break_45",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "serial_no",
+     "fieldtype": "Small Text",
+     "in_list_view": 1,
+     "label": "Serial No",
+     "no_copy": 1,
+     "oldfieldname": "serial_no",
+     "oldfieldtype": "Text"
+    },
+    {
+     "fieldname": "batch_no",
+     "fieldtype": "Link",
+     "in_list_view": 1,
+     "label": "Batch No",
+     "no_copy": 1,
+     "oldfieldname": "batch_no",
+     "oldfieldtype": "Link",
+     "options": "Batch",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_48",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "rejected_serial_no",
+     "fieldtype": "Small Text",
+     "label": "Rejected Serial No",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "item_tax_template",
+     "fieldtype": "Link",
+     "label": "Item Tax Template",
+     "options": "Item Tax Template",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "project",
+     "fieldtype": "Link",
+     "label": "Project",
+     "options": "Project",
+     "print_hide": 1
+    },
+    {
+     "default": ":Company",
+     "depends_on": "eval:cint(erpnext.is_perpetual_inventory_enabled(parent.company))",
+     "fieldname": "cost_center",
+     "fieldtype": "Link",
+     "label": "Cost Center",
+     "options": "Cost Center",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "purchase_order_item",
+     "fieldtype": "Data",
+     "hidden": 1,
+     "label": "Purchase Order Item",
+     "no_copy": 1,
+     "oldfieldname": "prevdoc_detail_docname",
+     "oldfieldtype": "Data",
+     "print_hide": 1,
+     "print_width": "150px",
+     "read_only": 1,
+     "search_index": 1,
+     "width": "150px"
+    },
+    {
+     "fieldname": "col_break5",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "0",
+     "fieldname": "allow_zero_valuation_rate",
+     "fieldtype": "Check",
+     "label": "Allow Zero Valuation Rate",
+     "no_copy": 1,
+     "print_hide": 1
+    },
+    {
+     "fieldname": "bom",
+     "fieldtype": "Link",
+     "label": "BOM",
+     "no_copy": 1,
+     "options": "BOM",
+     "print_hide": 1
+    },
+    {
+     "default": "0",
+     "depends_on": "eval:parent.is_subcontracted == 'Yes'",
+     "fieldname": "include_exploded_items",
+     "fieldtype": "Check",
+     "label": "Include Exploded Items",
+     "read_only": 1
+    },
+    {
+     "fieldname": "billed_amt",
+     "fieldtype": "Currency",
+     "label": "Billed Amt",
+     "no_copy": 1,
+     "options": "currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "landed_cost_voucher_amount",
+     "fieldtype": "Currency",
+     "label": "Landed Cost Voucher Amount",
+     "no_copy": 1,
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "brand",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Brand",
+     "oldfieldname": "brand",
+     "oldfieldtype": "Link",
+     "options": "Brand",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "item_group",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Item Group",
+     "oldfieldname": "item_group",
+     "oldfieldtype": "Link",
+     "options": "Item Group",
+     "print_hide": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "rm_supp_cost",
+     "fieldtype": "Currency",
+     "hidden": 1,
+     "label": "Raw Materials Supplied Cost",
+     "no_copy": 1,
+     "oldfieldname": "rm_supp_cost",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "print_width": "150px",
+     "read_only": 1,
+     "width": "150px"
+    },
+    {
+     "fieldname": "item_tax_amount",
+     "fieldtype": "Currency",
+     "hidden": 1,
+     "label": "Item Tax Amount Included in Value",
+     "no_copy": 1,
+     "oldfieldname": "item_tax_amount",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "print_width": "150px",
+     "read_only": 1,
+     "width": "150px"
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "valuation_rate",
+     "fieldtype": "Currency",
+     "hidden": 1,
+     "label": "Valuation Rate",
+     "no_copy": 1,
+     "oldfieldname": "valuation_rate",
+     "oldfieldtype": "Currency",
+     "options": "Company:company:default_currency",
+     "print_hide": 1,
+     "print_width": "80px",
+     "read_only": 1,
+     "width": "80px"
+    },
+    {
+     "description": "Tax detail table fetched from item master as a string and stored in this field.\nUsed for Taxes and Charges",
+     "fieldname": "item_tax_rate",
+     "fieldtype": "Code",
+     "hidden": 1,
+     "label": "Item Tax Rate",
+     "oldfieldname": "item_tax_rate",
+     "oldfieldtype": "Small Text",
+     "print_hide": 1,
+     "read_only": 1,
+     "report_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "0",
+     "fieldname": "page_break",
+     "fieldtype": "Check",
+     "label": "Page Break",
+     "oldfieldname": "page_break",
+     "oldfieldtype": "Check",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "section_break_80",
+     "fieldtype": "Section Break"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "image_section",
+     "fieldtype": "Section Break",
+     "label": "Image"
+    },
+    {
+     "fieldname": "material_request",
+     "fieldtype": "Link",
+     "label": "Material Request",
+     "options": "Material Request"
+    },
+    {
+     "fieldname": "material_request_item",
+     "fieldtype": "Data",
+     "label": "Material Request Item"
+    },
+    {
+     "fieldname": "expense_account",
+     "fieldtype": "Link",
+     "hidden": 1,
+     "label": "Expense Account",
+     "options": "Account",
+     "read_only": 1
+    },
+    {
+     "fieldname": "accounting_dimensions_section",
+     "fieldtype": "Section Break",
+     "label": "Accounting Dimensions"
+    },
+    {
+     "fieldname": "dimension_col_break",
+     "fieldtype": "Column Break"
+    },
+    {
+     "collapsible": 1,
+     "fieldname": "manufacture_details",
+     "fieldtype": "Section Break",
+     "label": "Manufacture"
+    },
+    {
+     "fieldname": "manufacturer",
+     "fieldtype": "Link",
+     "label": "Manufacturer",
+     "options": "Manufacturer"
+    },
+    {
+     "fieldname": "column_break_16",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "manufacturer_part_no",
+     "fieldtype": "Data",
+     "label": "Manufacturer Part Number",
+     "read_only": 1
+    }
+   ],
+   "idx": 1,
+   "istable": 1,
+   "modified": "2019-06-02 06:37:48.198745",
+   "modified_by": "Administrator",
+   "module": "Stock",
+   "name": "Purchase Receipt Item",
+   "owner": "Administrator",
+   "permissions": [],
+   "quick_entry": 1,
+   "sort_field": "modified",
+   "sort_order": "DESC"
+  }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 4358ded..bbc54ec 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -1,20 +1,1969 @@
 {
-   "allow_copy": 0,
-   "allow_events_in_timeline": 0,
-   "allow_guest_to_view": 0,
-   "allow_import": 1,
-   "allow_rename": 0,
-   "autoname": "naming_series:",
-   "beta": 0,
-   "creation": "2013-04-09 11:43:55",
-   "custom": 0,
-   "docstatus": 0,
-   "doctype": "DocType",
-   "document_type": "Document",
-   "editable_grid": 0,
-   "engine": "InnoDB",
-   "fields": [
-    {
+  "allow_copy": 0,
+  "allow_events_in_timeline": 0,
+  "allow_guest_to_view": 0,
+  "allow_import": 1,
+  "allow_rename": 0,
+  "autoname": "naming_series:",
+  "beta": 0,
+  "creation": "2013-04-09 11:43:55",
+  "custom": 0,
+  "docstatus": 0,
+  "doctype": "DocType",
+  "document_type": "Document",
+  "editable_grid": 0,
+  "engine": "InnoDB",
+  "fields": [
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "items_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": "",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldtype": "Section Break",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 1,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "default": "{purpose}",
+    "fetch_if_empty": 0,
+    "fieldname": "title",
+    "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": "Title",
+    "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": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "default": "",
+    "fetch_if_empty": 0,
+    "fieldname": "naming_series",
+    "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": "Series",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "naming_series",
+    "oldfieldtype": "Select",
+    "options": "MAT-STE-.YYYY.-",
+    "permlevel": 0,
+    "print_hide": 1,
+    "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": 1,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "stock_entry_type",
+    "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": 1,
+    "label": "Stock Entry Type",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Stock Entry 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": 1,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose == 'Receive at Warehouse'",
+    "fetch_if_empty": 0,
+    "fieldname": "outgoing_stock_entry",
+    "fieldtype": "Link",
+    "hidden": 0,
+    "ignore_user_permissions": 0,
+    "ignore_xss_filter": 0,
+    "in_filter": 0,
+    "in_global_search": 0,
+    "in_list_view": 0,
+    "in_standard_filter": 0,
+    "label": "Stock Entry (Outward GIT)",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Stock Entry",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 1,
+    "collapsible": 0,
+    "columns": 0,
+    "default": "",
+    "fetch_from": "stock_entry_type.purpose",
+    "fetch_if_empty": 0,
+    "fieldname": "purpose",
+    "fieldtype": "Select",
+    "hidden": 1,
+    "ignore_user_permissions": 0,
+    "ignore_xss_filter": 0,
+    "in_filter": 0,
+    "in_global_search": 0,
+    "in_list_view": 1,
+    "in_standard_filter": 0,
+    "label": "Purpose",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldname": "purpose",
+    "oldfieldtype": "Select",
+    "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor\nSend to Warehouse\nReceive at Warehouse",
+    "permlevel": 0,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "company",
+    "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": "Company",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldname": "company",
+    "oldfieldtype": "Link",
+    "options": "Company",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 1,
+    "report_hide": 0,
+    "reqd": 1,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:in_list([\"Material Transfer for Manufacture\", \"Manufacture\", \"Material Consumption for Manufacture\"], doc.purpose)",
+    "fetch_if_empty": 0,
+    "fieldname": "work_order",
+    "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": "Work Order",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldname": "production_order",
+    "oldfieldtype": "Link",
+    "options": "Work Order",
+    "permlevel": 0,
+    "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
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Send to Subcontractor\"",
+    "fetch_if_empty": 0,
+    "fieldname": "purchase_order",
+    "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": "Purchase Order",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Purchase Order",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Sales Return\"",
+    "fetch_if_empty": 0,
+    "fieldname": "delivery_note_no",
+    "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": "Delivery Note No",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "delivery_note_no",
+    "oldfieldtype": "Link",
+    "options": "Delivery Note",
+    "permlevel": 0,
+    "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
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Sales Return\"",
+    "fetch_if_empty": 0,
+    "fieldname": "sales_invoice_no",
+    "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": "Sales Invoice No",
+    "length": 0,
+    "no_copy": 1,
+    "options": "Sales Invoice",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Purchase Return\"",
+    "fetch_if_empty": 0,
+    "fieldname": "purchase_receipt_no",
+    "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": "Purchase Receipt No",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "purchase_receipt_no",
+    "oldfieldtype": "Link",
+    "options": "Purchase Receipt",
+    "permlevel": 0,
+    "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
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "col2",
+    "fieldtype": "Column 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,
+    "oldfieldtype": "Column Break",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "print_width": "50%",
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0,
+    "width": "50%"
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "default": "Today",
+    "depends_on": "",
+    "fetch_if_empty": 0,
+    "fieldname": "posting_date",
+    "fieldtype": "Date",
+    "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": "Posting Date",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "posting_date",
+    "oldfieldtype": "Date",
+    "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": 1,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "",
+    "fetch_if_empty": 0,
+    "fieldname": "posting_time",
+    "fieldtype": "Time",
+    "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": "Posting Time",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "posting_time",
+    "oldfieldtype": "Time",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.docstatus==0",
+    "fetch_if_empty": 0,
+    "fieldname": "set_posting_time",
+    "fieldtype": "Check",
+    "hidden": 0,
+    "ignore_user_permissions": 0,
+    "ignore_xss_filter": 0,
+    "in_filter": 0,
+    "in_global_search": 0,
+    "in_list_view": 0,
+    "in_standard_filter": 0,
+    "label": "Edit Posting Date and Time",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "inspection_required",
+    "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": "Inspection Required",
+    "length": 0,
+    "no_copy": 0,
+    "options": "",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:in_list([\"Material Issue\", \"Material Transfer\", \"Manufacture\", \"Repack\", \t\t\t\t\t\"Send to Subcontractor\", \"Material Transfer for Manufacture\", \"Material Consumption for Manufacture\"], doc.purpose)",
+    "fetch_if_empty": 0,
+    "fieldname": "from_bom",
+    "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": "From BOM",
+    "length": 0,
+    "no_copy": 0,
+    "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": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval: doc.from_bom && (doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")",
+    "fetch_if_empty": 0,
+    "fieldname": "sb1",
+    "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": "",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "from_bom",
+    "fetch_if_empty": 0,
+    "fieldname": "bom_no",
+    "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": "BOM No",
+    "length": 0,
+    "no_copy": 0,
+    "options": "BOM",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "from_bom",
+    "description": "As per Stock UOM",
+    "fetch_if_empty": 0,
+    "fieldname": "fg_completed_qty",
+    "fieldtype": "Float",
+    "hidden": 0,
+    "ignore_user_permissions": 0,
+    "ignore_xss_filter": 0,
+    "in_filter": 0,
+    "in_global_search": 0,
+    "in_list_view": 0,
+    "in_standard_filter": 0,
+    "label": "For Quantity",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldname": "fg_completed_qty",
+    "oldfieldtype": "Currency",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "cb1",
+    "fieldtype": "Column 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,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "default": "1",
+    "depends_on": "from_bom",
+    "description": "Including items for sub assemblies",
+    "fetch_if_empty": 0,
+    "fieldname": "use_multi_level_bom",
+    "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": "Use Multi-Level BOM",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "from_bom",
+    "fetch_if_empty": 0,
+    "fieldname": "get_items",
+    "fieldtype": "Button",
+    "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": "Get Items",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldtype": "Button",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "section_break_12",
+    "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
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "from_warehouse",
+    "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": 1,
+    "label": "Default Source Warehouse",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "from_warehouse",
+    "oldfieldtype": "Link",
+    "options": "Warehouse",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "from_warehouse",
+    "fetch_if_empty": 0,
+    "fieldname": "source_warehouse_address",
+    "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": "Source Warehouse Address",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Address",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "source_address_display",
+    "fieldtype": "Small Text",
+    "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": "Source Warehouse Address",
+    "length": 0,
+    "no_copy": 0,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "cb0",
+    "fieldtype": "Column 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,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "to_warehouse",
+    "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": 1,
+    "label": "Default Target Warehouse",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "to_warehouse",
+    "oldfieldtype": "Link",
+    "options": "Warehouse",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "to_warehouse",
+    "fetch_if_empty": 0,
+    "fieldname": "target_warehouse_address",
+    "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": "Target Warehouse Name",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Address",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "target_address_display",
+    "fieldtype": "Small Text",
+    "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": "Target Warehouse Address",
+    "length": 0,
+    "no_copy": 0,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "sb0",
+    "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,
+    "options": "Simple",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "scan_barcode",
+    "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": "Scan Barcode",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "items",
+    "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": "Items",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldname": "mtn_details",
+    "oldfieldtype": "Table",
+    "options": "Stock Entry Detail",
+    "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": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "description": "",
+    "fetch_if_empty": 0,
+    "fieldname": "get_stock_and_rate",
+    "fieldtype": "Button",
+    "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": "Update Rate and Availability",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldtype": "Button",
+    "options": "get_stock_and_rate",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "section_break_19",
+    "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": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "total_incoming_value",
+    "fieldtype": "Currency",
+    "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": "Total Incoming Value",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Company:company:default_currency",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 1,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "column_break_22",
+    "fieldtype": "Column 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
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "total_outgoing_value",
+    "fieldtype": "Currency",
+    "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": "Total Outgoing Value",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Company:company:default_currency",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 1,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "value_difference",
+    "fieldtype": "Currency",
+    "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": "Total Value Difference (Out - In)",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Company:company:default_currency",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 1,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 1,
+    "collapsible_depends_on": "total_additional_costs",
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "additional_costs_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": "Additional Costs",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "additional_costs",
+    "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": "Additional Costs",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Landed Cost Taxes and Charges",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "total_additional_costs",
+    "fieldtype": "Currency",
+    "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": "Total Additional Costs",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Company:company:default_currency",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 1,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 1,
+    "columns": 0,
+    "depends_on": "eval: in_list([\"Sales Return\", \"Purchase Return\", \"Send to Subcontractor\"], doc.purpose)",
+    "fetch_if_empty": 0,
+    "fieldname": "contact_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": "Customer or Supplier Details",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
+    "fetch_if_empty": 0,
+    "fieldname": "supplier",
+    "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": "Supplier",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "supplier",
+    "oldfieldtype": "Link",
+    "options": "Supplier",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 1,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
+    "fetch_if_empty": 0,
+    "fieldname": "supplier_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 Name",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "supplier_name",
+    "oldfieldtype": "Data",
+    "permlevel": 0,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
+    "fetch_if_empty": 0,
+    "fieldname": "supplier_address",
+    "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": "Supplier Address",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "supplier_address",
+    "oldfieldtype": "Small Text",
+    "options": "Address",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "address_display",
+    "fieldtype": "Small Text",
+    "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": "Address",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "column_break_39",
+    "fieldtype": "Column 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
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Sales Return\"",
+    "fetch_if_empty": 0,
+    "fieldname": "customer",
+    "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": "Customer",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "customer",
+    "oldfieldtype": "Link",
+    "options": "Customer",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 1,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Sales Return\"",
+    "fetch_if_empty": 0,
+    "fieldname": "customer_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": "Customer Name",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "customer_name",
+    "oldfieldtype": "Data",
+    "permlevel": 0,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "eval:doc.purpose==\"Sales Return\"",
+    "fetch_if_empty": 0,
+    "fieldname": "customer_address",
+    "fieldtype": "Small Text",
+    "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": "Customer Address",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "customer_address",
+    "oldfieldtype": "Small Text",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 1,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "printing_settings",
+    "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": "Printing Settings",
+    "length": 0,
+    "no_copy": 0,
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 1,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "select_print_heading",
+    "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": "Print Heading",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldname": "select_print_heading",
+    "oldfieldtype": "Link",
+    "options": "Print Heading",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "letter_head",
+    "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": "Letter Head",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Letter Head",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 1,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "more_info",
+    "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": "More Information",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldtype": "Section Break",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
      "allow_bulk_edit": 0,
      "allow_in_quick_entry": 0,
      "allow_on_submit": 0,
@@ -22,75 +1971,7 @@
      "collapsible": 0,
      "columns": 0,
      "fetch_if_empty": 0,
-     "fieldname": "items_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": "",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Section Break",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 1,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "{purpose}",
-     "fetch_if_empty": 0,
-     "fieldname": "title",
-     "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": "Title",
-     "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": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "",
-     "fetch_if_empty": 0,
-     "fieldname": "naming_series",
+     "fieldname": "is_opening",
      "fieldtype": "Select",
      "hidden": 0,
      "ignore_user_permissions": 0,
@@ -99,80 +1980,10 @@
      "in_global_search": 0,
      "in_list_view": 0,
      "in_standard_filter": 0,
-     "label": "Series",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "naming_series",
-     "oldfieldtype": "Select",
-     "options": "MAT-STE-.YYYY.-",
-     "permlevel": 0,
-     "print_hide": 1,
-     "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": 1,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "stock_entry_type",
-     "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": 1,
-     "label": "Stock Entry Type",
+     "label": "Is Opening",
      "length": 0,
      "no_copy": 0,
-     "options": "Stock Entry 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": 1,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose == 'Receive at Warehouse'",
-     "fetch_if_empty": 0,
-     "fieldname": "outgoing_stock_entry",
-     "fieldtype": "Link",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Stock Entry (Outward GIT)",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Stock Entry",
+     "options": "No\nYes",
      "permlevel": 0,
      "precision": "",
      "print_hide": 0,
@@ -185,2192 +1996,381 @@
      "set_only_once": 0,
      "translatable": 0,
      "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 1,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "",
-     "fetch_from": "stock_entry_type.purpose",
-     "fetch_if_empty": 0,
-     "fieldname": "purpose",
-     "fieldtype": "Select",
-     "hidden": 1,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 1,
-     "in_standard_filter": 0,
-     "label": "Purpose",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "purpose",
-     "oldfieldtype": "Select",
-     "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor\nSend to Warehouse\nReceive at Warehouse",
-     "permlevel": 0,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "company",
-     "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": "Company",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "company",
-     "oldfieldtype": "Link",
-     "options": "Company",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 1,
-     "report_hide": 0,
-     "reqd": 1,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:in_list([\"Material Transfer for Manufacture\", \"Manufacture\", \"Material Consumption for Manufacture\"], doc.purpose)",
-     "fetch_if_empty": 0,
-     "fieldname": "work_order",
-     "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": "Work Order",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "production_order",
-     "oldfieldtype": "Link",
-     "options": "Work Order",
-     "permlevel": 0,
-     "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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Send to Subcontractor\"",
-     "fetch_if_empty": 0,
-     "fieldname": "purchase_order",
-     "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": "Purchase Order",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Purchase Order",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Sales Return\"",
-     "fetch_if_empty": 0,
-     "fieldname": "delivery_note_no",
-     "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": "Delivery Note No",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "delivery_note_no",
-     "oldfieldtype": "Link",
-     "options": "Delivery Note",
-     "permlevel": 0,
-     "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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Sales Return\"",
-     "fetch_if_empty": 0,
-     "fieldname": "sales_invoice_no",
-     "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": "Sales Invoice No",
-     "length": 0,
-     "no_copy": 1,
-     "options": "Sales Invoice",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Purchase Return\"",
-     "fetch_if_empty": 0,
-     "fieldname": "purchase_receipt_no",
-     "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": "Purchase Receipt No",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "purchase_receipt_no",
-     "oldfieldtype": "Link",
-     "options": "Purchase Receipt",
-     "permlevel": 0,
-     "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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "col2",
-     "fieldtype": "Column 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,
-     "oldfieldtype": "Column Break",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "print_width": "50%",
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0,
-     "width": "50%"
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "Today",
-     "depends_on": "",
-     "fetch_if_empty": 0,
-     "fieldname": "posting_date",
-     "fieldtype": "Date",
-     "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": "Posting Date",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "posting_date",
-     "oldfieldtype": "Date",
-     "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": 1,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "",
-     "fetch_if_empty": 0,
-     "fieldname": "posting_time",
-     "fieldtype": "Time",
-     "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": "Posting Time",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "posting_time",
-     "oldfieldtype": "Time",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.docstatus==0",
-     "fetch_if_empty": 0,
-     "fieldname": "set_posting_time",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Edit Posting Date and Time",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "inspection_required",
-     "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": "Inspection Required",
-     "length": 0,
-     "no_copy": 0,
-     "options": "",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:in_list([\"Material Issue\", \"Material Transfer\", \"Manufacture\", \"Repack\", \t\t\t\t\t\"Send to Subcontractor\", \"Material Transfer for Manufacture\", \"Material Consumption for Manufacture\"], doc.purpose)",
-     "fetch_if_empty": 0,
-     "fieldname": "from_bom",
-     "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": "From BOM",
-     "length": 0,
-     "no_copy": 0,
-     "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": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval: doc.from_bom && (doc.purpose!==\"Sales Return\" && doc.purpose!==\"Purchase Return\")",
-     "fetch_if_empty": 0,
-     "fieldname": "sb1",
-     "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": "",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "from_bom",
-     "fetch_if_empty": 0,
-     "fieldname": "bom_no",
-     "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": "BOM No",
-     "length": 0,
-     "no_copy": 0,
-     "options": "BOM",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "from_bom",
-     "description": "As per Stock UOM",
-     "fetch_if_empty": 0,
-     "fieldname": "fg_completed_qty",
-     "fieldtype": "Float",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "For Quantity",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "fg_completed_qty",
-     "oldfieldtype": "Currency",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "cb1",
-     "fieldtype": "Column 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,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "1",
-     "depends_on": "from_bom",
-     "description": "Including items for sub assemblies",
-     "fetch_if_empty": 0,
-     "fieldname": "use_multi_level_bom",
-     "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": "Use Multi-Level BOM",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "from_bom",
-     "fetch_if_empty": 0,
-     "fieldname": "get_items",
-     "fieldtype": "Button",
-     "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": "Get Items",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Button",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "section_break_12",
-     "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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "from_warehouse",
-     "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": 1,
-     "label": "Default Source Warehouse",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "from_warehouse",
-     "oldfieldtype": "Link",
-     "options": "Warehouse",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "from_warehouse",
-     "fetch_if_empty": 0,
-     "fieldname": "source_warehouse_address",
-     "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": "Source Warehouse Address",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Address",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "source_address_display",
-     "fieldtype": "Small Text",
-     "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": "Source Warehouse Address",
-     "length": 0,
-     "no_copy": 0,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "cb0",
-     "fieldtype": "Column 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,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "to_warehouse",
-     "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": 1,
-     "label": "Default Target Warehouse",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "to_warehouse",
-     "oldfieldtype": "Link",
-     "options": "Warehouse",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "to_warehouse",
-     "fetch_if_empty": 0,
-     "fieldname": "target_warehouse_address",
-     "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": "Target Warehouse Name",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Address",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "target_address_display",
-     "fieldtype": "Small Text",
-     "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": "Target Warehouse Address",
-     "length": 0,
-     "no_copy": 0,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "sb0",
-     "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,
-     "options": "Simple",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "scan_barcode",
-     "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": "Scan Barcode",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "items",
-     "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": "Items",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "mtn_details",
-     "oldfieldtype": "Table",
-     "options": "Stock Entry Detail",
-     "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": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "get_stock_and_rate",
-     "fieldtype": "Button",
-     "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": "Update Rate and Availability",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Button",
-     "options": "get_stock_and_rate",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "section_break_19",
-     "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": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "total_incoming_value",
-     "fieldtype": "Currency",
-     "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": "Total Incoming Value",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "column_break_22",
-     "fieldtype": "Column 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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "total_outgoing_value",
-     "fieldtype": "Currency",
-     "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": "Total Outgoing Value",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "value_difference",
-     "fieldtype": "Currency",
-     "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": "Total Value Difference (Out - In)",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 1,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "collapsible_depends_on": "total_additional_costs",
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "additional_costs_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": "Additional Costs",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "additional_costs",
-     "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": "Additional Costs",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Landed Cost Taxes and Charges",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "total_additional_costs",
-     "fieldtype": "Currency",
-     "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": "Total Additional Costs",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 1,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "columns": 0,
-     "depends_on": "eval: in_list([\"Sales Return\", \"Purchase Return\", \"Send to Subcontractor\"], doc.purpose)",
-     "fetch_if_empty": 0,
-     "fieldname": "contact_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": "Customer or Supplier Details",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
-     "fetch_if_empty": 0,
-     "fieldname": "supplier",
-     "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": "Supplier",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "supplier",
-     "oldfieldtype": "Link",
-     "options": "Supplier",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 1,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
-     "fetch_if_empty": 0,
-     "fieldname": "supplier_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 Name",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "supplier_name",
-     "oldfieldtype": "Data",
-     "permlevel": 0,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
-     "fetch_if_empty": 0,
-     "fieldname": "supplier_address",
-     "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": "Supplier Address",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "supplier_address",
-     "oldfieldtype": "Small Text",
-     "options": "Address",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "address_display",
-     "fieldtype": "Small Text",
-     "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": "Address",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "column_break_39",
-     "fieldtype": "Column 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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Sales Return\"",
-     "fetch_if_empty": 0,
-     "fieldname": "customer",
-     "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": "Customer",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "customer",
-     "oldfieldtype": "Link",
-     "options": "Customer",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 1,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Sales Return\"",
-     "fetch_if_empty": 0,
-     "fieldname": "customer_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": "Customer Name",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "customer_name",
-     "oldfieldtype": "Data",
-     "permlevel": 0,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:doc.purpose==\"Sales Return\"",
-     "fetch_if_empty": 0,
-     "fieldname": "customer_address",
-     "fieldtype": "Small Text",
-     "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": "Customer Address",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "customer_address",
-     "oldfieldtype": "Small Text",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "printing_settings",
-     "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": "Printing Settings",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 1,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "select_print_heading",
-     "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": "Print Heading",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "select_print_heading",
-     "oldfieldtype": "Link",
-     "options": "Print Heading",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "letter_head",
-     "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": "Letter Head",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Letter Head",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "more_info",
-     "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": "More Information",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Section Break",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-      "allow_bulk_edit": 0,
-      "allow_in_quick_entry": 0,
-      "allow_on_submit": 0,
-      "bold": 0,
-      "collapsible": 0,
-      "columns": 0,
-      "fetch_if_empty": 0,
-      "fieldname": "is_opening",
-      "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": "Is Opening",
-      "length": 0,
-      "no_copy": 0,
-      "options": "No\nYes",
-      "permlevel": 0,
-      "precision": "",
-      "print_hide": 0,
-      "print_hide_if_no_value": 0,
-      "read_only": 0,
-      "remember_last_selected_value": 0,
-      "report_hide": 0,
-      "reqd": 0,
-      "search_index": 0,
-      "set_only_once": 0,
-      "translatable": 0,
-      "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "project",
-     "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": "Project",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Link",
-     "options": "Project",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "remarks",
-     "fieldtype": "Text",
-     "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": "Remarks",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "remarks",
-     "oldfieldtype": "Text",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "col5",
-     "fieldtype": "Column 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,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "print_width": "50%",
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0,
-     "width": "50%"
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "",
-     "fetch_if_empty": 0,
-     "fieldname": "per_transferred",
-     "fieldtype": "Percent",
-     "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": "Per Transferred",
-     "length": 0,
-     "no_copy": 1,
-     "options": "",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "total_amount",
-     "fetch_if_empty": 0,
-     "fieldname": "total_amount",
-     "fieldtype": "Currency",
-     "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": "Total Amount",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Company:company:default_currency",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 1,
-     "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_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "job_card",
-     "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": "Job Card",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Job Card",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "amended_from",
-     "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": "Amended From",
-     "length": 0,
-     "no_copy": 1,
-     "oldfieldname": "amended_from",
-     "oldfieldtype": "Link",
-     "options": "Stock Entry",
-     "permlevel": 0,
-     "print_hide": 1,
-     "print_hide_if_no_value": 0,
-     "read_only": 1,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 0,
-     "search_index": 0,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "credit_note",
-     "fieldtype": "Link",
-     "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": "Credit Note",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Journal Entry",
-     "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
-    }
-   ],
-   "has_web_view": 0,
-   "hide_toolbar": 0,
-   "icon": "fa fa-file-text",
-   "idx": 1,
-   "in_create": 0,
-   "is_submittable": 1,
-   "issingle": 0,
-   "istable": 0,
-   "max_attachments": 0,
-   "modified": "2019-05-23 12:24:46.439626",
-   "modified_by": "Administrator",
-   "module": "Stock",
-   "name": "Stock Entry",
-   "owner": "Administrator",
-   "permissions": [
-    {
-     "amend": 1,
-     "cancel": 1,
-     "create": 1,
-     "delete": 1,
-     "email": 1,
-     "export": 0,
-     "if_owner": 0,
-     "import": 0,
-     "permlevel": 0,
-     "print": 1,
-     "read": 1,
-     "report": 1,
-     "role": "Stock User",
-     "set_user_permissions": 0,
-     "share": 1,
-     "submit": 1,
-     "write": 1
-    },
-    {
-     "amend": 1,
-     "cancel": 1,
-     "create": 1,
-     "delete": 1,
-     "email": 1,
-     "export": 0,
-     "if_owner": 0,
-     "import": 0,
-     "permlevel": 0,
-     "print": 1,
-     "read": 1,
-     "report": 1,
-     "role": "Manufacturing User",
-     "set_user_permissions": 0,
-     "share": 1,
-     "submit": 1,
-     "write": 1
-    },
-    {
-     "amend": 1,
-     "cancel": 1,
-     "create": 1,
-     "delete": 1,
-     "email": 1,
-     "export": 0,
-     "if_owner": 0,
-     "import": 0,
-     "permlevel": 0,
-     "print": 1,
-     "read": 1,
-     "report": 1,
-     "role": "Manufacturing Manager",
-     "set_user_permissions": 0,
-     "share": 1,
-     "submit": 1,
-     "write": 1
-    },
-    {
-     "amend": 1,
-     "cancel": 1,
-     "create": 1,
-     "delete": 1,
-     "email": 1,
-     "export": 1,
-     "if_owner": 0,
-     "import": 1,
-     "permlevel": 0,
-     "print": 1,
-     "read": 1,
-     "report": 1,
-     "role": "Stock Manager",
-     "set_user_permissions": 1,
-     "share": 1,
-     "submit": 1,
-     "write": 1
-    }
-   ],
-   "quick_entry": 0,
-   "read_only": 0,
-   "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks",
-   "show_name_in_global_search": 1,
-   "sort_field": "modified",
-   "sort_order": "DESC",
-   "title_field": "title",
-   "track_changes": 1,
-   "track_seen": 0,
-   "track_views": 0
-  }
\ No newline at end of file
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "project",
+    "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": "Project",
+    "length": 0,
+    "no_copy": 0,
+    "oldfieldtype": "Link",
+    "options": "Project",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "remarks",
+    "fieldtype": "Text",
+    "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": "Remarks",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "remarks",
+    "oldfieldtype": "Text",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "col5",
+    "fieldtype": "Column 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,
+    "print_hide": 0,
+    "print_hide_if_no_value": 0,
+    "print_width": "50%",
+    "read_only": 0,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0,
+    "width": "50%"
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "",
+    "fetch_if_empty": 0,
+    "fieldname": "per_transferred",
+    "fieldtype": "Percent",
+    "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": "Per Transferred",
+    "length": 0,
+    "no_copy": 1,
+    "options": "",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 1,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "depends_on": "total_amount",
+    "fetch_if_empty": 0,
+    "fieldname": "total_amount",
+    "fieldtype": "Currency",
+    "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": "Total Amount",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Company:company:default_currency",
+    "permlevel": 0,
+    "print_hide": 0,
+    "print_hide_if_no_value": 1,
+    "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_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "job_card",
+    "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": "Job Card",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Job Card",
+    "permlevel": 0,
+    "precision": "",
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 1,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "amended_from",
+    "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": "Amended From",
+    "length": 0,
+    "no_copy": 1,
+    "oldfieldname": "amended_from",
+    "oldfieldtype": "Link",
+    "options": "Stock Entry",
+    "permlevel": 0,
+    "print_hide": 1,
+    "print_hide_if_no_value": 0,
+    "read_only": 1,
+    "remember_last_selected_value": 0,
+    "report_hide": 0,
+    "reqd": 0,
+    "search_index": 0,
+    "set_only_once": 0,
+    "translatable": 0,
+    "unique": 0
+   },
+   {
+    "allow_bulk_edit": 0,
+    "allow_in_quick_entry": 0,
+    "allow_on_submit": 0,
+    "bold": 0,
+    "collapsible": 0,
+    "columns": 0,
+    "fetch_if_empty": 0,
+    "fieldname": "credit_note",
+    "fieldtype": "Link",
+    "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": "Credit Note",
+    "length": 0,
+    "no_copy": 0,
+    "options": "Journal Entry",
+    "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
+   }
+  ],
+  "has_web_view": 0,
+  "hide_toolbar": 0,
+  "icon": "fa fa-file-text",
+  "idx": 1,
+  "in_create": 0,
+  "is_submittable": 1,
+  "issingle": 0,
+  "istable": 0,
+  "max_attachments": 0,
+  "modified": "2019-05-23 12:24:46.439626",
+  "modified_by": "Administrator",
+  "module": "Stock",
+  "name": "Stock Entry",
+  "owner": "Administrator",
+  "permissions": [
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "export": 0,
+    "if_owner": 0,
+    "import": 0,
+    "permlevel": 0,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Stock User",
+    "set_user_permissions": 0,
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   },
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "export": 0,
+    "if_owner": 0,
+    "import": 0,
+    "permlevel": 0,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Manufacturing User",
+    "set_user_permissions": 0,
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   },
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "export": 0,
+    "if_owner": 0,
+    "import": 0,
+    "permlevel": 0,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Manufacturing Manager",
+    "set_user_permissions": 0,
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   },
+   {
+    "amend": 1,
+    "cancel": 1,
+    "create": 1,
+    "delete": 1,
+    "email": 1,
+    "export": 1,
+    "if_owner": 0,
+    "import": 1,
+    "permlevel": 0,
+    "print": 1,
+    "read": 1,
+    "report": 1,
+    "role": "Stock Manager",
+    "set_user_permissions": 1,
+    "share": 1,
+    "submit": 1,
+    "write": 1
+   }
+  ],
+  "quick_entry": 0,
+  "read_only": 0,
+  "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks",
+  "show_name_in_global_search": 1,
+  "sort_field": "modified",
+  "sort_order": "DESC",
+  "title_field": "title",
+  "track_changes": 1,
+  "track_seen": 0,
+  "track_views": 0
+ }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 464101e..0abcbb3 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -324,8 +324,10 @@
 			completed_qty = d.completed_qty + (allowance_percentage/100 * d.completed_qty)
 			if total_completed_qty > flt(completed_qty):
 				job_card = frappe.db.get_value('Job Card', {'operation_id': d.name}, 'name')
-				frappe.throw(_("Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order # {3}. Please update operation status via Job Card # {4}")
-					.format(d.idx, d.operation, total_completed_qty, self.work_order, job_card), OperationsNotCompleteError)
+				work_order_link = frappe.utils.get_link_to_form('Work Order', self.work_order)
+				job_card_link = frappe.utils.get_link_to_form('Job Card', job_card)
+				frappe.throw(_("Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}.")
+					.format(d.idx, frappe.bold(d.operation), frappe.bold(total_completed_qty), work_order_link, job_card_link), OperationsNotCompleteError)
 
 	def check_duplicate_entry_for_work_order(self):
 		other_ste = [t[0] for t in frappe.db.get_values("Stock Entry",  {
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index e05b320..c989907 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -1,926 +1,955 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2013-06-24 16:37:54", 
- "custom": 0, 
- "description": "Settings", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 0, 
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "",
+ "beta": 0,
+ "creation": "2013-06-24 16:37:54",
+ "custom": 0,
+ "description": "Settings",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "editable_grid": 0,
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Item Code", 
-   "fieldname": "item_naming_by", 
-   "fieldtype": "Select", 
-   "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": "Item Naming By", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Code\nNaming Series", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Item Code",
+   "fetch_if_empty": 0,
+   "fieldname": "item_naming_by",
+   "fieldtype": "Select",
+   "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": "Item Naming By",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item Code\nNaming Series",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "item_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": "Default Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Group", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "",
+   "fetch_if_empty": 0,
+   "fieldname": "item_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": "Default Item Group",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Item Group",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_uom", 
-   "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": "Default Stock UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Default Stock UOM",
+   "length": 0,
+   "no_copy": 0,
+   "options": "UOM",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "default_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": "Default Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "default_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": "Default Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "default_return_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": "Default Return Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "sample_retention_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": "Sample Retention Warehouse",
+   "length": 0,
+   "no_copy": 0,
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sample_retention_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": "Sample Retention Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_4",
+   "fieldtype": "Column 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,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column 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, 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "valuation_method",
+   "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": "Default Valuation Method",
+   "length": 0,
+   "no_copy": 0,
+   "options": "FIFO\nMoving Average",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "valuation_method", 
-   "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": "Default Valuation Method", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "FIFO\nMoving Average", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.",
+   "fetch_if_empty": 0,
+   "fieldname": "tolerance",
+   "fieldtype": "Float",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Limit Percent",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.", 
-   "fieldname": "tolerance", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Limit Percent", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Stop",
+   "fetch_if_empty": 0,
+   "fieldname": "action_if_quality_inspection_is_not_submitted",
+   "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": "Action if Quality inspection is not submitted",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Stop\nWarn",
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "show_barcode_field", 
-   "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": "Show Barcode Field", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fetch_if_empty": 0,
+   "fieldname": "show_barcode_field",
+   "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": "Show Barcode Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "clean_description_html", 
-   "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": "Convert Item Description to Clean HTML", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fetch_if_empty": 0,
+   "fieldname": "clean_description_html",
+   "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": "Convert Item Description to Clean HTML",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_7",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "auto_insert_price_list_rate_if_missing", 
-   "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": "Auto insert Price List rate if missing", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "auto_insert_price_list_rate_if_missing",
+   "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": "Auto insert Price List rate if missing",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_negative_stock", 
-   "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 Negative Stock", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "allow_negative_stock",
+   "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 Negative Stock",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column 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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_10",
+   "fieldtype": "Column 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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "automatically_set_serial_nos_based_on_fifo", 
-   "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": "Automatically Set Serial Nos based on FIFO", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fetch_if_empty": 0,
+   "fieldname": "automatically_set_serial_nos_based_on_fifo",
+   "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": "Automatically Set Serial Nos based on FIFO",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "set_qty_in_transactions_based_on_serial_no_input", 
-   "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": "Set Qty in Transactions based on Serial No Input", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fetch_if_empty": 0,
+   "fieldname": "set_qty_in_transactions_based_on_serial_no_input",
+   "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": "Set Qty in Transactions based on Serial No Input",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "auto_material_request", 
-   "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": "Auto Material Request", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "auto_material_request",
+   "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": "Auto Material Request",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "auto_indent", 
-   "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": "Raise Material Request when stock reaches re-order level", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "auto_indent",
+   "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": "Raise Material Request when stock reaches re-order level",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reorder_email_notify", 
-   "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": "Notify by Email on creation of automatic Material Request", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "reorder_email_notify",
+   "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": "Notify by Email on creation of automatic Material Request",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "freeze_stock_entries", 
-   "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": "Freeze Stock Entries", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "freeze_stock_entries",
+   "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": "Freeze Stock Entries",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_frozen_upto", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Stock Frozen Upto", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "stock_frozen_upto",
+   "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Stock Frozen Upto",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_frozen_upto_days", 
-   "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": "Freeze Stocks Older Than [Days]", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "stock_frozen_upto_days",
+   "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": "Freeze Stocks Older Than [Days]",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "stock_auth_role", 
-   "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": "Role Allowed to edit frozen stock", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Role", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "stock_auth_role",
+   "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": "Role Allowed to edit frozen stock",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Role",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "batch_id_sb", 
-   "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": "Batch Identification", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "batch_id_sb",
+   "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": "Batch Identification",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "use_naming_series", 
-   "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": "Use Naming Series", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "fetch_if_empty": 0,
+   "fieldname": "use_naming_series",
+   "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": "Use Naming Series",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "BATCH-", 
-   "depends_on": "eval:doc.use_naming_series==1", 
-   "fieldname": "naming_series_prefix", 
-   "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": "Naming Series Prefix", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "BATCH-",
+   "depends_on": "eval:doc.use_naming_series==1",
+   "fetch_if_empty": 0,
+   "fieldname": "naming_series_prefix",
+   "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": "Naming Series Prefix",
+   "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
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-cog", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-09-25 01:19:07.738045", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Stock Settings", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-cog",
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-06-18 01:19:07.738045",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Stock Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 0,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 0,
+   "role": "Stock Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0, 
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_order": "ASC",
+ "track_changes": 0,
+ "track_seen": 0,
  "track_views": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 57256c8..6cdb56b 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, erpnext
-from frappe.utils import cint
+from frappe.utils import cint, nowdate
 from frappe import throw, _
 from frappe.utils.nestedset import NestedSet
 from erpnext.stock import get_warehouse_account
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index fe2e0a4..f1d784c 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -321,8 +321,21 @@
 			out["manufacturer_part_no"] = None
 			out["manufacturer"] = None
 
+	child_doctype = args.doctype + ' Item'
+	meta = frappe.get_meta(child_doctype)
+	if meta.get_field("barcode"):
+		update_barcode_value(out)
+
 	return out
 
+def update_barcode_value(out):
+	from erpnext.accounts.doctype.sales_invoice.pos import get_barcode_data
+	barcode_data = get_barcode_data([out])
+
+	# If item has one barcode then update the value of the barcode field
+	if barcode_data and len(barcode_data.get(out.item_code)) == 1:
+		out['barcode'] = barcode_data.get(out.item_code)[0]
+
 @frappe.whitelist()
 def get_item_tax_info(company, tax_category, item_codes):
 	out = {}
@@ -651,6 +664,10 @@
 def get_party_item_code(args, item_doc, out):
 	if args.transaction_type=="selling" and args.customer:
 		out.customer_item_code = None
+
+		if args.quotation_to and args.quotation_to != 'Customer':
+			return
+
 		customer_item_code = item_doc.get("customer_items", {"customer_name": args.customer})
 
 		if customer_item_code:
diff --git a/erpnext/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js
index fc86989..da21c6b 100644
--- a/erpnext/stock/page/stock_balance/stock_balance.js
+++ b/erpnext/stock/page/stock_balance/stock_balance.js
@@ -1,7 +1,7 @@
 frappe.pages['stock-balance'].on_page_load = function(wrapper) {
 	var page = frappe.ui.make_app_page({
 		parent: wrapper,
-		title: 'Stock Summary',
+		title: __('Stock Summary'),
 		single_column: true
 	});
 	page.start = 0;
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.js b/erpnext/stock/report/delayed_item_report/delayed_item_report.js
index 5d160b1..40e6abe 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.js
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.js
@@ -55,8 +55,8 @@
 			label: __("Based On"),
 			fieldtype: "Select",
 			options: ["Delivery Note", "Sales Invoice"],
-			default: "Delivery Note",
+			default: "Sales Invoice",
 			reqd: 1
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.json b/erpnext/stock/report/delayed_item_report/delayed_item_report.json
index f336cec..f5b64a4 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.json
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.json
@@ -7,7 +7,7 @@
  "doctype": "Report",
  "idx": 0,
  "is_standard": "Yes",
- "letter_head": "Gadgets International",
+ "letter_head": "",
  "modified": "2019-06-17 12:45:07.324014",
  "modified_by": "Administrator",
  "module": "Stock",
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.py b/erpnext/stock/report/delayed_item_report/delayed_item_report.py
index 7b968b8..4fc4027 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.py
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.py
@@ -46,7 +46,8 @@
 		self.transactions = frappe.db.sql(""" SELECT `tab{child_doc}`.item_code, `tab{child_doc}`.item_name,
 				`tab{child_doc}`.item_group, `tab{child_doc}`.qty, `tab{child_doc}`.rate, `tab{child_doc}`.amount,
 				`tab{child_doc}`.so_detail, `tab{child_doc}`.{so_field} as sales_order,
-				`tab{doctype}`.customer, `tab{doctype}`.posting_date, `tab{doctype}`.name, `tab{doctype}`.grand_total
+				`tab{doctype}`.shipping_address_name, `tab{doctype}`.po_no, `tab{doctype}`.customer,
+				`tab{doctype}`.posting_date, `tab{doctype}`.name, `tab{doctype}`.grand_total
 			FROM `tab{child_doc}`, `tab{doctype}`
 			WHERE
 				`tab{child_doc}`.parent = `tab{doctype}`.name and `tab{doctype}`.docstatus = 1 and
@@ -97,12 +98,20 @@
 			"fieldtype": "Link",
 			"options": based_on,
 			"width": 100
-		},{
+		},
+		{
 			"label": _("Customer"),
 			"fieldname": "customer",
 			"fieldtype": "Link",
 			"options": "Customer",
-			"width": 100
+			"width": 200
+		},
+		{
+			"label": _("Shipping Address"),
+			"fieldname": "shipping_address_name",
+			"fieldtype": "Link",
+			"options": "Address",
+			"width": 120
 		},
 		{
 			"label": _("Expected Delivery Date"),
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.js b/erpnext/stock/report/delayed_order_report/delayed_order_report.js
index 11752ae..aab0f3d 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.js
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.js
@@ -55,8 +55,8 @@
 			label: __("Based On"),
 			fieldtype: "Select",
 			options: ["Delivery Note", "Sales Invoice"],
-			default: "Delivery Note",
+			default: "Sales Invoice",
 			reqd: 1
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.json b/erpnext/stock/report/delayed_order_report/delayed_order_report.json
index 29c27cb..327ee6a 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.json
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.json
@@ -7,7 +7,7 @@
  "doctype": "Report",
  "idx": 0,
  "is_standard": "Yes",
- "letter_head": "Gadgets International",
+ "letter_head": "",
  "modified": "2019-06-17 12:45:56.359322",
  "modified_by": "Administrator",
  "module": "Stock",
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.py b/erpnext/stock/report/delayed_order_report/delayed_order_report.py
index d2a1a30..79dc5d8 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.py
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.py
@@ -42,7 +42,14 @@
 			"fieldname": "customer",
 			"fieldtype": "Link",
 			"options": "Customer",
-			"width": 100
+			"width": 200
+		},
+		{
+			"label": _("Shipping Address"),
+			"fieldname": "shipping_address_name",
+			"fieldtype": "Link",
+			"options": "Address",
+			"width": 140
 		},
 		{
 			"label": _("Expected Delivery Date"),
@@ -73,11 +80,11 @@
 			"fieldname": "sales_order",
 			"fieldtype": "Link",
 			"options": "Sales Order",
-			"width": 100
+			"width": 150
 		},
 		{
 			"label": _("Customer PO"),
 			"fieldname": "po_no",
 			"fieldtype": "Data",
-			"width": 100
+			"width": 110
 		}]
\ No newline at end of file
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index a810ddd..d386230 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -22,12 +22,8 @@
 	for sle in sl_entries:
 		item_detail = item_details[sle.item_code]
 
-		data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group,
-			item_detail.brand, item_detail.description, sle.warehouse,
-			item_detail.stock_uom, sle.actual_qty, sle.qty_after_transaction,
-			(sle.incoming_rate if sle.actual_qty > 0 else 0.0),
-			sle.valuation_rate, sle.stock_value, sle.voucher_type, sle.voucher_no,
-			sle.batch_no, sle.serial_no, sle.project, sle.company])
+		sle.update(item_detail)
+		data.append(sle)
 
 		if include_uom:
 			conversion_factors.append(item_detail.conversion_factor)
diff --git a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
index 2a02b46..6a86889 100644
--- a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
+++ b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
@@ -94,9 +94,13 @@
 				item_supplier_map.setdefault(d.item_code, []).append(d.supplier)
 
 	if supplier:
+		invalid_items = []
 		for item_code, suppliers in iteritems(item_supplier_map):
 			if supplier not in suppliers:
-				del item_supplier_map[item_code]
+				invalid_items.append(item_code)
+
+		for item_code in invalid_items:
+			del item_supplier_map[item_code]
 
 	return item_supplier_map
 
diff --git a/erpnext/stock/report/total_stock_summary/total_stock_summary.js b/erpnext/stock/report/total_stock_summary/total_stock_summary.js
index 90648f1..2646428 100644
--- a/erpnext/stock/report/total_stock_summary/total_stock_summary.js
+++ b/erpnext/stock/report/total_stock_summary/total_stock_summary.js
@@ -38,4 +38,4 @@
 			"reqd": 1
 		},
 	]
-}
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 3ad5153..b7c4166 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -69,7 +69,8 @@
    "fieldtype": "Data",
    "in_global_search": 1,
    "label": "Subject",
-   "reqd": 1
+   "reqd": 1,
+   "in_standard_filter": 1
   },
   {
    "fieldname": "customer",
@@ -336,7 +337,7 @@
  ],
  "icon": "fa fa-ticket",
  "idx": 7,
- "modified": "2019-05-20 15:19:00.771333",
+ "modified": "2019-06-27 15:19:00.771333",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Issue",
@@ -361,4 +362,4 @@
  "timeline_field": "customer",
  "title_field": "subject",
  "track_seen": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 3b703d9..93f13f1 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -12,7 +12,6 @@
 from frappe.model.mapper import get_mapped_doc
 from frappe.utils.user import is_website_user
 from erpnext.support.doctype.service_level_agreement.service_level_agreement import get_active_service_level_agreement_for
-from erpnext.crm.doctype.opportunity.opportunity import assign_to_user
 from frappe.email.inbox import link_communication_to_document
 
 sender_field = "raised_by"
@@ -39,9 +38,6 @@
 			self.create_communication()
 			self.flags.communication_created = None
 
-		# assign to customer account manager or lead owner
-		assign_to_user(self, 'subject')
-
 	def set_lead_contact(self, email_id):
 		import email.utils
 
diff --git a/erpnext/support/doctype/issue/test_issue.py b/erpnext/support/doctype/issue/test_issue.py
index 1296b36..75d70b1 100644
--- a/erpnext/support/doctype/issue/test_issue.py
+++ b/erpnext/support/doctype/issue/test_issue.py
@@ -8,15 +8,8 @@
 from frappe.utils import now_datetime, get_datetime
 import datetime
 from datetime import timedelta
-from frappe.desk.form import assign_to
 
 class TestIssue(unittest.TestCase):
-	def test_assignment(self):
-		frappe.db.set_value('Customer', '_Test Customer', 'account_manager', 'test1@example.com')
-		doc = make_issue(customer='_Test Customer')
-		self.assertEqual(assign_to.get(dict(doctype = doc.doctype, name = doc.name))[0].get('owner'), 'test1@example.com')
-
-
 	def test_response_time_and_resolution_time_based_on_different_sla(self):
 		create_service_level_agreements_for_issues()
 
diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
index 3b06d16..82c0ffb 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
@@ -18,7 +18,7 @@
 				if self.start_date >= self.end_date:
 					frappe.throw(_("Start Date of Agreement can't be greater than or equal to End Date."))
 
-				if self.end_date < frappe.utils.nowdate():
+				if self.end_date < frappe.utils.getdate():
 					frappe.throw(_("End Date of Agreement can't be less than today."))
 
 		if self.entity_type and self.entity:
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
new file mode 100644
index 0000000..af98fc7
--- /dev/null
+++ b/erpnext/templates/includes/product_page.js
@@ -0,0 +1,217 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+frappe.ready(function() {
+	window.item_code = $('[itemscope] [itemprop="productID"]').text().trim();
+	var qty = 0;
+
+	frappe.call({
+		type: "POST",
+		method: "erpnext.shopping_cart.product_info.get_product_info_for_website",
+		args: {
+			item_code: get_item_code()
+		},
+		callback: function(r) {
+			if(r.message) {
+				if(r.message.cart_settings.enabled) {
+					let hide_add_to_cart = !r.message.product_info.price
+						|| (!r.message.product_info.in_stock && !r.message.cart_settings.allow_items_not_in_stock);
+					$(".item-cart, .item-price, .item-stock").toggleClass('hide', hide_add_to_cart);
+				}
+				if(r.message.cart_settings.show_price) {
+					$(".item-price").toggleClass("hide", false);
+				}
+				if(r.message.cart_settings.show_stock_availability) {
+					$(".item-stock").toggleClass("hide", false);
+				}
+				if(r.message.product_info.price) {
+					$(".item-price")
+						.html(r.message.product_info.price.formatted_price_sales_uom + "<div style='font-size: small'>\
+							(" + r.message.product_info.price.formatted_price + " / " + r.message.product_info.uom + ")</div>");
+
+					if(r.message.product_info.in_stock==0) {
+						$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>");
+					}
+					else if(r.message.product_info.in_stock==1) {
+						var qty_display = "{{ _("In stock") }}";
+						if (r.message.product_info.show_stock_qty) {
+							qty_display += " ("+r.message.product_info.stock_qty+")";
+						}
+						$(".item-stock").html("<div style='color: green'>\
+							<i class='fa fa-check'></i> "+qty_display+"</div>");
+					}
+
+					if(r.message.product_info.qty) {
+						qty = r.message.product_info.qty;
+						toggle_update_cart(r.message.product_info.qty);
+					} else {
+						toggle_update_cart(0);
+					}
+				}
+			}
+		}
+	})
+
+	$("#item-add-to-cart button").on("click", function() {
+		frappe.provide('erpnext.shopping_cart');
+
+		erpnext.shopping_cart.update_cart({
+			item_code: get_item_code(),
+			qty: $("#item-spinner .cart-qty").val(),
+			callback: function(r) {
+				if(!r.exc) {
+					toggle_update_cart(1);
+					qty = 1;
+				}
+			},
+			btn: this,
+		});
+	});
+
+	$("#item-spinner").on('click', '.number-spinner button', function () {
+		var btn = $(this),
+			input = btn.closest('.number-spinner').find('input'),
+			oldValue = input.val().trim(),
+			newVal = 0;
+
+		if (btn.attr('data-dir') == 'up') {
+			newVal = parseInt(oldValue) + 1;
+		} else if (btn.attr('data-dir') == 'dwn')  {
+			if (parseInt(oldValue) > 1) {
+				newVal = parseInt(oldValue) - 1;
+			}
+			else {
+				newVal = parseInt(oldValue);
+			}
+		}
+		input.val(newVal);
+	});
+
+	$("[itemscope] .item-view-attribute .form-control").on("change", function() {
+		try {
+			var item_code = encodeURIComponent(get_item_code());
+
+		} catch(e) {
+			// unable to find variant
+			// then chose the closest available one
+
+			var attribute = $(this).attr("data-attribute");
+			var attribute_value = $(this).val();
+			var item_code = find_closest_match(attribute, attribute_value);
+
+			if (!item_code) {
+				frappe.msgprint(__("Cannot find a matching Item. Please select some other value for {0}.", [attribute]))
+				throw e;
+			}
+		}
+
+		if (window.location.search == ("?variant=" + item_code) || window.location.search.includes(item_code)) {
+			return;
+		}
+
+		window.location.href = window.location.pathname + "?variant=" + item_code;
+	});
+
+	// change the item image src when alternate images are hovered
+	$(document.body).on('mouseover', '.item-alternative-image', (e) => {
+		const $alternative_image = $(e.currentTarget);
+		const src = $alternative_image.find('img').prop('src');
+		$('.item-image img').prop('src', src);
+	});
+});
+
+var toggle_update_cart = function(qty) {
+	$("#item-add-to-cart").toggle(qty ? false : true);
+	$("#item-update-cart")
+		.toggle(qty ? true : false)
+		.find("input").val(qty);
+	$("#item-spinner").toggle(qty ? false : true);
+}
+
+function get_item_code() {
+	var variant_info = window.variant_info;
+	if(variant_info) {
+		var attributes = get_selected_attributes();
+		var no_of_attributes = Object.keys(attributes).length;
+
+		for(var i in variant_info) {
+			var variant = variant_info[i];
+
+			if (variant.attributes.length < no_of_attributes) {
+				// the case when variant has less attributes than template
+				continue;
+			}
+
+			var match = true;
+			for(var j in variant.attributes) {
+				if(attributes[variant.attributes[j].attribute]
+					!= variant.attributes[j].attribute_value
+				) {
+					match = false;
+					break;
+				}
+			}
+			if(match) {
+				return variant.name;
+			}
+		}
+		throw "Unable to match variant";
+	} else {
+		return window.item_code;
+	}
+}
+
+function find_closest_match(selected_attribute, selected_attribute_value) {
+	// find the closest match keeping the selected attribute in focus and get the item code
+
+	var attributes = get_selected_attributes();
+
+	var previous_match_score = 0;
+	var previous_no_of_attributes = 0;
+	var matched;
+
+	var variant_info = window.variant_info;
+	for(var i in variant_info) {
+		var variant = variant_info[i];
+		var match_score = 0;
+		var has_selected_attribute = false;
+
+		for(var j in variant.attributes) {
+			if(attributes[variant.attributes[j].attribute]===variant.attributes[j].attribute_value) {
+				match_score = match_score + 1;
+
+				if (variant.attributes[j].attribute==selected_attribute && variant.attributes[j].attribute_value==selected_attribute_value) {
+					has_selected_attribute = true;
+				}
+			}
+		}
+
+		if (has_selected_attribute
+			&& ((match_score > previous_match_score) || (match_score==previous_match_score && previous_no_of_attributes < variant.attributes.length))) {
+			previous_match_score = match_score;
+			matched = variant;
+			previous_no_of_attributes = variant.attributes.length;
+
+
+		}
+	}
+
+	if (matched) {
+		for (var j in matched.attributes) {
+			var attr = matched.attributes[j];
+			$('[itemscope]')
+				.find(repl('.item-view-attribute .form-control[data-attribute="%(attribute)s"]', attr))
+				.val(attr.attribute_value);
+		}
+
+		return matched.name;
+	}
+}
+
+function get_selected_attributes() {
+	var attributes = {};
+	$('[itemscope]').find(".item-view-attribute .form-control").each(function() {
+		attributes[$(this).attr('data-attribute')] = $(this).val();
+	});
+	return attributes;
+}
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index cb44fd3..743657d 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -28,7 +28,7 @@
 
 	opportunity = frappe.get_doc(dict(
 		doctype ='Opportunity',
-		enquiry_from = 'Customer' if customer else 'Lead',
+		opportunity_from = 'Customer' if customer else 'Lead',
 		status = 'Open',
 		title = subject,
 		contact_email = sender,
@@ -36,11 +36,11 @@
 	))
 
 	if customer:
-		opportunity.customer = customer[0][0]
+		opportunity.party_name = customer[0][0]
 	elif lead:
-		opportunity.lead = lead
+		opportunity.party_name = lead
 	else:
-		opportunity.lead = new_lead.name
+		opportunity.party_name = new_lead.name
 
 	opportunity.insert(ignore_permissions=True)
 
diff --git a/erpnext/tests/test_search.py b/erpnext/tests/test_search.py
index ab8eca3..8a93b6a 100644
--- a/erpnext/tests/test_search.py
+++ b/erpnext/tests/test_search.py
@@ -4,12 +4,12 @@
 from frappe.contacts.address_and_contact import filter_dynamic_link_doctypes
 
 class TestSearch(unittest.TestCase):
-	#Search for the word "clie", part of the word "client" (customer) in french.
+	#Search for the word "cond", part of the word "conduire" (Lead) in french.
 	def test_contact_search_in_foreign_language(self):
 		frappe.local.lang = 'fr'
-		output = filter_dynamic_link_doctypes("DocType", "clie", "name", 0, 20, {'fieldtype': 'HTML', 'fieldname': 'contact_html'})
+		output = filter_dynamic_link_doctypes("DocType", "cond", "name", 0, 20, {'fieldtype': 'HTML', 'fieldname': 'contact_html'})
 
-		result = [['found' for x in y if x=="Customer"] for y in output]
+		result = [['found' for x in y if x=="Lead"] for y in output]
 		self.assertTrue(['found'] in result)
 
 	def tearDown(self):
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 72fa6d8..c951dfc 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Aanstelling {0} en Verkoopsfaktuur {1} gekanselleer
 DocType: Purchase Receipt,Vehicle Number,Voertuignommer
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Jou eposadres...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Sluit standaard boekinskrywings in
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Sluit standaard boekinskrywings in
 DocType: Activity Cost,Activity Type,Aktiwiteitstipe
 DocType: Purchase Invoice,Get Advances Paid,Kry vooruitbetalings betaal
 DocType: Company,Gain/Loss Account on Asset Disposal,Wins / Verliesrekening op Bateverkope
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Betalingsinskrywings
 DocType: Employee Education,Class / Percentage,Klas / Persentasie
 ,Electronic Invoice Register,Elektroniese faktuurregister
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Die aantal gebeurtenisse waarna die gevolg uitgevoer word.
 DocType: Sales Invoice,Is Return (Credit Note),Is Teruggawe (Kredietnota)
+DocType: Price List,Price Not UOM Dependent,Prys Nie UOM Afhanklik
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Voorbeeld
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Vir bv. 2012, 2012-13"
@@ -324,6 +326,7 @@
 DocType: Salary Slip,Net Pay,Netto salaris
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Totaal gefaktureerde Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Verbruiksgoedere Faktuur Afsonderlik
+DocType: Shift Type,Working Hours Threshold for Absent,Werksure Drempel vir Afwesig
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Begroting kan nie toegeken word teen Groeprekening {0}
 DocType: Purchase Receipt Item,Rate and Amount,Tarief en Bedrag
@@ -379,7 +382,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Uit pasiënt instellings
 DocType: Asset,Insurance End Date,Versekering Einddatum
 DocType: Bank Account,Branch Code,Takkode
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Tyd om te reageer
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Gebruikers Forum
 DocType: Landed Cost Item,Landed Cost Item,Landed Koste Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Die verkoper en die koper kan nie dieselfde wees nie
@@ -597,6 +599,7 @@
 DocType: Share Transfer,Transfer,oordrag
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Soek item (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Resultaat ingedien
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Vanaf datum kan nie groter wees as as tot op datum nie
 DocType: Supplier,Supplier of Goods or Services.,Verskaffer van goedere of dienste.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naam van nuwe rekening. Nota: skep asseblief nie rekeninge vir kliënte en verskaffers nie
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentegroep of Kursusskedule is verpligtend
@@ -878,7 +881,6 @@
 DocType: Skill,Skill Name,Vaardigheid Naam
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Druk verslagkaart
 DocType: Soil Texture,Ternary Plot,Ternêre Plot
-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 vir {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Ondersteuningskaartjies
 DocType: Asset Category Account,Fixed Asset Account,Vaste bate rekening
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Laaste
@@ -891,6 +893,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Verpligtend vir balansstaat
 DocType: Payment Entry,Total Allocated Amount,Totale toegewysde bedrag
 DocType: Sales Invoice,Get Advances Received,Kry voorskotte ontvang
+DocType: Shift Type,Last Sync of Checkin,Laaste sinchronisasie van tjek
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Item Belasting Bedrag Ingesluit in Waarde
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -899,7 +902,9 @@
 DocType: Student,Blood Group,Bloedgroep
 apps/erpnext/erpnext/config/healthcare.py,Masters,meesters
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Die tyd na die verskuiwing begin wanneer die inskrywing as laat (in minute) beskou word.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,verken
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Geen uitstaande fakture gevind nie
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vakatures en {1} begroting vir {2} wat reeds beplan is vir filiaalmaatskappye van {3}. U kan slegs vir {4} vakatures en begroting {5} soos per personeelplan {6} vir ouermaatskappy {3} beplan.
 DocType: Promotional Scheme,Product Discount Slabs,Produk Afslagplatte
@@ -1001,6 +1006,7 @@
 DocType: Item,Moving Average,Beweeg gemiddeld
 DocType: Employee Attendance Tool,Unmarked Attendance,Ongemerkte Bywoning
 DocType: Homepage Section,Number of Columns,Aantal kolomme
+DocType: Issue Priority,Issue Priority,Uitgawe Prioriteit
 DocType: Holiday List,Add Weekly Holidays,Voeg weeklikse vakansies by
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Skep Salaris Slip
@@ -1009,6 +1015,7 @@
 DocType: Warranty Claim,Issue Date,Uitreikings datum
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Kies asseblief &#39;n bondel vir item {0}. Kan nie &#39;n enkele bondel vind wat aan hierdie vereiste voldoen nie
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Kan nie Retensiebonus vir linkse werknemers skep nie
+DocType: Employee Checkin,Location / Device ID,Plek / toestel ID
 DocType: Purchase Order,To Receive,Om te ontvang
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Jy is in die aflyn modus. Jy sal nie kan herlaai voordat jy netwerk het nie.
 DocType: Course Activity,Enrollment,inskrywing
@@ -1017,7 +1024,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maks: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-faktuur inligting ontbreek
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Geen wesenlike versoek geskep nie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 DocType: Loan,Total Amount Paid,Totale bedrag betaal
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Al hierdie items is reeds gefaktureer
 DocType: Training Event,Trainer Name,Afrigter Naam
@@ -1127,6 +1133,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Noem asseblief die Lood Naam in Lood {0}
 DocType: Employee,You can enter any date manually,U kan enige datum handmatig invoer
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraadversoening Item
+DocType: Shift Type,Early Exit Consequence,Vroeë Uitgang Gevolg
 DocType: Item Group,General Settings,Algemene instellings
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Betaaldatum kan nie voor die datum van inboeking / verskaffer se faktuur wees nie
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Vul die naam van die Begunstigde in voordat u dit ingedien het.
@@ -1165,6 +1172,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Bevestiging van betaling
 ,Available Stock for Packing Items,Beskikbare voorraad vir verpakking items
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Verwyder asseblief hierdie faktuur {0} uit C-vorm {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Elke Geldige Check-in en Check-out
 DocType: Support Search Source,Query Route String,Query Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Sjabloon Customer Feedback
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Aanhalings aan Leads of Customers.
@@ -1199,6 +1207,7 @@
 DocType: Authorization Control,Authorization Control,Magtigingskontrole
 ,Daily Work Summary Replies,Daaglikse werkopsomming Antwoorde
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},U is genooi om saam te werk aan die projek: {0}
+DocType: Issue,Response By Variance,Reaksie Deur Variansie
 DocType: Item,Sales Details,Verkoopsbesonderhede
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Briefhoofde vir druk sjablone.
 DocType: Salary Detail,Tax on additional salary,Belasting op addisionele salaris
@@ -1322,6 +1331,7 @@
 DocType: Project,Task Progress,Taak vordering
 DocType: Journal Entry,Opening Entry,Openingsinskrywing
 DocType: Bank Guarantee,Charges Incurred,Heffings ingesluit
+DocType: Shift Type,Working Hours Calculation Based On,Werksure Berekening Gebaseer Op
 DocType: Work Order,Material Transferred for Manufacturing,Materiaal oorgedra vir Vervaardiging
 DocType: Products Settings,Hide Variants,Versteek varianten
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Skakel kapasiteitsbeplanning en tydopsporing uit
@@ -1351,6 +1361,7 @@
 DocType: Guardian,Interests,Belange
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbruikte hoeveelheid
 DocType: Education Settings,Education Manager,Onderwysbestuurder
+DocType: Employee Checkin,Shift Actual Start,Shift Werklike Begin
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Beplan tydstamme buite Werkstasie Werksure.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Lojaliteit punte: {0}
 DocType: Healthcare Settings,Registration Message,Registrasie Boodskap
@@ -1375,9 +1386,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Faktuur wat reeds vir alle faktuurure geskep is
 DocType: Sales Partner,Contact Desc,Kontak Desc
 DocType: Purchase Invoice,Pricing Rules,Prys reëls
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Aangesien daar bestaande transaksies teen item {0} is, kan u nie die waarde van {1} verander nie"
 DocType: Hub Tracked Item,Image List,Prentelys
 DocType: Item Variant Settings,Allow Rename Attribute Value,Laat die kenmerkwaarde van hernoem
-DocType: Price List,Price Not UOM Dependant,Prys Nie UOM Afhanklik
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Tyd (in mins)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,basiese
 DocType: Loan,Interest Income Account,Rente Inkomsterekening
@@ -1387,6 +1398,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Kies POS-profiel
 DocType: Support Settings,Get Latest Query,Kry nuutste navraag
 DocType: Employee Incentive,Employee Incentive,Werknemers aansporing
+DocType: Service Level,Priorities,prioriteite
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Voeg kaarte of persoonlike afdelings op tuisblad
 DocType: Homepage,Hero Section Based On,Heldafdeling gebaseer op
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale Aankoopprys (via Aankoopfaktuur)
@@ -1447,7 +1459,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Bestelde Hoeveelheid
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ry # {0}: Afgekeurde pakhuis is verpligtend teen verwerp item {1}
 ,Received Items To Be Billed,Items ontvang om gefaktureer te word
-DocType: Salary Slip Timesheet,Working Hours,Werksure
+DocType: Attendance,Working Hours,Werksure
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Betaal af
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Bestelling Items wat nie betyds ontvang is nie
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Duur in Dae
@@ -1566,7 +1578,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutêre inligting en ander algemene inligting oor u Verskaffer
 DocType: Item Default,Default Selling Cost Center,Standaard verkoopkostesentrum
 DocType: Sales Partner,Address & Contacts,Adres &amp; Kontakte
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 DocType: Subscriber,Subscriber,intekenaar
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Vorm / Item / {0}) is uit voorraad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Kies asseblief die Pos Datum eerste
@@ -1577,7 +1588,7 @@
 DocType: Detected Disease,Tasks Created,Take geskep
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Standaard BOM ({0}) moet vir hierdie item of sy sjabloon aktief wees
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Kommissie Koers%
-DocType: Service Level,Response Time,Reaksie tyd
+DocType: Service Level Priority,Response Time,Reaksie tyd
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-instellings
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Hoeveelheid moet positief wees
 DocType: Contract,CRM,CRM
@@ -1594,7 +1605,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Transaksiedata-kartering
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,&#39;N Lood vereis &#39;n persoon se naam of &#39;n organisasie se naam
 DocType: Student,Guardians,voogde
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys&gt; Onderwys instellings
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Kies Brand ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Middelinkomste
 DocType: Shipping Rule,Calculate Based On,Bereken Gebaseer Op
@@ -1630,6 +1640,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Bywoningsrekord {0} bestaan teen Student {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Datum van transaksie
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Kanselleer intekening
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Kon nie diensvlakooreenkoms {0} stel nie.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Netto Salaris Bedrag
 DocType: Account,Liability,aanspreeklikheid
 DocType: Employee,Bank A/C No.,Bank A / C No.
@@ -1695,7 +1706,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstowwe Itemkode
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Aankoopfaktuur {0} is reeds ingedien
 DocType: Fees,Student Email,Student e-pos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} kan nie ouer of kind van {2} wees nie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Kry items van gesondheidsorgdienste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Voorraadinskrywing {0} is nie ingedien nie
 DocType: Item Attribute Value,Item Attribute Value,Item Attribuutwaarde
@@ -1720,7 +1730,6 @@
 DocType: Production Plan,Select Items to Manufacture,Kies items om te vervaardig
 DocType: Leave Application,Leave Approver Name,Verlaat Goedgekeur Naam
 DocType: Shareholder,Shareholder,aandeelhouer
-DocType: Issue,Agreement Status,Ooreenkoms Status
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Verstekinstellings vir verkoopstransaksies.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Kies asseblief Studentetoelating wat verpligtend is vir die betaalde studenteversoeker
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Kies BOM
@@ -1981,6 +1990,7 @@
 DocType: Account,Income Account,Inkomsterekening
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Alle pakhuise
 DocType: Contract,Signee Details,Signee Besonderhede
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Laat uitrekening na skuif eindtyd (in minute)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,verkryging
 DocType: Item Group,Check this if you want to show in website,Kontroleer dit as jy op die webwerf wil wys
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiskale jaar {0} nie gevind nie
@@ -2046,6 +2056,7 @@
 DocType: Activity Cost,Billing Rate,Rekeningkoers
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Waarskuwing: Nog {0} # {1} bestaan teen voorraadinskrywings {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Aktiveer asseblief Google Maps-instellings om roetes te skat en te optimaliseer
+DocType: Purchase Invoice Item,Page Break,Blad breek
 DocType: Supplier Scorecard Criteria,Max Score,Maksimum telling
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Terugbetaling Begindatum kan nie voor Uitbetalingsdatum wees nie.
 DocType: Support Search Source,Support Search Source,Ondersteun soekbron
@@ -2114,6 +2125,7 @@
 DocType: Employee Transfer,Employee Transfer,Werknemersoordrag
 ,Sales Funnel,Verkope trechter
 DocType: Agriculture Analysis Criteria,Water Analysis,Water Analise
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Begin inskrywing voor skof begin tyd (in minute)
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeninge Bevrore Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Daar is niks om te wysig nie.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasie {0} langer as enige beskikbare werksure in werkstasie {1}, breek die operasie in verskeie bewerkings af"
@@ -2127,7 +2139,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Verkoopsbestelling {0} is {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Vertraging in betaling (Dae)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Voer waardeverminderingsbesonderhede in
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Kliënt Pos
 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/controllers/accounts_controller.py,Item quantity can not be zero,Itemhoeveelheid kan nie nul wees nie
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ongeldige kenmerk
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Kies asseblief BOM teen item {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Faktuur Tipe
@@ -2137,6 +2151,7 @@
 DocType: Volunteer,Afternoon,middag
 DocType: Vital Signs,Nutrition Values,Voedingswaardes
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Teenwoordigheid van &#39;n koors (temp&gt; 38.5 ° C / 101.3 ° F of volgehoue temperatuur&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die werknemersnaamstelsel in menslike hulpbronne&gt; HR-instellings
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Omgekeer
 DocType: Project,Collect Progress,Versamel vordering
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,energie
@@ -2186,6 +2201,7 @@
 ,Ordered Items To Be Billed,Bestelde items wat gefaktureer moet word
 DocType: Taxable Salary Slab,To Amount,Om Bedrag
 DocType: Purchase Invoice,Is Return (Debit Note),Is Terugbetaling (Debiet Nota)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Aan die gang kom
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,saam te smelt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Kan nie die fiskale jaar begindatum en fiskale jaar einddatum verander sodra die fiskale jaar gestoor is nie.
@@ -2204,8 +2220,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud begin datum kan nie voor afleweringsdatum vir reeksnommer {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Ry {0}: Wisselkoers is verpligtend
 DocType: Purchase Invoice,Select Supplier Address,Kies Verskaffer Adres
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Beskikbare hoeveelheid is {0}, jy benodig {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Voer asseblief die Verbruikersgeheim in
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programinskrywingsfooi
+DocType: Employee Checkin,Shift Actual End,Skof Werklike Einde
 DocType: Serial No,Warranty Expiry Date,Garantie Vervaldatum
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel Kamerpryse
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Buitelandse belasbare lewerings (anders as nulkoers, nul gegradeer en vrygestel"
@@ -2265,6 +2283,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lees 5
 DocType: Shopping Cart Settings,Display Settings,Vertoon opsies
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Stel asseblief die aantal afskrywings wat bespreek is
+DocType: Shift Type,Consequence after,Gevolg daarna
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Waarmee het jy hulp nodig?
 DocType: Journal Entry,Printing Settings,Druk instellings
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banking
@@ -2274,6 +2293,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Rekeningadres is dieselfde as Posadres
 DocType: Account,Cash,kontant
 DocType: Employee,Leave Policy,Verlofbeleid
+DocType: Shift Type,Consequence,gevolg
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Student Adres
 DocType: GST Account,CESS Account,CESS-rekening
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Koste sentrum is nodig vir &#39;Wins en verlies&#39; rekening {2}. Stel asseblief &#39;n standaard koste sentrum vir die maatskappy op.
@@ -2338,6 +2358,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Periode Sluitingsbewys
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Naam
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Voer asseblief koste-rekening in
+DocType: Issue,Resolution By Variance,Resolusie Deur Variansie
 DocType: Employee,Resignation Letter Date,Bedankingsbrief Datum
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Bywoning tot datum
@@ -2350,6 +2371,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Bekyk nou
 DocType: Item Price,Valid Upto,Geldige Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Verwysings Doctype moet een van {0} wees.
+DocType: Employee Checkin,Skip Auto Attendance,Slaan outomatiese bywoning oor
 DocType: Payment Request,Transaction Currency,Transaksie Geld
 DocType: Loan,Repayment Schedule,Terugbetalingskedule
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Skep Voorbeeld Bewaar Voorraad Invoer
@@ -2421,6 +2443,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS Sluitingsbewysbelasting
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Aksie Initialised
 DocType: POS Profile,Applicable for Users,Toepaslik vir gebruikers
+,Delayed Order Report,Vertraagde bestellingsverslag
 DocType: Training Event,Exam,eksamen
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Onjuiste aantal algemene grootboekinskrywings gevind. U het moontlik &#39;n verkeerde rekening in die transaksie gekies.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Verkope Pyplyn
@@ -2435,10 +2458,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Voorwaardes sal op al die gekose items gekombineer word.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,instel
 DocType: Hotel Room,Capacity,kapasiteit
+DocType: Employee Checkin,Shift End,Skof Einde
 DocType: Installation Note Item,Installed Qty,Geïnstalleerde hoeveelheid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Batch {0} van Item {1} is gedeaktiveer.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel besprekingsgebruiker
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Werkdag is twee keer herhaal
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Diensvlakooreenkoms met entiteitstipe {0} en entiteit {1} bestaan reeds.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Itemgroep nie genoem in itemmeester vir item {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Naam fout: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Territory is nodig in POS-profiel
@@ -2486,6 +2510,7 @@
 DocType: Depreciation Schedule,Schedule Date,Skedule Datum
 DocType: Packing Slip,Package Weight Details,Pakket Gewig Besonderhede
 DocType: Job Applicant,Job Opening,Beskikbare pos
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Laaste Bekende Suksesvolle Sync van Werknemer Checkin. Stel dit slegs op as jy seker is dat alle logs van al die plekke gesinkroniseer word. Moet dit asseblief nie verander as jy onseker is nie.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Werklike Koste
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totale voorskot ({0}) teen Bestelling {1} kan nie groter wees as die Grand Total ({2}) nie.
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Itemvariante is opgedateer
@@ -2530,6 +2555,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Kry Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Is dagboekdata ingevoer
 ,Sales Partners Commission,Verkope Vennootskommissie
+DocType: Shift Type,Enable Different Consequence for Early Exit,Aktiveer verskillende gevolge vir vroeë uitgang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Wettig
 DocType: Loan Application,Required by Date,Vereis volgens datum
 DocType: Quiz Result,Quiz Result,Quiz Resultaat
@@ -2589,7 +2615,6 @@
 DocType: Pricing Rule,Pricing Rule,Prysreël
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Opsionele vakansie lys nie vir verlofperiode gestel nie {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Stel asseblief gebruikers-ID-veld in &#39;n werknemer-rekord om werknemersrol in te stel
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Tyd om op te los
 DocType: Training Event,Training Event,Opleidingsgebeurtenis
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normale rustende bloeddruk in &#39;n volwassene is ongeveer 120 mmHg sistolies en 80 mmHg diastolies, afgekort &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Stelsel sal al die inskrywings haal indien limietwaarde nul is.
@@ -2633,6 +2658,7 @@
 DocType: Student Applicant,Approved,goedgekeur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Vanaf datum moet binne die fiskale jaar wees. Aanvaar vanaf datum = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Stel asseblief Verskaffersgroep in Koopinstellings.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} is &#39;n ongeldige bywoningsstatus.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tydelike Openingsrekening
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankrekening
 DocType: Quality Meeting Table,Quality Meeting Table,Kwaliteit Vergadering Tabel
@@ -2668,6 +2694,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Kos, drank en tabak"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Kursusskedule
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Bywoning sal eers na hierdie datum outomaties gemerk word.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Voorsienings aan UIN-houers
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Versoek vir kwotasies
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Geld kan nie verander word nadat inskrywings met &#39;n ander geldeenheid gebruik is nie
@@ -2715,7 +2742,6 @@
 DocType: Item,Is Item from Hub,Is item van hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Kwaliteitsprosedure.
 DocType: Share Balance,No of Shares,Aantal Aandele
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ry {0}: Aantal nie beskikbaar vir {4} in pakhuis {1} by die plasing van die inskrywing ({2} {3})
 DocType: Quality Action,Preventive,voorkomende
 DocType: Support Settings,Forum URL,Forum URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Werknemer en Bywoning
@@ -2936,7 +2962,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Verstekbelasting en heffings
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Dit is gebaseer op transaksies teen hierdie verskaffer. Sien die tydlyn hieronder vir besonderhede
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Tik die begin en einddatum vir die ooreenkoms.
 DocType: Delivery Note Item,Against Sales Invoice,Teen Verkoopfaktuur
 DocType: Loyalty Point Entry,Purchase Amount,Aankoopbedrag
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Kan nie as verlore gestel word nie aangesien verkoopsbestelling gemaak is.
@@ -2960,7 +2985,7 @@
 DocType: Lead,Organization Name,Organisasie Naam
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Geldigheid van en geldig tot velde is verpligtend vir die kumulatiewe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Ry # {0}: lotnommer moet dieselfde wees as {1} {2}
-DocType: Employee,Leave Details,Los besonderhede
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Voorraadtransaksies voor {0} word gevries
 DocType: Driver,Issuing Date,Uitreikingsdatum
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,versoeker
@@ -3005,9 +3030,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Kontantvloeiskaartmalletjie besonderhede
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Werwing en opleiding
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Grasperiode instellings vir outomatiese bywoning
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Van Geld en Geld kan nie dieselfde wees nie
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,farmaseutiese
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Ondersteuningstye
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} is gekanselleer of gesluit
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ry {0}: Voorskot teen kliënt moet krediet wees
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Groep deur Voucher (Gekonsolideerde)
@@ -3116,6 +3143,7 @@
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Lab Test,Sample ID,Voorbeeld ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Mandjie is leeg
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Bywoning is gemerk soos per werknemersinsoeke
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Bate {0} moet ingedien word
 ,Absent Student Report,Afwesige Studenteverslag
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Ingesluit in bruto wins
@@ -3123,7 +3151,9 @@
 DocType: Travel Request Costing,Funded Amount,Gefinansierde Bedrag
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} is nie ingedien nie, sodat die aksie nie voltooi kan word nie"
 DocType: Subscription,Trial Period End Date,Proefperiode Einddatum
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Wisselende inskrywings as IN en OUT tydens dieselfde skof
 DocType: BOM Update Tool,The new BOM after replacement,Die nuwe BOM na vervanging
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Soort
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Item 5
 DocType: Employee,Passport Number,Paspoortnommer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Tydelike opening
@@ -3239,6 +3269,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Moontlike Verskaffer
 ,Issued Items Against Work Order,Uitgereik Items Teen Werk Orde
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Skep {0} faktuur
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installeer asseblief die Instrukteur Naming Stelsel in Onderwys&gt; Onderwys instellings
 DocType: Student,Joining Date,Aansluitingsdatum
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Versoek webwerf
 DocType: Purchase Invoice,Against Expense Account,Teen koste rekening
@@ -3278,6 +3309,7 @@
 DocType: Landed Cost Item,Applicable Charges,Toepaslike koste
 ,Point of Sale,Punt van koop
 DocType: Authorization Rule,Approving User  (above authorized value),Goedkeuring gebruiker (bo gemagtigde waarde)
+DocType: Service Level Agreement,Entity,entiteit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} oorgedra vanaf {2} na {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Kliënt {0} behoort nie aan projek nie {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Van Party Naam
@@ -3324,6 +3356,7 @@
 DocType: Soil Texture,Sand Composition (%),Sand Komposisie (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Voer dagboekdata in
+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 vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Asset,Asset Owner Company,Bate Eienaar Maatskappy
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Koste sentrum is nodig om &#39;n koste-eis te bespreek
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} geldige reeksnommers vir item {1}
@@ -3384,7 +3417,6 @@
 DocType: Asset,Asset Owner,Bate-eienaar
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Pakhuis is verpligtend vir voorraad Item {0} in ry {1}
 DocType: Stock Entry,Total Additional Costs,Totale addisionele koste
-DocType: Marketplace Settings,Last Sync On,Laaste sinchroniseer op
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Stel ten minste een ry in die tariewe en tariewe tabel
 DocType: Asset Maintenance Team,Maintenance Team Name,Onderhoudspannaam
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Grafiek van kostesentrums
@@ -3400,12 +3432,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Gebruiker ID nie ingestel vir Werknemer {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Beskikbare hoeveelheid is {0}, jy benodig {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Gebruiker {0} geskep
 DocType: Stock Settings,Item Naming By,Item Naming By
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,bestel
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dit is &#39;n wortelkundegroep en kan nie geredigeer word nie.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materiaalversoek {0} word gekanselleer of gestop
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Streng gebaseer op Log Type in Werknemer Checkin
 DocType: Purchase Order Item Supplied,Supplied Qty,Voorsien Aantal
 DocType: Cash Flow Mapper,Cash Flow Mapper,Kontantvloeimapper
 DocType: Soil Texture,Sand,sand
@@ -3464,6 +3496,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Duplikaat item groep gevind in die item groep tabel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Jaarlikse salaris
 DocType: Supplier Scorecard,Weighting Function,Gewig Funksie
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Gespreksfaktor ({0} -&gt; {1}) nie gevind vir item nie: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Kon nie die kriteria formule evalueer nie
 ,Lab Test Report,Lab Test Report
 DocType: BOM,With Operations,Met bedrywighede
@@ -3477,6 +3510,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Geen terugbetalings beskikbaar vir Joernaalinskrywings nie
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} is onaktiewe student
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Maak voorraadinskrywing
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM recursion: {0} kan nie ouer of kind van {1} wees nie
 DocType: Employee Onboarding,Activities,aktiwiteite
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Ten minste een pakhuis is verpligtend
 ,Customer Credit Balance,Krediet Krediet Saldo
@@ -3489,9 +3523,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Meervoudige lojaliteitsprogram vir die kliënt. Kies asseblief handmatig.
 DocType: Patient,Medication,medikasie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Kies Lojaliteitsprogram
+DocType: Employee Checkin,Attendance Marked,Bywoning gemerk
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Grondstowwe
 DocType: Sales Order,Fully Billed,Volledig gefaktureer
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Stel asseblief die kamer prys op ()
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Kies slegs een prioriteit as verstek.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Identifiseer / skep rekening (Grootboek) vir tipe - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Totale Krediet / Debietbedrag moet dieselfde wees as gekoppelde Joernaalinskrywing
 DocType: Purchase Invoice Item,Is Fixed Asset,Is vaste bate
@@ -3512,6 +3548,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Aanstelling Bevestiging
 DocType: Shopping Cart Settings,Orders,bestellings
 DocType: HR Settings,Retirement Age,Aftree-ouderdom
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel asseblief nommersreeks vir Bywoning via Setup&gt; Numbering Series
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Geprojekteerde hoeveelheid
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Skrapping is nie toegelaat vir land {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Ry # {0}: Bate {1} is reeds {2}
@@ -3595,11 +3632,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,rekenmeester
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS sluitingsbewys bestaan alreeds vir {0} tussen datum {1} en {2}
 apps/erpnext/erpnext/config/help.py,Navigating,opgevolg
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Geen uitstaande fakture vereis herwaardasie van wisselkoerse nie
 DocType: Authorization Rule,Customer / Item Name,Kliënt / Item Naam
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nuwe reeksnommer kan nie pakhuis hê nie. Pakhuis moet ingestel word deur Voorraadinskrywing of Aankoop Ontvangst
 DocType: Issue,Via Customer Portal,Via Customer Portal
 DocType: Work Order Operation,Planned Start Time,Beplande aanvangstyd
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} is {2}
+DocType: Service Level Priority,Service Level Priority,Diensvlakprioriteit
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Aantal afskrywings wat bespreek word, kan nie groter wees as die totale aantal afskrywings nie"
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Deel Grootboek
 DocType: Journal Entry,Accounts Payable,Rekeninge betaalbaar
@@ -3710,7 +3749,6 @@
 DocType: Delivery Note,Delivery To,Aflewering aan
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdata
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Geskeduleerde Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Handhaaf Billing Ure en Werksure Dieselfde op die Tydskrif
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Baan lei deur die leidingsbron.
 DocType: Clinical Procedure,Nursing User,Verpleegkundige gebruiker
 DocType: Support Settings,Response Key List,Reaksie Sleutellys
@@ -3877,6 +3915,7 @@
 DocType: Work Order Operation,Actual Start Time,Werklike Aanvangstyd
 DocType: Antibiotic,Laboratory User,Laboratoriumgebruiker
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Aanlyn veilings
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Prioriteit {0} is herhaal.
 DocType: Fee Schedule,Fee Creation Status,Fee Creation Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Softwares
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Verkooporder tot Betaling
@@ -3943,6 +3982,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Kon nie inligting vir {0} ophaal nie.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Faktureer geldeenheid moet gelyk wees aan óf die standaardmaatskappy se geldeenheid- of partyrekeningmunt
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Voer asseblief die werknemer se ID van hierdie verkoopspersoon in
+DocType: Shift Type,Early Exit Consequence after,Vroeë afrit gevolg na
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Skep Openingsverkoops- en Aankoopfakture
 DocType: Disease,Treatment Period,Behandelingsperiode
 apps/erpnext/erpnext/config/settings.py,Setting up Email,E-pos opstel
@@ -3960,7 +4000,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Studente naam:
 DocType: SMS Log,Sent On,Gestuur
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Verkoopsfaktuur
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Reaksie Tyd kan nie groter wees as resolusie tyd nie
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Vir Kursusgebaseerde Studentegroep, sal die Kursus vir elke Student van die ingeskrewe Kursusse in Programinskrywing bekragtig word."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Intra-staat Supplies
 DocType: Employee,Create User Permission,Skep gebruikertoestemming
@@ -3999,6 +4038,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standaardkontrakvoorwaardes vir Verkope of Aankope.
 DocType: Sales Invoice,Customer PO Details,Kliënt PO Besonderhede
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pasiënt nie gevind nie
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Kies &#39;n verstekprioriteit.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Verwyder item indien koste nie van toepassing is op daardie item nie
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,&#39;N Kliëntegroep bestaan met dieselfde naam. Verander asseblief die Kliënt se naam of verander die naam van die Kliëntegroep
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4038,6 +4078,7 @@
 DocType: Support Settings,Support Portal,Ondersteuningsportaal
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Einddatum van taak <b>{0}</b> kan nie minder wees nie as <b>{1}</b> verwagte begindatum <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Werknemer {0} is op verlof op {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Hierdie Diensvlakooreenkoms is spesifiek vir kliënt {0}
 DocType: Employee,Held On,Aangehou
 DocType: Healthcare Practitioner,Practitioner Schedules,Praktisynskedules
 DocType: Project Template Task,Begin On (Days),Begin op (Dae)
@@ -4045,6 +4086,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Werkorder is {0}
 DocType: Inpatient Record,Admission Schedule Date,Toelatingskedule Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Batewaarde aanpassing
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Merk bywoning gebaseer op &#39;Werknemer Checkin&#39; vir Werknemers wat aan hierdie skof toegewys is.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Voorsienings aan ongeregistreerde persone
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Alle Werk
 DocType: Appointment Type,Appointment Type,Aanstellingstipe
@@ -4158,7 +4200,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Die bruto gewig van die pakket. Gewoonlik netto gewig + verpakkingsmateriaal gewig. (vir druk)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorietoetsingstyd
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Die item {0} kan nie Batch hê nie
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Verkope Pyplyn per stadium
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Studentegroep Sterkte
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Bankstaat Transaksieinskrywing
 DocType: Purchase Order,Get Items from Open Material Requests,Kry items van oop materiaalversoeke
@@ -4240,7 +4281,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Wys Veroudering Warehouse-wyse
 DocType: Sales Invoice,Write Off Outstanding Amount,Skryf af Uitstaande bedrag
 DocType: Payroll Entry,Employee Details,Werknemersbesonderhede
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Begin Tyd kan nie groter wees as eindtyd vir {0}.
 DocType: Pricing Rule,Discount Amount,Korting Bedrag
 DocType: Healthcare Service Unit Type,Item Details,Itembesonderhede
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Duplikaat Belasting Verklaring van {0} vir tydperk {1}
@@ -4292,7 +4332,7 @@
 DocType: Customer,CUST-.YYYY.-,Cust-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Netto salaris kan nie negatief wees nie
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Geen interaksies nie
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,verskuiwing
+DocType: Attendance,Shift,verskuiwing
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Verwerking van Kaart van Rekeninge en Partye
 DocType: Stock Settings,Convert Item Description to Clean HTML,Omskep itembeskrywing om HTML skoon te maak
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Alle Verskaffersgroepe
@@ -4362,6 +4402,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Ouer Diens Eenheid
 DocType: Sales Invoice,Include Payment (POS),Sluit Betaling (POS) in
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Private ekwiteit
+DocType: Shift Type,First Check-in and Last Check-out,Eerste Check-in en Laaste Check-out
 DocType: Landed Cost Item,Receipt Document,Kwitansie Dokument
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Verskaffer Scorecard Periode
 DocType: Employee Grade,Default Salary Structure,Standaard Salarisstruktuur
@@ -4444,6 +4485,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Skep aankoopbestelling
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definieer begroting vir &#39;n finansiële jaar.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Rekeningtabel kan nie leeg wees nie.
+DocType: Employee Checkin,Entry Grace Period Consequence,Inskrywing Grace Period Gevolg
 ,Payment Period Based On Invoice Date,Betalingsperiode gebaseer op faktuurdatum
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Installasiedatum kan nie voor afleweringsdatum vir Item {0} wees nie.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Skakel na Materiaal Versoek
@@ -4452,6 +4494,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Ry {0}: &#39;n Herbestellinginskrywing bestaan reeds vir hierdie pakhuis {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Datum
 DocType: Monthly Distribution,Distribution Name,Verspreidingsnaam
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Werkdag {0} is herhaal.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Groep na Nie-Groep
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Werk aan die gang. Dit kan &#39;n rukkie neem.
 DocType: Item,"Example: ABCD.#####
@@ -4464,6 +4507,7 @@
 DocType: Vehicle Log,Fuel Qty,Brandstof Aantal
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Voog 1 Mobiele Nr
 DocType: Invoice Discounting,Disbursed,uitbetaal
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Tyd na die einde van die skof waartydens u uitkyk vir bywoning oorweeg word.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Netto verandering in rekeninge betaalbaar
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nie beskikbaar nie
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Deeltyds
@@ -4477,7 +4521,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Wys PDC in Print
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Verskaffer
 DocType: POS Profile User,POS Profile User,POS Profiel gebruiker
-DocType: Student,Middle Name,Middelnaam
 DocType: Sales Person,Sales Person Name,Verkoop Persoon Naam
 DocType: Packing Slip,Gross Weight,Totale gewig
 DocType: Journal Entry,Bill No,Wetsontwerp Nr
@@ -4486,7 +4529,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Diensvlakooreenkoms
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Kies asseblief Werknemer en Datum eerste
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Itemwaardasiekoers word herbereken na oorweging van die koste van die gelde kosprys
 DocType: Timesheet,Employee Detail,Werknemersbesonderhede
 DocType: Tally Migration,Vouchers,geskenkbewyse
@@ -4521,7 +4563,7 @@
 DocType: Additional Salary,Date on which this component is applied,Datum waarop hierdie komponent toegepas word
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Lys van beskikbare Aandeelhouers met folio nommers
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Setup Gateway rekeninge.
-DocType: Service Level,Response Time Period,Reaksie Tyd Periode
+DocType: Service Level Priority,Response Time Period,Reaksie Tyd Periode
 DocType: Purchase Invoice,Purchase Taxes and Charges,Koopbelasting en heffings
 DocType: Course Activity,Activity Date,Aktiwiteitsdatum
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Kies of voeg nuwe kliënt by
@@ -4546,6 +4588,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Finansiële jaar
 DocType: Sales Invoice Item,Deferred Revenue,Uitgestelde Inkomste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Ten minste een van die verkope of koop moet gekies word
+DocType: Shift Type,Working Hours Threshold for Half Day,Werksure Drempel vir Halfdag
 ,Item-wise Purchase History,Item-wyse Aankoop Geskiedenis
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Kan nie diensstopdatum vir item in ry {0} verander nie
 DocType: Production Plan,Include Subcontracted Items,Sluit onderaannemerte items in
@@ -4578,6 +4621,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Laat dieselfde item meervoudige tye toe
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Skep BOM
 DocType: Healthcare Practitioner,Charges,koste
+DocType: Employee,Attendance and Leave Details,Bywoning en Verlofbesonderhede
 DocType: Student,Personal Details,Persoonlike inligting
 DocType: Sales Order,Billing and Delivery Status,Rekening- en afleweringsstatus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Ry {0}: Vir verskaffer {0} E-pos adres is nodig om e-pos te stuur
@@ -4629,7 +4673,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Gee waarde tussen {0} en {1}
 DocType: Purchase Order,Order Confirmation Date,Bestel Bevestigingsdatum
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Bereken die beraamde aankomstye
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer asseblief die werknemersnaamstelsel in menslike hulpbronne&gt; HR-instellings
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,verbruikbare
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Inskrywing begin datum
@@ -4652,7 +4695,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Tydskrifinskrywingsrekening
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forum Aktiwiteit
-DocType: Service Level,Resolution Time Period,Resolusie Tyd Periode
+DocType: Service Level Priority,Resolution Time Period,Resolusie Tyd Periode
 DocType: Request for Quotation,Supplier Detail,Verskaffer Detail
 DocType: Project Task,View Task,Bekyk Taak
 DocType: Serial No,Purchase / Manufacture Details,Aankoop- / Vervaardigingsbesonderhede
@@ -4719,6 +4762,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Pakhuis kan slegs verander word via Voorraadinskrywing / Afleweringsnota / Aankoop Ontvangst
 DocType: Support Settings,Close Issue After Days,Beslote uitgawe na dae
 DocType: Payment Schedule,Payment Schedule,Betalingskedule
+DocType: Shift Type,Enable Entry Grace Period,Aktiveer Inskrywingsperiode
 DocType: Patient Relation,Spouse,eggenoot
 DocType: Purchase Invoice,Reason For Putting On Hold,Rede vir die aanskakel
 DocType: Item Attribute,Increment,inkrement
@@ -4857,6 +4901,7 @@
 DocType: Vehicle Log,Invoice Ref,Faktuur Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-vorm is nie van toepassing op faktuur nie: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Invoice Created
+DocType: Shift Type,Early Exit Grace Period,Vroeguitgang Grace Period
 DocType: Patient Encounter,Review Details,Hersien Besonderhede
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Ry {0}: Ure waarde moet groter as nul wees.
 DocType: Account,Account Number,Rekening nommer
@@ -4868,7 +4913,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Toepaslik indien die maatskappy SpA, SApA of SRL is"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Oorvleuelende toestande tussen:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Betaal en nie afgelewer nie
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Item Kode is verpligtend omdat Item nie outomaties genommer is nie
 DocType: GST HSN Code,HSN Code,HSN-kode
 DocType: GSTR 3B Report,September,September
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administratiewe uitgawes
@@ -4904,6 +4948,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP rekening
 DocType: SMS Log,Sender Name,Sender Naam
 DocType: Pricing Rule,Supplier Group,Verskaffersgroep
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Stel begin tyd en eindtyd vir \ Ondersteuningsdag {0} by indeks {1}.
 DocType: Employee,Date of Issue,Datum van uitreiking
 ,Requested Items To Be Transferred,Gevraagde items wat oorgedra moet word
 DocType: Employee,Contract End Date,Kontrak Einddatum
@@ -4914,6 +4960,7 @@
 DocType: Opportunity,Sales Stage,Verkoopsfase
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Woorde sal sigbaar wees sodra jy die verkoopsbestelling stoor.
 DocType: Item Reorder,Re-order Level,Herbestel vlak
+DocType: Shift Type,Enable Auto Attendance,Aktiveer outomatiese bywoning
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,voorkeur
 ,Department Analytics,Departement Analytics
 DocType: Crop,Scientific Name,Wetenskaplike Naam
@@ -4926,6 +4973,7 @@
 DocType: Quiz Activity,Quiz Activity,Quiz-aktiwiteit
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} is nie in &#39;n geldige betaalstaat nie
 DocType: Timesheet,Billed,billed
+apps/erpnext/erpnext/config/support.py,Issue Type.,Uitgawe Tipe.
 DocType: Restaurant Order Entry,Last Sales Invoice,Laaste Verkoopfaktuur
 DocType: Payment Terms Template,Payment Terms,Betalingsvoorwaardes
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Gereserveerde hoeveelheid: Hoeveelheid bestel te koop, maar nie afgelewer nie."
@@ -5021,6 +5069,7 @@
 DocType: Account,Asset,bate
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} het nie &#39;n gesondheidsorgpraktisynskedule nie. Voeg dit by in die Gesondheidsorgpraktisynmeester
 DocType: Vehicle,Chassis No,Chassisnr
+DocType: Employee,Default Shift,Verstekverskuiwing
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Maatskappy Afkorting
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Boom van die materiaal
 DocType: Article,LMS User,LMS gebruiker
@@ -5069,6 +5118,7 @@
 DocType: Sales Person,Parent Sales Person,Ouer Verkoopspersoon
 DocType: Student Group Creation Tool,Get Courses,Kry kursusse
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ry # {0}: Hoeveelheid moet 1 wees, aangesien item &#39;n vaste bate is. Gebruik asseblief aparte ry vir veelvuldige aantal."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Werksure onder waarvan Afwesig gemerk is. (Nul om uit te skakel)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Slegs blaar nodusse word in transaksie toegelaat
 DocType: Grant Application,Organization,organisasie
 DocType: Fee Category,Fee Category,Fee Kategorie
@@ -5081,6 +5131,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Dateer asseblief u status op vir hierdie opleidingsgebeurtenis
 DocType: Volunteer,Morning,oggend
 DocType: Quotation Item,Quotation Item,Kwotasie Item
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Uitgawe Prioriteit.
 DocType: Journal Entry,Credit Card Entry,Kredietkaartinskrywing
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Tydsleuf oorgedra, die gleuf {0} tot {1} oorvleuel wat slot {2} tot {3}"
 DocType: Journal Entry Account,If Income or Expense,As Inkomste of Uitgawe
@@ -5129,11 +5180,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Data invoer en instellings
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","As Auto Opt In is nagegaan, word die kliënte outomaties gekoppel aan die betrokke Loyaliteitsprogram (op spaar)"
 DocType: Account,Expense Account,Uitgawe rekening
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Die tyd voor die verskuiwingstydsduur waartydens Werknemer-inskrywing vir bywoning oorweeg word.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Verhouding met Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Skep faktuur
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Betaling Versoek bestaan reeds {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Werknemer verlig op {0} moet gestel word as &#39;Links&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Betaal {0} {1}
+DocType: Company,Sales Settings,Verkope instellings
 DocType: Sales Order Item,Produced Quantity,Geproduceerde Hoeveelheid
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Die aanvraag vir kwotasie kan verkry word deur op die volgende skakel te kliek
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van die Maandelikse Verspreiding
@@ -5212,6 +5265,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standaard belasting sjablonen vir verkoop en aankoop word gemaak.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Verlof tipe {0} kan nie deurstuur word nie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debiet Vir rekening moet &#39;n Ontvangbare rekening wees
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Einddatum van Ooreenkoms kan nie minder wees as vandag nie.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Stel asseblief rekening in pakhuis {0} of verstekvoorraadrekening in maatskappy {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Stel as standaard
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Die netto gewig van hierdie pakket. (bereken outomaties as som van netto gewig van items)
@@ -5238,8 +5292,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Vervaldatums
 DocType: Shipping Rule,Shipping Rule Type,Versending Reël Tipe
 DocType: Job Offer,Accepted,aanvaar
-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 asseblief die Werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,U het reeds geassesseer vir die assesseringskriteria ().
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Kies lotnommer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Ouderdom (Dae)
@@ -5266,6 +5318,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Kies jou domeine
 DocType: Agriculture Task,Task Name,Taaknaam
 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/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Skrap asseblief die Werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 ,Amount to Deliver,Bedrag om te lewer
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Maatskappy {0} bestaan nie
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Geen hangende materiaal versoeke gevind om te skakel vir die gegewe items.
@@ -5314,6 +5368,7 @@
 DocType: Lab Prescription,Test Code,Toets Kode
 DocType: Purchase Taxes and Charges,On Previous Row Total,Op vorige ry Totaal
 DocType: Student,Student Email Address,Student e-pos adres
+,Delayed Item Report,Vertraagde Item Verslag
 DocType: Academic Term,Education,onderwys
 DocType: Supplier Quotation,Supplier Address,Verskaffer Adres
 DocType: Salary Detail,Do not include in total,Sluit nie in totaal in nie
@@ -5321,7 +5376,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} bestaan nie
 DocType: Purchase Receipt Item,Rejected Quantity,Afgekeurde hoeveelheid
 DocType: Cashier Closing,To TIme,Om te keer
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Gespreksfaktor ({0} -&gt; {1}) nie gevind vir item nie: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Daaglikse werkopsomminggroepgebruiker
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskale Jaar Maatskappy
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternatiewe item mag nie dieselfde wees as die itemkode nie
@@ -5373,6 +5427,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Vertraag tussen afleweringstoppies
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Vries Voorrade Ouer As [Dae]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Promosie skema produk afslag
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Uitgawe Prioriteit bestaan reeds
 DocType: Account,Asset Received But Not Billed,Bate ontvang maar nie gefaktureer nie
 DocType: POS Closing Voucher,Total Collected Amount,Totale Versamelde Bedrag
 DocType: Course,Default Grading Scale,Standaard Gradering Skaal
@@ -5415,6 +5470,7 @@
 DocType: Contract,Fulfilment Terms,Vervolgingsvoorwaardes
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Nie-Groep tot Groep
 DocType: Student Guardian,Mother,moeder
+DocType: Issue,Service Level Agreement Fulfilled,Diensvlakooreenkoms Vervul
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Aftrekbelasting vir Onopgeëiste Werknemervoordele
 DocType: Travel Request,Travel Funding,Reisbefondsing
 DocType: Shipping Rule,Fixed,vaste
@@ -5444,10 +5500,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Geen items gevind nie.
 DocType: Item Attribute,From Range,Van Reeks
 DocType: Clinical Procedure,Consumables,Consumables
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; en &#39;timestamp&#39; word vereis.
 DocType: Purchase Taxes and Charges,Reference Row #,Verwysingsreeks #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Stel asseblief &#39;Bate Waardevermindering Koste Sentrum&#39; in Maatskappy {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Ry # {0}: Betalingsdokument word benodig om die trekking te voltooi
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Klik op hierdie knoppie om jou verkoopsbeveldata van Amazon MWS te trek.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Werksure onder watter Halfdag gemerk is. (Nul om uit te skakel)
 ,Assessment Plan Status,Assesseringsplan Status
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Kies asseblief eers {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Dien dit in om die Werknemers rekord te skep
@@ -5518,6 +5576,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Stel oop
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Wissel filters
 DocType: Production Plan,Material Request Detail,Materiaal Versoek Detail
+DocType: Shift Type,Process Attendance After,Proses Bywoning Na
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en pakhuis
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Gaan na Programme
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Ry # {0}: Duplikaatinskrywing in Verwysings {1} {2}
@@ -5575,6 +5634,7 @@
 DocType: Pricing Rule,Party Information,Party inligting
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debiteure ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Tot op hede kan nie groter as werknemer se ontslagdatum nie
+DocType: Shift Type,Enable Exit Grace Period,Aktiveer uittree-grasietydperk
 DocType: Expense Claim,Employees Email Id,Werknemers E-pos ID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Werk prys vanaf Shopify na ERPNext Pryslys
 DocType: Healthcare Settings,Default Medical Code Standard,Standaard Mediese Kode Standaard
@@ -5605,7 +5665,6 @@
 DocType: Budget,Applicable on Material Request,Van toepassing op materiaal versoek
 DocType: Support Settings,Search APIs,Soek API&#39;s
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Oorproduksie persentasie vir verkoopsbestelling
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,spesifikasies
 DocType: Purchase Invoice,Supplied Items,Voorsien Items
 DocType: Leave Control Panel,Select Employees,Kies Werknemers
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Kies rentekoersrekening in lening {0}
@@ -5631,7 +5690,7 @@
 ,Supplier-Wise Sales Analytics,Verskaffer-Wise Sales Analytics
 DocType: GSTR 3B Report,February,Februarie
 DocType: Appraisal,For Employee,Vir Werknemer
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Werklike Afleweringsdatum
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Werklike Afleweringsdatum
 DocType: Sales Partner,Sales Partner Name,Verkope Vennoot Naam
 DocType: GST HSN Code,Regional,plaaslike
 DocType: Lead,Lead is an Organization,Lood is &#39;n organisasie
@@ -5669,6 +5728,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Verskaffer Scorecard
 DocType: Travel Itinerary,Travel To,Reis na
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Puntbywoning
+DocType: Shift Type,Determine Check-in and Check-out,Bepaal Check-in en Check-out
 DocType: POS Closing Voucher,Difference,verskil
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,klein
 DocType: Work Order Item,Work Order Item,Werk bestelling Item
@@ -5702,6 +5762,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,dwelm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} is gesluit
 DocType: Patient,Medical History,Mediese geskiedenis
+DocType: Expense Claim,Expense Taxes and Charges,Uitgawe Belasting en Heffings
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Aantal dae na faktuurdatum het verloop voordat u intekening of inskrywing vir inskrywing as onbetaalde kansellasie kanselleer
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Installasie Nota {0} is reeds ingedien
 DocType: Patient Relation,Family,familie
@@ -5734,7 +5795,6 @@
 DocType: Dosage Strength,Strength,krag
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} eenhede van {1} benodig in {2} om hierdie transaksie te voltooi.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush grondstowwe van subkontrakte gebaseer op
-DocType: Bank Guarantee,Customer,kliënt
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Indien geaktiveer, sal die vak Akademiese Termyn verpligtend wees in die Programinskrywingsinstrument."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Vir Batch-gebaseerde Studentegroep sal die Studente-batch vir elke Student van die Programinskrywing bekragtig word.
 DocType: Course,Topics,onderwerpe
@@ -5814,6 +5874,7 @@
 DocType: Chapter,Chapter Members,Hoofletters
 DocType: Warranty Claim,Service Address,Diens Adres
 DocType: Journal Entry,Remark,opmerking
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ry {0}: Hoeveelheid nie beskikbaar vir {4} in pakhuis {1} by die plasing van die inskrywing ({2} {3})
 DocType: Patient Encounter,Encounter Time,Ontmoetyd
 DocType: Serial No,Invoice Details,Faktuur besonderhede
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere rekeninge kan onder Groepe gemaak word, maar inskrywings kan gemaak word teen nie-groepe"
@@ -5894,6 +5955,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Sluiting (Opening + Totaal)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriteria Formule
 apps/erpnext/erpnext/config/support.py,Support Analytics,Ondersteun Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Bywoningsapparaat ID (Biometriese / RF-tag ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Hersien en Aksie
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","As die rekening gevries is, is inskrywings toegelaat vir beperkte gebruikers."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Bedrag na waardevermindering
@@ -5915,6 +5977,7 @@
 DocType: Salary Slip,Loan Repayment,Lening Terugbetaling
 DocType: Employee Education,Major/Optional Subjects,Hoofvakke / Opsionele Vakke
 DocType: Soil Texture,Silt,slik
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Verskaffer Adresse en Kontakte
 DocType: Bank Guarantee,Bank Guarantee Type,Bank Waarborg Tipe
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","As gedeaktiveer, sal die veld &#39;Afgeronde Totaal&#39; nie sigbaar wees in enige transaksie nie"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5952,6 +6015,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Invoeging van faktuurskeppings-item
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Sluit POS-transaksies in
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Geen Werknemer gevind vir die gegewe werknemer veldwaarde. &#39;()&#39;: ()
 DocType: Payment Entry,Received Amount (Company Currency),Ontvangde Bedrag (Maatskappy Geld)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage is vol, het nie gestoor nie"
 DocType: Chapter Member,Chapter Member,Hooflid
@@ -5984,6 +6048,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Geen studentegroepe geskep nie.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Dupliseer ry {0} met dieselfde {1}
 DocType: Employee,Salary Details,Salaris Besonderhede
+DocType: Employee Checkin,Exit Grace Period Consequence,Uittree Grace Period Gevolg
 DocType: Bank Statement Transaction Invoice Item,Invoice,faktuur
 DocType: Special Test Items,Particulars,Besonderhede
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Stel asseblief die filter op grond van item of pakhuis
@@ -6084,6 +6149,7 @@
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Werkprofiel, kwalifikasies benodig ens."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Stuur na staat
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Wil u die materiaalversoek indien
 DocType: Opportunity Item,Basic Rate,Basiese tarief
 DocType: Compensatory Leave Request,Work End Date,Werk Einddatum
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Versoek vir grondstowwe
@@ -6268,6 +6334,7 @@
 DocType: Sales Order Item,Gross Profit,Bruto wins
 DocType: Quality Inspection,Item Serial No,Item Serienommer
 DocType: Asset,Insurer,versekeraar
+DocType: Employee Checkin,OUT,UIT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Koopbedrag
 DocType: Asset Maintenance Task,Certificate Required,Sertifikaat benodig
 DocType: Retention Bonus,Retention Bonus,Retensie Bonus
@@ -6382,6 +6449,8 @@
 DocType: Invoice Discounting,Sanctioned,beboet
 DocType: Course Enrollment,Course Enrollment,Kursusinskrywing
 DocType: Item,Supplier Items,Verskaffer Items
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Begin Tyd kan nie groter as of gelyk wees aan eindtyd \ vir {0}.
 DocType: Sales Order,Not Applicable,Nie van toepassing nie
 DocType: Support Search Source,Response Options,Reaksie Opsies
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} moet &#39;n waarde tussen 0 en 100 wees
@@ -6467,7 +6536,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Vaste Bates
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Totale verdienste
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Territorium
 DocType: Share Balance,From No,Van No
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalingsversoeningfaktuur
 DocType: Purchase Invoice,Taxes and Charges Added,Belasting en heffings bygevoeg
@@ -6575,6 +6643,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignoreer prysreël
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Kos
 DocType: Lost Reason Detail,Lost Reason Detail,Verlore Rede Besonderhede
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Die volgende reeksnommers is geskep: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Klient terugvoering
 DocType: Serial No,Warranty / AMC Details,Waarborg / AMC Besonderhede
 DocType: Issue,Opening Time,Openingstyd
@@ -6624,6 +6693,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Maatskappy se naam is nie dieselfde nie
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Werknemersbevordering kan nie voor die Bevorderingsdatum ingedien word nie
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nie toegelaat om voorraadtransaksies ouer as {0} by te werk nie.
+DocType: Employee Checkin,Employee Checkin,Werknemer Checkin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Begindatum moet minder wees as einddatum vir item {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Skep kliënt kwotasies
 DocType: Buying Settings,Buying Settings,Koop instellings
@@ -6645,6 +6715,7 @@
 DocType: Patient,Patient Demographics,Pasiënt Demografie
 DocType: Share Transfer,To Folio No,Na Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Kontantvloei uit bedrywighede
+DocType: Employee Checkin,Log Type,Log Type
 DocType: Stock Settings,Allow Negative Stock,Laat negatiewe voorraad toe
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Geen van die items het enige verandering in hoeveelheid of waarde nie.
 DocType: Asset,Purchase Date,Aankoop datum
@@ -6688,6 +6759,7 @@
 DocType: Vital Signs,Very Hyper,Baie Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Kies die aard van jou besigheid.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Kies asseblief maand en jaar
+DocType: Service Level,Default Priority,Verstek Prioriteit
 DocType: Student Log,Student Log,Studentelog
 DocType: Shopping Cart Settings,Enable Checkout,Aktiveer Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Menslike hulpbronne
@@ -6716,7 +6788,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Koppel Shopify met ERPNext
 DocType: Homepage Section Card,Subtitle,Subtitle
 DocType: Soil Texture,Loam,leem
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer Soort
 DocType: BOM,Scrap Material Cost(Company Currency),Skrootmateriaal Koste (Maatskappy Geld)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Afleweringsnotasie {0} moet nie ingedien word nie
 DocType: Task,Actual Start Date (via Time Sheet),Werklike Aanvangsdatum (via Tydblad)
@@ -6772,6 +6843,7 @@
 DocType: Drug Prescription,Dosage,dosis
 DocType: Cheque Print Template,Starting position from top edge,Beginposisie van boonste rand
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Aanstelling Tydsduur (mins)
+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 tydskrif. {0}
 DocType: Accounting Dimension,Disable,afskakel
 DocType: Email Digest,Purchase Orders to Receive,Aankooporders om te ontvang
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Produksies Bestellings kan nie opgewek word vir:
@@ -6787,7 +6859,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Materiaal oorgedra vir subkontrakteur
 DocType: Job Card,Timing Detail,Tydsberekening
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Vereis Aan
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Voer {0} van {1} in
 DocType: Job Offer Term,Job Offer Term,Werksbydrae
 DocType: SMS Center,All Contact,Alle Kontak
 DocType: Project Task,Project Task,Projektaak
@@ -6838,7 +6909,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Item {0} is nie opgestel vir Serial Nos. Check Item Master
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Uit staat
 DocType: Leave Type,Maximum Continuous Days Applicable,Maksimum Deurlopende Dae Toepaslik
-apps/erpnext/erpnext/config/support.py,Support Team.,Ondersteuningspan.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Voer asseblief die maatskappy se naam eerste in
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Suksesvol invoer
 DocType: Guardian,Alternate Number,Alternatiewe Nommer
@@ -6930,6 +7000,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Ry # {0}: Item bygevoeg
 DocType: Student Admission,Eligibility and Details,Geskiktheid en besonderhede
 DocType: Staffing Plan,Staffing Plan Detail,Personeelplanbesonderhede
+DocType: Shift Type,Late Entry Grace Period,Laat inskrywingsperiode
 DocType: Email Digest,Annual Income,Jaarlikse inkomste
 DocType: Journal Entry,Subscription Section,Subskripsie afdeling
 DocType: Salary Slip,Payment Days,Betalingsdae
@@ -6980,6 +7051,7 @@
 DocType: Journal Entry Account,Account Balance,Rekening balans
 DocType: Asset Maintenance Log,Periodicity,periodisiteit
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Mediese rekord
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Log Type is nodig vir inskrywings wat in die skof val: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Uitvoering
 DocType: Item,Valuation Method,Waardasie metode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} teen Verkoopsfaktuur {1}
@@ -7064,6 +7136,7 @@
 DocType: Loan Type,Loan Name,Lening Naam
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Stel verstek wyse van betaling
 DocType: Quality Goal,Revision,hersiening
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Die tyd voor die skof eindtyd wanneer u uitstappie so vroeg (in minute) oorweeg word.
 DocType: Healthcare Service Unit,Service Unit Type,Diens Eenheidstipe
 DocType: Purchase Invoice,Return Against Purchase Invoice,Keer terug teen aankoopfaktuur
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Genereer Geheime
@@ -7218,12 +7291,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,skoonheidsmiddels
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Kontroleer dit as u die gebruiker wil dwing om &#39;n reeks te kies voordat u dit stoor. Daar sal geen standaard wees as u dit kontroleer nie.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met hierdie rol word toegelaat om gevriesde rekeninge in te stel en rekeningkundige inskrywings teen bevrore rekeninge te skep / te verander
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Item Kode&gt; Itemgroep&gt; Handelsmerk
 DocType: Expense Claim,Total Claimed Amount,Totale eisbedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Kan nie tydgleuf in die volgende {0} dae vir operasie {1} vind nie
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Klaar maak
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,U kan net hernu indien u lidmaatskap binne 30 dae verstryk
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Waarde moet tussen {0} en {1} wees.
 DocType: Quality Feedback,Parameters,Grense
+DocType: Shift Type,Auto Attendance Settings,Outomatiese Bywoningsinstellings
 ,Sales Partner Transaction Summary,Verkope Vennoot Transaksie Opsomming
 DocType: Asset Maintenance,Maintenance Manager Name,Onderhoud Bestuurder Naam
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Dit is nodig om Itembesonderhede te gaan haal.
@@ -7315,10 +7390,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Bevestig Toegepaste Reël
 DocType: Job Card Item,Job Card Item,Poskaart Item
 DocType: Homepage,Company Tagline for website homepage,Maatskappynaam vir webwerf tuisblad
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Stel reaksie tyd en resolusie vir prioriteit {0} by indeks {1}.
 DocType: Company,Round Off Cost Center,Rondom Koste Sentrum
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Gewig
 DocType: Asset,Depreciation Schedules,Waardeverminderingskedules
-DocType: Expense Claim Detail,Claim Amount,Eisbedrag
 DocType: Subscription,Discounts,afslag
 DocType: Shipping Rule,Shipping Rule Conditions,Posbusvoorwaardes
 DocType: Subscription,Cancelation Date,Kansellasie Datum
@@ -7346,7 +7421,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Toon zero waardes
 DocType: Employee Onboarding,Employee Onboarding,Werknemer aan boord
 DocType: POS Closing Voucher,Period End Date,Periode Einddatum
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Verkoopsgeleenthede deur Bron
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Die eerste verlof goedkeur in die lys sal as die verstek verlof aanvaar word.
 DocType: POS Settings,POS Settings,Posinstellings
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Alle rekeninge
@@ -7367,7 +7441,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ry # {0}: Die tarief moet dieselfde wees as {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-KPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Gesondheidsorg Diens Items
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Geen rekords gevind
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Veroudering Range 3
 DocType: Vital Signs,Blood Pressure,Bloeddruk
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Teiken
@@ -7414,6 +7487,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,groepe
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,verdediging
 DocType: Item,Has Batch No,Het lotnommer
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Vertraagde Dae
 DocType: Lead,Person Name,Persoon Naam
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Training Event Employee,Invited,genooi
@@ -7435,7 +7509,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Begin en einddatum nie in &#39;n geldige betaalstaat nie, kan nie {0} bereken nie."
 DocType: POS Profile,Only show Customer of these Customer Groups,Wys slegs die kliënt van hierdie kliëntegroepe
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Kies items om die faktuur te stoor
-DocType: Service Level,Resolution Time,Resolusie Tyd
+DocType: Service Level Priority,Resolution Time,Resolusie Tyd
 DocType: Grading Scale Interval,Grade Description,Graad Beskrywing
 DocType: Homepage Section,Cards,kaarte
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kwaliteit Vergadering Notules
@@ -7462,6 +7536,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankstaatbalans soos per Algemene Grootboek
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Gesondheidsorg (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Default Warehouse om verkoopsbestelling en afleweringsnota te skep
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Reaksie Tyd vir {0} by indeks {1} kan nie groter wees as resolusie tyd nie.
 DocType: Opportunity,Customer / Lead Name,Kliënt / Lood Naam
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Onopgeëiste bedrag
@@ -7507,7 +7582,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Partye en adresse invoer
 DocType: Item,List this Item in multiple groups on the website.,Lys hierdie item in verskeie groepe op die webwerf.
 DocType: Request for Quotation,Message for Supplier,Boodskap vir Verskaffer
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Kan nie verander nie {0} as Voorraadtransaksie vir Item {1} bestaan.
 DocType: Healthcare Practitioner,Phone (R),Telefoon (R)
 DocType: Maintenance Team Member,Team Member,Spanmaat
 DocType: Asset Category Account,Asset Category Account,Bate Kategorie Rekening
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 199dde4..af1a6dc 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -76,7 +76,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,ቀጠሮ {0} እና የሽያጭ ደረሰኝ {1} ተሰርዟል
 DocType: Purchase Receipt,Vehicle Number,የተሽከርካሪ ቁጥር
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,የኢሜይል አድራሻዎ ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,የነባሪ መጽሃፍ ገጾችን አካት
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,የነባሪ መጽሃፍ ገጾችን አካት
 DocType: Activity Cost,Activity Type,የእንቅስቃሴ አይነት
 DocType: Purchase Invoice,Get Advances Paid,ቅድሚያ ክፍያዎችን ያግኙ
 DocType: Company,Gain/Loss Account on Asset Disposal,በንብረት ማስወገጃ ገንዘብ ላይ / ንብረትን ማጣት
@@ -221,7 +221,9 @@
 DocType: Bank Reconciliation,Payment Entries,የክፍያ ምዝገባዎች
 DocType: Employee Education,Class / Percentage,ክፍል / መቶኛ
 ,Electronic Invoice Register,ኤሌክትሮኒካዊ ደረሰኝ ምዝገባ
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,ውጤቱ ከተፈጸመ በኋላ የሚከሰተው ክስተት ቁጥር.
 DocType: Sales Invoice,Is Return (Credit Note),ተመላሽ ነው (የብድር ማስታወሻ)
+DocType: Price List,Price Not UOM Dependent,የዋጋ ተመን UOM ጥገኛ አይደለም
 DocType: Lab Test Sample,Lab Test Sample,የቤተ ሙከራ የሙከራ ናሙና
 DocType: Shopify Settings,status html,ሁኔታ html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ምሳሌ 2012, 2012-13"
@@ -322,6 +324,7 @@
 DocType: Salary Slip,Net Pay,የተጣራ ክፍያ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,ጠቅላላ የተሞከረው ኤም
 DocType: Clinical Procedure,Consumables Invoice Separately,እቃዎች ደረሰኝ ለየብቻ
+DocType: Shift Type,Working Hours Threshold for Absent,የስራ ሰዓቶች ለአቅራቢያ የቀረቡ
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.- .MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},በጀት በቡድን መለያ ውስጥ አይመደብም {0}
 DocType: Purchase Receipt Item,Rate and Amount,ደረጃ እና ምን ያህል መጠን
@@ -377,7 +380,6 @@
 DocType: Healthcare Settings,Out Patient Settings,የታካሚ ትዕዛዞች ቅንብሮች
 DocType: Asset,Insurance End Date,የኢንሹራንስ መጨረሻ ቀን
 DocType: Bank Account,Branch Code,የቅርንጫፍ ኮድ
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,ለመመለስ ጊዜ አለው
 apps/erpnext/erpnext/public/js/conf.js,User Forum,የተጠቃሚ ፎረም
 DocType: Landed Cost Item,Landed Cost Item,በወደቁ የጉልበት ዋጋ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,ሻጩ እና ገዢው ተመሳሳይ መሆን አይችሉም
@@ -594,6 +596,7 @@
 DocType: Share Transfer,Transfer,ዝውውር
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),ፈልግ ንጥል (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} ውጤት ተገዝቷል
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ከዛሬ ጀምሮ ከዛሬ በላይ መሆን አይችልም
 DocType: Supplier,Supplier of Goods or Services.,የዕቃ ዕቃዎች ወይም አገልግሎቶች አቅራቢ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,የአዲስ መለያ ስም. ማሳሰቢያ-እባክዎ ለደንበኞች እና አቅራቢዎች መለያ አይፍጠሩ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,የተማሪ ቡድን ወይም የኮርሱ ግዜ ግዴታ ነው
@@ -876,7 +879,6 @@
 DocType: Skill,Skill Name,የብቃት ስም
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,የህትመት ሪፖርት ካርድ
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,ትኬቶችን ይደግፉ
 DocType: Asset Category Account,Fixed Asset Account,ቋሚ የንብረት መለያ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,የቅርብ ጊዜ
@@ -889,6 +891,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,የግዴታ መጣጥፍ ወረቀት
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ ድጐማ መጠን
 DocType: Sales Invoice,Get Advances Received,Advances received Received
+DocType: Shift Type,Last Sync of Checkin,የመጨረሻው የማመሳሰል ማጣሪያ
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,የንጥል እሴት መጠን በቫል ውስጥ ተካትቷል
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -897,7 +900,9 @@
 DocType: Student,Blood Group,የደም ክፍል
 apps/erpnext/erpnext/config/healthcare.py,Masters,ማስተሮች
 DocType: Crop,Crop Spacing UOM,UOM ከርክም አሰራጭ
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,ወደ ፍተሻው መመለሻ ጊዜ (ከደቂቃዎች በኋላ) ጊዜው እንደዘገየ ተደርጎ ከተወሰደ በኋላ.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,አስስ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,ምንም ያልተወከሉ ደረሰኞች አልተገኙም
 DocType: Promotional Scheme,Product Discount Slabs,የምርት ቅናሽ ቅጠሎች
 DocType: Hotel Room Package,Amenities,ምግቦች
 DocType: Lab Test Groups,Add Test,ሙከራ አክል
@@ -995,6 +1000,7 @@
 DocType: Item,Moving Average,አማካይ በመውሰድ ላይ
 DocType: Employee Attendance Tool,Unmarked Attendance,ምልክት የተደረገበት ተገኝነት
 DocType: Homepage Section,Number of Columns,የአምዶች ቁጥር
+DocType: Issue Priority,Issue Priority,ቅድሚያ መስጠት
 DocType: Holiday List,Add Weekly Holidays,ሳምንታዊ በዓላትን አክል
 DocType: Shopify Log,Shopify Log,የምዝግብ ማስታወሻ ግዛ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,የደመወዝ ሠሌዳ ይፍጠሩ
@@ -1003,6 +1009,7 @@
 DocType: Warranty Claim,Issue Date,የተለቀቀበት ቀን
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,እባክዎ ለባድ ንጥል {0} ይምረጡ. ይህንን መስፈርት የሚያሟላ ነጠላ ባዶ ማግኘት አልተቻለም
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,ለቀሪዎች ሰራተኞች የደመወዝ ክፍያ ጉርብትን መፍጠር አይቻልም
+DocType: Employee Checkin,Location / Device ID,አካባቢ / የመሣሪያ መታወቂያ
 DocType: Purchase Order,To Receive,መቀበል
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጭ ሁነታ ላይ ነዎት. አውታረ መረብ እስኪያገኙ ድረስ ዳግም መጫን አይችሉም.
 DocType: Course Activity,Enrollment,ምዝገባ
@@ -1011,7 +1018,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},ከፍተኛ: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,የኢ-ኢንቮይሮ መረጃ ይጎድላል
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ምንም የተፈጥሮ ጥያቄ አልተፈጠረም
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የእቃ ቁጥር&gt; የንጥል ቡድን&gt; ብራንድ
 DocType: Loan,Total Amount Paid,ጠቅላላ መጠን የተከፈለ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,ሁሉም እነዚህ ንጥሎች አስቀድሞ ክፍያ የተደረገባቸው ናቸው
 DocType: Training Event,Trainer Name,የአሰልጣኝ ስም
@@ -1122,6 +1128,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},እባክዎን በእርግስቱ ውስጥ ያለ መሪ ስምን ይጥቀሱ {0}
 DocType: Employee,You can enter any date manually,ማንኛውንም ቀነ ገደብ እራስዎ ማስገባት ይችላሉ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,የክምችት ማስታረቂያ ንጥል
+DocType: Shift Type,Early Exit Consequence,የቀድሞ መውጫ ውጤት
 DocType: Item Group,General Settings,አጠቃላይ ቅንብሮች
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,የሚከፈልበት ቀን ከመልቀቂያ / ማቅረቢያ ደረሰኝ ቀን በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,ከማቅረብ በፊት የአመካኙን ስም ያስገቡ.
@@ -1160,6 +1167,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,የክፍያ ማረጋገጫ
 ,Available Stock for Packing Items,ለማሸጊያ እቃዎች የሚሆን ክምችት ይገኛል
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},እባክዎ ይህን ደረሰኝ {0} ከ C-Form {1} ያስወግዱት
+DocType: Shift Type,Every Valid Check-in and Check-out,እያንዳንዱ ትክክለኛ ተመዝግበው እና ተመዝግበው ይውጡ
 DocType: Support Search Source,Query Route String,የፍለጋ መንገድ ሕብረቁምፊ
 DocType: Customer Feedback Template,Customer Feedback Template,የደንበኞች አስተያየት መለኪያ
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,ለቀጮች ወይም ደንበኞች ጠቅላላ ዝርዝር.
@@ -1193,6 +1201,7 @@
 DocType: Authorization Control,Authorization Control,የፈቀዳ ቁጥጥር
 ,Daily Work Summary Replies,ዕለታዊ የትርጉም ማጠቃለያዎች
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},በፕሮጀክቱ ላይ እንዲተባበሩ ተጋብዘዋል: {0}
+DocType: Issue,Response By Variance,ምላሽ በቫሪያር
 DocType: Item,Sales Details,የሽያጭ ዝርዝሮች
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,ደብዳቤዎች ለህትመት አብነቶች.
 DocType: Salary Detail,Tax on additional salary,ተጨማሪ ደመወዝ
@@ -1316,6 +1325,7 @@
 DocType: Project,Task Progress,ተግባር ተግባር
 DocType: Journal Entry,Opening Entry,የመክፈቻ መግቢያ
 DocType: Bank Guarantee,Charges Incurred,ክፍያዎች ወጥተዋል
+DocType: Shift Type,Working Hours Calculation Based On,የሥራ ሰዓቶች መምርጫ በ ላይ
 DocType: Work Order,Material Transferred for Manufacturing,ወደ ማምረት የተሸጋገሩ ቁሳቁሶች
 DocType: Products Settings,Hide Variants,ተለዋዋጭዎችን ደብቅ
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,የአቅም ዕቅድ እና የጊዜ መከታተልን ያሰናክሉ
@@ -1345,6 +1355,7 @@
 DocType: Guardian,Interests,ፍላጎቶች
 DocType: Purchase Receipt Item Supplied,Consumed Qty,የተጠቀሙት ብዛት
 DocType: Education Settings,Education Manager,የትምህርት ሥራ አስኪያጅ
+DocType: Employee Checkin,Shift Actual Start,Shift Actual ጀምር
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ከእጅ ባለሙያ የሥራ ሰዓቶች ውጪ የጊዜ እቅዶች.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},የታማኝነት ነጥቦች: {0}
 DocType: Healthcare Settings,Registration Message,የምዝገባ መልዕክት
@@ -1369,9 +1380,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,ደረሰኝ ቀድሞውኑ ለሁሉም የክፍያ ሰዓቶች ተፈጥሯል
 DocType: Sales Partner,Contact Desc,የእውቂያ ዲኮር
 DocType: Purchase Invoice,Pricing Rules,የዋጋ አሰጣጥ ደንቦች
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","በንጥል {0} ላይ ያሉ አስቀድመው ግብይቶች ስለያዙ, የ {1} እሴት መለወጥ አይችሉም"
 DocType: Hub Tracked Item,Image List,የምስል ዝርዝር
 DocType: Item Variant Settings,Allow Rename Attribute Value,የባህሪ እሴት ዳግም ሰይም ፍቀድ
-DocType: Price List,Price Not UOM Dependant,የዋጋ ተመን UOM ጥገኛ አይደለም
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),ሰዓት (በ mins ውስጥ)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,መሠረታዊ
 DocType: Loan,Interest Income Account,የወለድ ገቢ ሰነድ
@@ -1381,6 +1392,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POS የመረጥን ፕሮፋይል
 DocType: Support Settings,Get Latest Query,የቅርብ ጊዜ መጠይቆችን ያግኙ
 DocType: Employee Incentive,Employee Incentive,ሰራተኛ ማበረታቻ
+DocType: Service Level,Priorities,ቅድሚያዎች
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,በመነሻ ገጽ ላይ ካርዶችን ወይም ብጁ ክፍሎችን ያክሉ
 DocType: Homepage,Hero Section Based On,በ Hero መነሻ ክፍል ላይ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),አጠቃላይ የግዢ ዋጋ (በግዢ ደረሰኝ በኩል)
@@ -1440,7 +1452,7 @@
 DocType: Blanket Order Item,Ordered Quantity,የታዘዘ ብዜት
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ረድፍ # {0}: ውድቅ የተደረገው ንጥረ ነገር {1} ተቀባይነት ያላገኘ የውድድር መጋዘን ግዴታ ነው
 ,Received Items To Be Billed,እንዲከፈልባቸው የተቀበሉ ንጥሎች
-DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
+DocType: Attendance,Working Hours,የስራ ሰዓት
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,የክፍያ ሁኔታ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,የግዢ ትዕዛዞች በወቅቱ ተቀባይነት የላቸውም
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,በቆይታ ጊዜ ውስጥ
@@ -1560,7 +1572,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,ስለአቅራቢዎ አስፈላጊ ህጋዊ መረጃ እና ሌላ አጠቃላይ መረጃ
 DocType: Item Default,Default Selling Cost Center,የነባሪ ዋጋ መሸጫ ዋጋ
 DocType: Sales Partner,Address & Contacts,አድራሻ እና እውቂያዎች
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎ በአካባቢያዊ ቅንጅቶች በኩል የቁጥር ተከታታይ ቁጥሮች ያቀናብሩ&gt; የስልክ ቁጥር
 DocType: Subscriber,Subscriber,ደንበኛ
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ቅጽ / ንጥል / {0}) አክሲዮን አልቋል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,እባክዎ መጀመሪያ የልኡክ ጽሁፍ ቀንን ይምረጡ
@@ -1571,7 +1582,7 @@
 DocType: Detected Disease,Tasks Created,ተግባራት ተፈጥረዋል
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,ነባሪ እቅር ({0}) ለዚህ ንጥል ወይም ለአብነትዎ ገባሪ መሆን አለበት
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,የኮሚሽል ተመን%
-DocType: Service Level,Response Time,የምላሽ ጊዜ
+DocType: Service Level Priority,Response Time,የምላሽ ጊዜ
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ቅንጅቶች
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,መጠኑ አዎንታዊ መሆን አለበት
 DocType: Contract,CRM,CRM
@@ -1588,7 +1599,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,የግብይት ውሂብ ማዛመጃ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,አንድ መሪ የግለሰቡን ስም ወይም የድርጅት ስም ያስፈልገዋል
 DocType: Student,Guardians,ሞግዚቶች
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት&gt; የትምህርት ቅንብሮች ያዋቅሩ
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ብራንድ ይምረጡ ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,መካከለኛ ገቢ
 DocType: Shipping Rule,Calculate Based On,መነሻ ላይ አስሉት
@@ -1625,6 +1635,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},የተማሪ መገኘት መዝገብ {0} በተማሪው ላይ ይገኛል {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,የግብይት ቀን
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,የደንበኝነት ምዝገባን ተወው
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,የአገልግሎት ደረጃ ስምምነት {0} ማዘጋጀት አልተቻለም.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,የተጣራ ደመወዝ መጠን
 DocType: Account,Liability,ተጠያቂነት
 DocType: Employee,Bank A/C No.,ባንክ አ / ካ
@@ -1713,7 +1724,6 @@
 DocType: Production Plan,Select Items to Manufacture,የሚሠሩ ንጥሎችን መምረጥ
 DocType: Leave Application,Leave Approver Name,የአድራሻ ስም ተወው
 DocType: Shareholder,Shareholder,ባለአክስዮን
-DocType: Issue,Agreement Status,የስምምነት ሁኔታ
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,ግብይቶችን ለመሸጥ ነባሪ ቅንብሮች.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,ለክፍያ ለተማሪው የሚያስፈልገውን የተማሪ ቅበላ የሚለውን እባክዎ ይምረጡ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM ምረጥ
@@ -1975,6 +1985,7 @@
 DocType: Account,Income Account,የገቢ መለያ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,ሁሉም መጋዘኖች
 DocType: Contract,Signee Details,የዋና ዝርዝሮች
+DocType: Shift Type,Allow check-out after shift end time (in minutes),ከማለቂያ ጊዜ በኋላ (ከደቂቃዎች በኋላ) ለመውጣት ይፍቀዱ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,ግዥ
 DocType: Item Group,Check this if you want to show in website,በድር ጣቢያ ውስጥ ማሳየት ከፈለጉ ይህንን ያረጋግጡ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,የፋይናንስ ዓመት {0} አልተገኘም
@@ -2041,6 +2052,7 @@
 DocType: Activity Cost,Billing Rate,የክፍያ መጠን
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},ማስጠንቀቂያ: ሌላ {0} # {1} በክምችት ማስገባት {2} ላይ ይኖራል
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,መስመሮችን ለመገመት እና ለማመቻቸት እባክዎ የ Google ካርታዎች ቅንብሮችን ያንቁ
+DocType: Purchase Invoice Item,Page Break,ገጽ ዕረፍት
 DocType: Supplier Scorecard Criteria,Max Score,ከፍተኛ ውጤት
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,የምላሽ መጀመሪያ ቀን ከክፍያ ቀን በፊት ሊሆን አይችልም.
 DocType: Support Search Source,Support Search Source,የፍለጋ ምንጭ ድጋፍ
@@ -2107,6 +2119,7 @@
 DocType: Employee Transfer,Employee Transfer,የሠራተኛ ማስተላለፍ
 ,Sales Funnel,የሽያጭ ቀዳዳ
 DocType: Agriculture Analysis Criteria,Water Analysis,የውሃ ትንተና
+DocType: Shift Type,Begin check-in before shift start time (in minutes),የሰዓት ማስጀመሪያ ጊዜ (ተመዝግበው በደቂቃ) ውስጥ ተመዝግበው ይግቡ
 DocType: Accounts Settings,Accounts Frozen Upto,መለያዎች ወደ አተነፈቀ
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,ለማረም ምንም ነገር የለም.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ክወናዎች {0} በስራ ሥልክ ቁጥር {1} ውስጥ ከሚገኙ የስራ ሰዓቶች በላይ ርዝመት አላቸው, ቀዶቹን ወደ ብዙ ክንዋኔዎች ይከፋፍሉ"
@@ -2120,7 +2133,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},የሽያጭ ቅደም ተከተል {0} {0} ነው
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),በክፍያ መዘግየት (ቀኖች)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,የዋጋ ቅነሳዎችን ይግለጹ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,የደንበኛ PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,የተያዘው የመላኪያ ቀን ከሽያጭ ትእዛዝ ቀን በኋላ መሆን አለበት
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,የንጥሉ መጠን ዜሮ ሊሆን አይችልም
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,ልክ ያልሆነ ባህርይ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},እባክዎን ቦምብ በንጥል ላይ {0} ን ይምረጡ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ደረሰኝ ዓይነት
@@ -2130,6 +2145,7 @@
 DocType: Volunteer,Afternoon,ከሰአት
 DocType: Vital Signs,Nutrition Values,የተመጣጠነ ምግብ እሴት
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ትኩሳት (የሙቀት&gt; 38.5 ° ሴ / 101.3 ° ፋ ወይም ዘላቂነት&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ማመሳከሪያ ስርዓትን በሰዎች ሃብት&gt; HR ቅንጅቶች ያዘጋጁ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC ተለዋዋጭ
 DocType: Project,Collect Progress,መሻሻል ይሰብስቡ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ኃይል
@@ -2180,6 +2196,7 @@
 ,Ordered Items To Be Billed,የተገዙ ንጥሎች እንዲከፈልባቸው ይደረጋል
 DocType: Taxable Salary Slab,To Amount,መጠን
 DocType: Purchase Invoice,Is Return (Debit Note),ተመላሽ ይባላል (ዕዳ መግለጫ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/config/desktop.py,Getting Started,መጀመር
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,አዋህደኝ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,የፊስካል አመት አንዴ ከተቀመጠ በኋላ የፊስካል ዓመትን መጀመሪያ ቀን እና የበጀት ዓመት መጨረሻ ቀን መለወጥ አይቻልም.
@@ -2198,8 +2215,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},የጥገና መጀመሪያ ቀን ለ &quot;Serial No&quot; {0} የመላኪያ ቀን
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,ረድፍ {0}: ልውውጥ አስገዳጅ ነው
 DocType: Purchase Invoice,Select Supplier Address,የአቅራቢ አድራሻን ይምረጡ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","የሚገኝ ያህል ቁጥር {0} ነው, {1} ያስፈልገዎታል"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,እባክዎ የኤ.ፒ.አይ. ተጠባባቂ ሚስጥር ያስገቡ
 DocType: Program Enrollment Fee,Program Enrollment Fee,ፕሮግራም የምዝገባ ክፍያ
+DocType: Employee Checkin,Shift Actual End,ቅጽበታዊ የመግቢያ መጨረሻ
 DocType: Serial No,Warranty Expiry Date,የዋስትና ጊዜ ማብቂያ ቀን
 DocType: Hotel Room Pricing,Hotel Room Pricing,የሆቴል ዋጋ መወጣት
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","ውጫዊ ታክስ የሚደረጉ ቁሳቁሶች (ከዜሮ ደረጃዎች ውጭ, ደረጃውን የጠበቀ እና ነፃ መሆን)"
@@ -2259,6 +2278,7 @@
 DocType: Quality Inspection Reading,Reading 5,ንባብ 5
 DocType: Shopping Cart Settings,Display Settings,ማሳያ ቅንብሮች
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,እባክዎን የተመነሱ የብዛቶች ብዛት ያዘጋጁ
+DocType: Shift Type,Consequence after,ውጤቱ በኋላ
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,ምን እርዳታ ይፈልጋሉ?
 DocType: Journal Entry,Printing Settings,የማተም ቅንብሮች
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ባንኮች
@@ -2268,6 +2288,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,የማስከፈያ አድራሻ ልክ Shipping Line
 DocType: Account,Cash,ገንዘብ
 DocType: Employee,Leave Policy,መምሪያ ይተው
+DocType: Shift Type,Consequence,ውጤት
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,የተማሪ አድራሻ
 DocType: GST Account,CESS Account,CESS መለያ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: የዋጋ ማዕከል ለ &#39;Profit and Loss&#39; መለያ {2} ያስፈልጋል. እባክዎ ለድርጅቱ ነባሪ ዋጋ ማስተካከያ ያዘጋጁ.
@@ -2332,6 +2353,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,የዘመኑን ቫውቸር
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 ስም
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,እባክዎ የወጪ ሂሳብን ያስገቡ
+DocType: Issue,Resolution By Variance,ጥራት በቫሪያር
 DocType: Employee,Resignation Letter Date,የመልቀቂያ ደብዳቤ ቀን
 DocType: Soil Texture,Sandy Clay,ሳንዲ ክሊይ
 DocType: Upload Attendance,Attendance To Date,በቀን መገኘት
@@ -2343,6 +2365,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Approval Status must be 'Approved' or 'Rejected',የማጽደቅ ሁኔታ «ማፅደቅ» ወይም «ውድቅ ተደርጓል» መሆን አለበት
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,አሁን ይመልከቱ
 DocType: Item Price,Valid Upto,ልክ እስከ
+DocType: Employee Checkin,Skip Auto Attendance,በራስ ተገኝነት ይዝለሉ
 DocType: Payment Request,Transaction Currency,የግብይት ምንዛሬ
 DocType: Loan,Repayment Schedule,የክፍያ ቅድሚያ ክፍያ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,የናሙና ማቆየት (አክቲቭ) አክቲቭ ኢንተርናሽናል
@@ -2414,6 +2437,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS የመጋሪያ ደረሰኝ ታክስ
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,እርምጃ ተጀምሯል
 DocType: POS Profile,Applicable for Users,ለተጠቃሚዎች ተፈጻሚ የሚሆን
+,Delayed Order Report,የዘገየ ትዕዛዝ ሪፖርት
 DocType: Training Event,Exam,ፈተና
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ትክክል ያልሆነ የጄኔራል ሌተር አስነብዎች ቁጥር ተገኝቷል. በግብይቱ ውስጥ የተሳሳተ መለያ መርጠህ ሊሆን ይችላል.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,የሽያጭ የቧንቧ መስመር
@@ -2428,10 +2452,10 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,ሁኔታዎች በሁሉም የተመረጡ ንጥረ ነገሮች ላይ ይተገበራሉ.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,አዋቅር
 DocType: Hotel Room,Capacity,ችሎታ
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,የተጫነ Qty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,የባንክ {0} ንጥል {1} ተሰናክሏል.
 DocType: Hotel Room Reservation,Hotel Reservation User,የሆቴል መያዣ ተጠቃሚ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,የስራ ቀን ሁለት ጊዜ ተደግሟል
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},የንጥሉ ቡድን በንጥል ጌታ ንጥል ላይ ለንጥል ነገር አልተጠቀሰም {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},የስም ስህተት: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,በ POS የመገለጫ ግዛት ያስፈልጋል
@@ -2479,6 +2503,7 @@
 DocType: Depreciation Schedule,Schedule Date,መርሐግብር ቀን
 DocType: Packing Slip,Package Weight Details,የጥቅል ክብደት ዝርዝሮች
 DocType: Job Applicant,Job Opening,የሥራ ክፍት
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,የመጨረሻው የታወቀ የተሳትፎ ምጣኔ የተሳካ. ሁሉንም ምዝግብ ማስታወሻዎች ሁሉም አካባቢዎች ከተመሳሰሉ እርግጠኛ ከሆኑ ብቻ ዳግም ያስጀምሩ. እርግጠኛ ካልሆኑ እባክዎ ይህንን አይለውጡ.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,ትክክለኛ ወጭ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,የንጥል ልዩነቶች ዘምነዋል
 DocType: Item,Batch Number Series,ቡት ቁጥር ተከታታይ
@@ -2522,6 +2547,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,ግብዣዎችን ያግኙ
 DocType: Tally Migration,Is Day Book Data Imported,የቀን መጽሐፍ ውሂብ ከውጭ የመጣ ነው
 ,Sales Partners Commission,የሽያጭ አጋሮች ኮሚሽን
+DocType: Shift Type,Enable Different Consequence for Early Exit,ለወጣቶች መውጣት የተለየ ውጤት ያንሱ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,ህጋዊ
 DocType: Loan Application,Required by Date,በቀን የሚያስፈልግ
 DocType: Quiz Result,Quiz Result,Quiz Result
@@ -2581,7 +2607,6 @@
 DocType: Pricing Rule,Pricing Rule,የዋጋ አሰጣጥ ደንብ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},የአማራጭ የእረፍት ቀን ለቀጣይ እረፍት አልተዘጋጀም {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,ተቀጣሪ ሰራተኛን ለማዘጋጀት እባክዎ የተቀጣሪ መዝገብ ውስጥ የተጠቃሚ መታወቂያ መስክ ያዘጋጁ
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,ለመወሰን ጊዜ
 DocType: Training Event,Training Event,የስልጠና ዝግጅት
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","በሰውነት ውስጥ መደበኛ የደም ግፊት ማረፊያ ወደ 120 mmHg ሲሊሲየም ሲሆን, 80 mmHg ዲያስቶሊክ, &quot;120/80 ሚሜ ኤችጂ&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,ስርዓቱ ገደቡ ዜሮ ከሆነ ሁሉንም ግቤቶች ያመጣል.
@@ -2624,6 +2649,7 @@
 DocType: Student Applicant,Approved,ጸድቋል
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},ከዕንደቱ በጀት ዓመት ውስጥ መሆን አለበት. ከዕለቱ = {0} አስመስለን
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,እባክዎ በግዢዎች ውስጥ የአቅራቢ ቡድን ያዘጋጁ.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} ልክ ያልኾነ የመገኘት ሁኔታ ነው.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ጊዜያዊ የመክፈቻ መለያ
 DocType: Purchase Invoice,Cash/Bank Account,ገንዘብ / የባንክ ሂሳብ
 DocType: Quality Meeting Table,Quality Meeting Table,የጥራት የስብሰባ ሰንጠረዥ
@@ -2659,6 +2685,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ምግብ, መጠጥ እና ትምባሆ"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,የኮርስ ቀመር
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,የንጥል እቃ ዝርዝር ዝርዝር
+DocType: Shift Type,Attendance will be marked automatically only after this date.,ክትትል ከዚህ ቀን በኋላ ብቻ በራስ-ሰር ምልክት ይደረግበታል.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,ለ UIN holders የተሰጡ አቅርቦቶች
 apps/erpnext/erpnext/hooks.py,Request for Quotations,ለማብራሪያዎች ጥያቄ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,አንዳንድ ምንዛሬ በመጠቀም ግቤቶች ከተለወጡ ሊቀየሩ ሊቀየር አይችልም
@@ -2707,7 +2734,6 @@
 DocType: Item,Is Item from Hub,ንጥል ከዋኝ ነው
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,የጥራት ሂደት.
 DocType: Share Balance,No of Shares,የአክስቶች ቁጥር
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ረድፍ {0}: በመድረሻ ሰዓት ({2} {3}) ውስጥ {4} በገፍያ {0} ውስጥ {#} አይገኝም.
 DocType: Quality Action,Preventive,መከላከል
 DocType: Support Settings,Forum URL,መድረክ ዩ አር ኤል
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,ሰራተኛ እና ተገኝነት
@@ -2929,7 +2955,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,ነባሪ ግብር እና ዋጋዎች
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,ይህ በአቅራቢው ግዥዎች ላይ የተመሠረተ ነው. ለዝርዝሮች ከታች ያለውን የጊዜ መስመር ይመልከቱ
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,ለስምነቱ የመነሻ እና መጨረሻ ቀን አስገባ.
 DocType: Delivery Note Item,Against Sales Invoice,በክፍያ መጠየቂያ ደረሰኝ ላይ
 DocType: Loyalty Point Entry,Purchase Amount,የግዢ መጠን
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ እንዲደረግ የተደረገው እንደጠፋ መወሰን አይቻልም.
@@ -2953,7 +2978,7 @@
 DocType: Lead,Organization Name,የድርጅት ስም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,ለተጠራቀመው ከትክክለኛ እና ትክክለኛ እስከ መስኮች አስገዳጅ ናቸው
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},ረድፍ # {0}: ባዶ ቁጥር እንደ {1} {2} መሆን አለበት
-DocType: Employee,Leave Details,ዝርዝሮችን ይተው
+DocType: Employee Checkin,Shift Start,መቀየሪያ ጀምር
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,የ {0} ሒሳቦች ከመዘጋታቸው በፊት የለውጥ ግብይቶች
 DocType: Driver,Issuing Date,ቀንን በማቅረብ ላይ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,ጠያቂ
@@ -2998,9 +3023,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,የገንዘብ ፍሰት ማካካሻ አብነት ዝርዝሮች
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,ምልመላ እና ስልጠና
 DocType: Drug Prescription,Interval UOM,የጊዜ ክፍተት UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,የእጅ ግዜ ቅንጅቶች ለራስ ተገኝነት
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ከመገበያያ ምንዛሬ እና ወደ መለኪያው ተመሳሳይ ሊሆን አይችልም
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,ፋርማሲቲካልስ
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,የእርዳታ ሰአቶች
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} ተሰርዟል ወይም ተዘግቷል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ረድፍ {0}: በደንበኛው የሚያገኙት ክፍያ ለኩባንያው መሆን አለበት
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),በ ቫውቸር (የተጠናከረ) ቡድን
@@ -3109,6 +3136,7 @@
 DocType: Territory,Territory Manager,የመሬት አስተዳዳሪ
 DocType: Lab Test,Sample ID,የናሙና መታወቂያ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,ጋሪው ባዶ ነው
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,የትምህርት ክትትል በሰራተኞች ቼኮች ውስጥ ምልክት ተደርጎበታል
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,ቋሚ ንብረት {0} ገቢ መሆን አለበት
 ,Absent Student Report,ያልተገለጸ የተማሪ ሪፖርት
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,በአጠቃላይ ትርፍ ውስጥ የተካተተ
@@ -3116,7 +3144,9 @@
 DocType: Travel Request Costing,Funded Amount,የተመዘገበ መጠን
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,እርምጃው ሊጠናቀቅ አልቻለም {0} {1} አልገባም
 DocType: Subscription,Trial Period End Date,የሙከራ ክፍለ ጊዜ መጨረሻ ቀን
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,በተመሳሳዩ ፈረቃ ወቅት እንደ ኖርዌይ እና ኦቲንግ ያሉ ግቤቶች
 DocType: BOM Update Tool,The new BOM after replacement,ከተተኪው በኋላ አዲስ ቦም
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,ንጥል 5
 DocType: Employee,Passport Number,የፓስፖርት ቁጥር
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,ጊዜያዊ መክፈቻ
@@ -3232,6 +3262,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,ሊቀርበው የሚችል አቅራቢ
 ,Issued Items Against Work Order,ከስራ ትእዛዝ ጋር የተደረጉ ያልተከበሩ ዕቃዎች
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ደረሰኝ በመፍጠር ላይ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ የመምህርውን ስም ስርዓትን በስርዓት&gt; የትምህርት ቅንብሮች ያዋቅሩ
 DocType: Student,Joining Date,ቀን መቀላቀል
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,ጣቢያን በመጠየቅ ላይ
 DocType: Purchase Invoice,Against Expense Account,የወጪ ሂሣብ መጠቀምን
@@ -3271,6 +3302,7 @@
 DocType: Landed Cost Item,Applicable Charges,የሚመለከታቸው ክፍያዎች
 ,Point of Sale,የሽያጭ ቦታ
 DocType: Authorization Rule,Approving User  (above authorized value),ተጠቃሚን ማጽደቅ (ከተፈቀደለት እሴት በላይ)
+DocType: Service Level Agreement,Entity,አካል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},መጠን {0} {1} ከ {2} ወደ {3} ተላልፏል
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},ደንበኛ {0} ለፕሮጀክት አልሆነም {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,ከፓርቲ ስም
@@ -3316,6 +3348,7 @@
 DocType: Soil Texture,Sand Composition (%),የአሸካ ቅንብር (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,የቀን መጽሐፍ ውሂብ ያስመጡ
+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} የስም ቅጥያዎችን ያዘጋጁ
 DocType: Asset,Asset Owner Company,የንብረት ባለቤት ኩባንያ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,የወጪ ጥያቄን ለመጠየቅ የወጪ ማእከል ያስፈልጋል
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} ለክለ-ቢት እሴት {1}
@@ -3373,7 +3406,6 @@
 DocType: Asset,Asset Owner,የንብረት ባለቤት
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},መጋዘን {0} በክፍል {1} ውስጥ መጋዘን ግዴታ ነው
 DocType: Stock Entry,Total Additional Costs,ጠቅላላ ተጨማሪ ወጭዎች
-DocType: Marketplace Settings,Last Sync On,የመጨረሻው አስምር በርቷል
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,እባክዎ ግብር እና ዋጋዎች ሰንጠረዥ ላይ ቢያንስ አንድ ረድፍ ያዘጋጁ
 DocType: Asset Maintenance Team,Maintenance Team Name,የጥገና ቡድን ስም
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,የወጪ ማዕከሎች ገበታ
@@ -3389,12 +3421,12 @@
 DocType: Job Card,WIP Warehouse,WIP መጋዘን
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-yYYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},የተጠቃሚው መታወቂያ ለሠራተኛ አልተዋቀረም {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","የሚገኝ qty {0} ነው, {1} ያስፈልገዎታል"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,የተጠቃሚ {0} ተፈጥሯል
 DocType: Stock Settings,Item Naming By,ንጥል ነገር ስም በ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,ታዝዟል
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ይህ የደንበኛ ቡድን ስብስብ ነው እና አርትዖት ሊደረግ አይችልም.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,የንብረት ጥያቄ {0} ተሰርዟል ወይም ቆሟል
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,በደንበኛው ተቀናሹ (የተመዝጋቢ መመዝገቢያ) ውስጥ የተመዘገቡበት ዓይነት
 DocType: Purchase Order Item Supplied,Supplied Qty,የተጫነ Qty
 DocType: Cash Flow Mapper,Cash Flow Mapper,የገንዘብ ፍሰት ማመልከቻ
 DocType: Soil Texture,Sand,አሸዋ
@@ -3452,6 +3484,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,በቡድን የቡድን ሰንጠረዥ ውስጥ የተገኘ የንጥል ቡድን
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,ደመወዝ በስምምነት
 DocType: Supplier Scorecard,Weighting Function,የክብደት ተግባር
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,መስፈርት ቀመርን ለመገምገም ስህተት
 ,Lab Test Report,የቤተ ሙከራ ሙከራ ሪፖርት
 DocType: BOM,With Operations,ከትግበራዎች ጋር
@@ -3465,6 +3498,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,ለጆርናሉ ምዝገባ ምንም ክፍያ አይኖርም
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ገባሪ ተማሪ ነው
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,የገቢ ማስገባት
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},የድርብ ተደጋጋሚነት: {0} የ {1} ወላጅ ወይም ልጅ ሊሆን አይችልም.
 DocType: Employee Onboarding,Activities,እንቅስቃሴዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,አንድ መጋዘን በጣም ጥብቅ ነው
 ,Customer Credit Balance,የደንበኛ ብድር ሂሳብ
@@ -3477,9 +3511,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,ለደንበኛው ብዙ ታማኝነት የሚባል ፕሮግራም ተገኝቷል. እባክዎ እራስዎ ይምረጡ.
 DocType: Patient,Medication,መድሃኒት
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,የታማኝነት ፕሮግራም የሚለውን ይምረጡ
+DocType: Employee Checkin,Attendance Marked,ተገኝተው ምልክት ተደርጎበታል
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,ጥሬ ዕቃዎች
 DocType: Sales Order,Fully Billed,ሙሉ ክፍያ የተከፈለ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},እባክዎን የሆስፒታሉ ዋጋ በ {} ላይ ያስቀምጡ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,አንድ እንደ ቅድሚያ ቅድሚያ እንደ ነባሪ ብቻ ይምረጡ.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},እባክዎ ለ &lt;Type&gt; መለያ (Ledger) ለይተው ይወቁ / ይፈጠሩ - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,ጠቅላላ ድግምግሞሽ / ሂሳብ መጠን ልክ እንደ ተገናኝ የጆርናል ምዝገባ ጋር ተመሳሳይ መሆን አለበት
 DocType: Purchase Invoice Item,Is Fixed Asset,ቋሚ ንብረት ነው
@@ -3500,6 +3536,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,የቀጠሮ ማረጋገጫ
 DocType: Shopping Cart Settings,Orders,ትዕዛዞች
 DocType: HR Settings,Retirement Age,የጡረታ ዕድሜ
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,በግብታዊ የታቀደ መጠን
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ስረዛ ለአገር አይፈቀድም {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},ረድፍ # {0}: ቋሚ ንብረት {1} አስቀድሞ {2} ነው
@@ -3583,11 +3620,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,አካውንታንት
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},የ POS እቃ የማረጋገጫ ቫውቸር ተቀናሽ በ {0} እና በ {1} መካከል ባለው {2}
 apps/erpnext/erpnext/config/help.py,Navigating,በመዳሰስ ላይ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,የትራንስፖርት ደረሰኞች የዝውውር ፍጥነት መለኪያ አያስፈልግም
 DocType: Authorization Rule,Customer / Item Name,የደንበኛ / የንጥል ስም
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,አዲሱ Serial No መጋዘን የለውም. መጋዘኑ በግብአት ዕቃ ግቤት ወይም የግዢ ደረሰኝ መቅረብ አለበት
 DocType: Issue,Via Customer Portal,በደንበኛ መግቢያ በኩል
 DocType: Work Order Operation,Planned Start Time,የታቀደ መጀመሪያ ሰዓት
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2} ነው
+DocType: Service Level Priority,Service Level Priority,የአገልግሎት ደረጃ ቅድሚያ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዝጋቢዎች ብዛት ከዳግም ትርጉሞች ጠቅላላ መጠን መብለጥ የለበትም
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Ledger አጋራ
 DocType: Journal Entry,Accounts Payable,ሂሳቦች መክፈል
@@ -3696,7 +3735,6 @@
 DocType: Delivery Note,Delivery To,ማድረስ ወደ
 DocType: Bank Statement Transaction Settings Item,Bank Data,የባንክ መረጃ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,መርሃግብር የተያዘለት እስከ
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,የክፍያ አከፋፋይ ሰዓቶችን እና የስራ ሰዓቶችን በየጊዜ ማቆየት ይመዝገቡ
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,በ &quot;ምንጭ&quot; የሚመራ መሪዎችን ይከታተሉ.
 DocType: Clinical Procedure,Nursing User,የነርሶች ተጠቃሚ
 DocType: Support Settings,Response Key List,የምላሽ ቁልፍ ዝርዝር
@@ -3862,6 +3900,7 @@
 DocType: Work Order Operation,Actual Start Time,ትክክለኛው ጅምር ሰዓት
 DocType: Antibiotic,Laboratory User,የላቦራቶሪ ተጠቃሚ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,የመስመር ላይ ጨረታዎች
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,ቅድሚያ የሚሰጠው {0} ተደግሟል.
 DocType: Fee Schedule,Fee Creation Status,የአገልግሎት ክፍያ ሁኔታ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,ሶፍትዌሮች
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,ለክፍያ ማዘዝ
@@ -3928,6 +3967,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,ለ {0} መረጃ ማምጣት አልተቻለም.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,የማስከፈያ ምንዛሬ ከተለመደው የኩባንያው ምንዛሬ ወይም የፓርቲው የመገበያያ ገንዘብ ጋር እኩል መሆን አለበት
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,እባክዎን የዚህ ሽያጭ ሰው የሰራተኛ መታወቂያ ያስገቡ
+DocType: Shift Type,Early Exit Consequence after,ቀደም ብሎ የሚደረግ መዘዝ
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,ክፍት የሽያጭ እና የግዢ ደረሰኞችን ይፍጠሩ
 DocType: Disease,Treatment Period,የሕክምና ጊዜ
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ኢሜይልን ማቀናበር
@@ -3945,7 +3985,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,የተማሪው ስም:
 DocType: SMS Log,Sent On,ተልኳል
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,የሽያጭ ደረሰኝ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,የምላሽ ጊዜ ከየክፍሉ ጊዜ በላይ ሊሆን አይችልም
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ከክፍል የተመሰረተ የተማሪ ቡድን, ኮርሱ ከተመዘገቡ ኮርሶች ውስጥ በመደበኛ ትምህርት ቤት ምዝገባ ለያንዳንዱ ተማሪ ይረጋገጣል."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,በአገር ውስጥ መንግሥት አቅርቦቶች
 DocType: Employee,Create User Permission,የተጠቃሚ ፍቃድ ፍጠር
@@ -3984,6 +4023,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,መደበኛ የሽያጭ ውል ለሽያጭ ወይም ለግዢ.
 DocType: Sales Invoice,Customer PO Details,የደንበኛ PO ዝርዝሮች
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ታካሚ አልተገኘም
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,ቅድመ-ቅደም ተከተል ይምረጡ.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,ክፍያው ለዚያ ንጥል የማይተገበር ከሆነ ንጥሉን ያስወግዱ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,የቡድኑ ቡድን ተመሳሳይ ስም ይኖረዋል እባክህ የደንበኛ ስም ቀይር ወይም የደንበኞችን ቡድን እንደገና ሰይም
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4023,6 +4063,7 @@
 DocType: Support Settings,Support Portal,የድጋፍ መግቢያ
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,የተግባር መጨረሻ <b>{0}</b> ከ <b>{1}</b> የሚጠበቀው የመጀመሪያ ቀን <b>{2}</b> ሊሆን አይችልም
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},ተቀጣሪ {0} በርቷል {1} ላይ
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},ይህ የአገልግሎት ደረጃ ስምምነት ለደንበኛ {0} የተወሰነ ነው
 DocType: Employee,Held On,ተይዟል
 DocType: Healthcare Practitioner,Practitioner Schedules,የልምድ መርሐ ግብሮች
 DocType: Project Template Task,Begin On (Days),ጀምር በ (ቀኖች)
@@ -4030,6 +4071,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},የስራ ትዕዛዝ {0}
 DocType: Inpatient Record,Admission Schedule Date,የምዝገባ የጊዜ ሰሌዳ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,የንብረት ማስተካከያ
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,ለዚህ ለውጥ የተመደቡት ተቀጣሪዎች ላይ በ &#39;ተቀጥሮ መቆጣጠሪያ&#39; ላይ ተመስርተው መከታተል.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,እቃዎች ባልተመዘገቡት ግለሰቦች የተሰጡ አቅርቦቶች
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,ሁሉም ስራዎች
 DocType: Appointment Type,Appointment Type,የቀጠሮ አይነት
@@ -4143,7 +4185,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),የጥቅሉ አጠቃላይ ክብደት. በአብዛኛው የተጣራ ክብደት + ጥቅል ክብደት. (ለማተም)
 DocType: Plant Analysis,Laboratory Testing Datetime,የላቦራቶሪ ሙከራ ጊዜ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,እቃው {0} ባች ሊኖረው አይችልም
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,የሽያጭ ቧንቧ መስመር በደረጃ
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,የተማሪዎች ቡድን ጥንካሬ
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,የባንክ መግለጫ መግለጫ ግብይት
 DocType: Purchase Order,Get Items from Open Material Requests,ከእቃ ምድቦች ጥያቄዎችን ያግኙ
@@ -4225,7 +4266,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,የእርጅና መገልገያ ቁሳቁሶችን አሳይ
 DocType: Sales Invoice,Write Off Outstanding Amount,ያልተከፈለ ገንዘብን ጻፍ
 DocType: Payroll Entry,Employee Details,የሰራተኛ ዝርዝሮች
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,የመጀመሪያ ጊዜ ከ {0} ማብቂያ ጊዜ በላይ መሆን አይችልም.
 DocType: Pricing Rule,Discount Amount,የቅናሽ መጠን
 DocType: Healthcare Service Unit Type,Item Details,የንጥል ዝርዝሮች
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js,From Delivery Note,ከማላከቻ ማስታወሻ
@@ -4277,7 +4317,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,የተጣራ ደሞዝ አሉታዊ ሊሆን አይችልም
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,የበስተጀርባዎች ብዛት
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},ረድፍ {0} # ንጥል {1} ከ {2} በላይ የግዢ ትዕዛዝ {3} ን ማስተላለፍ አይቻልም
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,ቀይር
+DocType: Attendance,Shift,ቀይር
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,የሂሳቦችን እና ፓርቲዎችን ያቀናብሩ
 DocType: Stock Settings,Convert Item Description to Clean HTML,የኤች ቲ ኤም ኤልን የንጥል መግለጫ ቀይር
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,ሁሉም አቅራቢ ድርጅቶች
@@ -4348,6 +4388,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,የወላጅ አገልግሎት ክፍል
 DocType: Sales Invoice,Include Payment (POS),ክፍያ አካት (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,የግል እሴት
+DocType: Shift Type,First Check-in and Last Check-out,ለመጀመሪያ ጊዜ ተመዝግበው የሚገቡበት እና የመጨረሻ ቆጠራ
 DocType: Landed Cost Item,Receipt Document,ደረሰኝ ሰነድ
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,የአገልግሎት አቅራቢ ካርድ ጊዜ
 DocType: Employee Grade,Default Salary Structure,መደበኛ የደመወዝ ስኬት
@@ -4430,6 +4471,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,የግዢ ትዕዛዝ ፍጠር
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,ለአንድ የበጀት ዓመት በጀት አውጣ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,የመለያዎች ሰንጠረዥ ባዶ ሊሆን አይችልም.
+DocType: Employee Checkin,Entry Grace Period Consequence,የመግቢያ ጸጋ ግዥ ዘመን
 ,Payment Period Based On Invoice Date,በደረሰኝ ቀን ላይ ተመስርቶ የክፍያ ክፍለ ጊዜ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},የመጫኛ ቀን ለንጥል {0} የመላኪያ ቀን ከመድረሱ በፊት መሆን አይችልም
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,ወደ ቁሳዊ ጥያቄ አገናኝ
@@ -4438,6 +4480,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: ዳግም ማስያዝ ግቤት በዚህ መጋዘን ውስጥ አስቀድሞም ይገኛል {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 DocType: Monthly Distribution,Distribution Name,የስርጭት ስም
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,የስራ ቀን {0} ተከስቷል.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,ቡድን ያልሆኑ ቡድኖች
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,በሂደት ላይ ያለ ዝማኔ. የተወሰነ ጊዜ ሊወስድ ይችላል.
 DocType: Item,"Example: ABCD.#####
@@ -4450,6 +4493,7 @@
 DocType: Vehicle Log,Fuel Qty,የነዳጅ ብዛት
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,ወጡ
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,በቼክ ሒሳቡ ውስጥ ተገኝተው ለመከታተል የሚወሰዱበት የጊዜ ገደብ ከሰዓት በኋላ.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,የተጣራ ሂሳብ ለውጥ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,አይገኝም
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,የትርፍ ጊዜ
@@ -4463,7 +4507,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,PDC ን በፋይል ውስጥ አሳይ
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,አቅራቢን ግዛ
 DocType: POS Profile User,POS Profile User,POS የመገለጫ ተጠቃሚ
-DocType: Student,Middle Name,የአባት ስም
 DocType: Sales Person,Sales Person Name,የሽያጭ ሰው ስም
 DocType: Packing Slip,Gross Weight,ጠቅላላ ክብደት
 DocType: Journal Entry,Bill No,ቢል ቁጥር
@@ -4472,7 +4515,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,ሃ-ኤች-ቪሎግ-ያዮይሂ.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,የአገልግሎት ደረጃ ስምምነት
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,እባክዎን መጀመሪያ የቀጣሪ እና ቀን ይምረጡ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,የተቀረው የቫውቸር ዋጋ ከግምት በማስገባት የንጥል ዋጋ መገምገም ተሻሽሏል
 DocType: Timesheet,Employee Detail,የሠራተኛ ዝርዝር
 DocType: Tally Migration,Vouchers,ቫውቸር
@@ -4507,7 +4549,7 @@
 DocType: Additional Salary,Date on which this component is applied,ይህ ክፍል የተተገበረበት ቀን
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,የሚገኙትን አክሲዮኖች በ folio ቁጥሮች ዝርዝር
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,የአግባቢ ፍኖት መለያዎችን ያዋቅሩ.
-DocType: Service Level,Response Time Period,የምላሽ ጊዜ ጊዜ
+DocType: Service Level Priority,Response Time Period,የምላሽ ጊዜ ጊዜ
 DocType: Purchase Invoice,Purchase Taxes and Charges,የግብር ግብሮችን እና ክፍያዎች ይግዙ
 DocType: Course Activity,Activity Date,የእንቅስቃሴ ቀን
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,አዲስ ደንበኛ ይምረጡ ወይም ያክሉ
@@ -4532,6 +4574,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,የፋይናንስ ዓመት
 DocType: Sales Invoice Item,Deferred Revenue,የተዘገበው ገቢ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,ከመሸጠ / ከሻተኛው ውስጥ አንዱን መምረጥ አለበት
+DocType: Shift Type,Working Hours Threshold for Half Day,የሥራ ሰዓታት የግማሽ ቀን ጣልቃገብነት
 ,Item-wise Purchase History,የንጥል-ሁኔታ ግዢ ታሪክ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},በረድፍ {0} ውስጥ የንጥል አገልግሎት ማብቂያ ቀን መለወጥ አይቻልም
 DocType: Production Plan,Include Subcontracted Items,ንዐስ የተሠሩ ንጥሎችን አካትት
@@ -4564,6 +4607,7 @@
 DocType: BOM,Allow Same Item Multiple Times,ተመሳሳይ ንጥል ብዙ ጊዜ ፍቀድ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,ቦምብን ይፍጠሩ
 DocType: Healthcare Practitioner,Charges,ክፍያዎች
+DocType: Employee,Attendance and Leave Details,የትምህርት ክትትል እና ዝርዝር ሁኔታዎችን ይተው
 DocType: Student,Personal Details,የግል መረጃ
 DocType: Sales Order,Billing and Delivery Status,የሂሳብ አከፋፈል እና አቅርቦት ሁኔታ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,ረድፍ {0}: ለሽያጭ {0} ኢሜይል ለመላክ የኢሜይል አድራሻ ያስፈልጋል
@@ -4614,7 +4658,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},ግቤትን {0} እና {1} ያስገቡ
 DocType: Purchase Order,Order Confirmation Date,የትዕዛዝ ማረጋገጫ ቀን
 DocType: Delivery Trip,Calculate Estimated Arrival Times,የተገመተ የመድረስ ጊዜዎችን አስሉ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ የሰራተኛ ማመሳከሪያ ስርዓትን በሰዎች ሃብት&gt; HR ቅንጅቶች ያዘጋጁ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,መጠቀሚያ
 DocType: Instructor,EDU-INS-.YYYY.-,ኢዲ-ኢንተስ-ዮናስ.-
 DocType: Subscription,Subscription Start Date,የደንበኝነት ምዝገባ ጅምር
@@ -4636,7 +4679,7 @@
 DocType: Journal Entry Account,Journal Entry Account,የጆርናል ምዝገባ መዝገብ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,ተርጓሚ
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,የውይይት መድረክ
-DocType: Service Level,Resolution Time Period,የምስል ሰዓት ጊዜ
+DocType: Service Level Priority,Resolution Time Period,የምስል ሰዓት ጊዜ
 DocType: Request for Quotation,Supplier Detail,አቅራቢ ዝርዝር
 DocType: Project Task,View Task,ተግባር ይመልከቱ
 DocType: Serial No,Purchase / Manufacture Details,የግዢ / ምርት ዝርዝሮች
@@ -4703,6 +4746,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,መጋዘን ሊለወጥ የሚችሉት በስታቲስቲክስ መግቢያ / የመላኪያ ማስታወሻ / የግዢ ደረሰኝ ብቻ ነው
 DocType: Support Settings,Close Issue After Days,ከጥቂት ቀናት በኋላ ጉዳይን ይዝጉ
 DocType: Payment Schedule,Payment Schedule,የክፍያ ዕቅድ
+DocType: Shift Type,Enable Entry Grace Period,የመግቢያ ጸጋ ግሪትን ያንቁ
 DocType: Patient Relation,Spouse,ሚስት
 DocType: Purchase Invoice,Reason For Putting On Hold,ተይዘው እንዲቀመጡ የሚያደርጉ ምክንያቶች
 DocType: Item Attribute,Increment,ጭማሪ
@@ -4841,6 +4885,7 @@
 DocType: Vehicle Log,Invoice Ref,ደረሰኝ ማጣቀሻ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},የ C-ቅጽ በደረሰኝ ውስጥ አይተገበርም: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,ደረሰኝ ተፈጥሯል
+DocType: Shift Type,Early Exit Grace Period,የቅድሚያ መውጫ የችሮታ ወቅት
 DocType: Patient Encounter,Review Details,የግምገማዎች ዝርዝር
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: የሰዓት ዋጋ ከዜሮ በላይ መሆን አለበት.
 DocType: Account,Account Number,የመለያ ቁጥር
@@ -4852,7 +4897,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","ኩባንያው SpA, SApA ወይም SRL ከሆነ"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,በሚከተለው መካከል የተደባለቁ ሁኔታዎች:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,ይከፈላል እና አልተረፈም
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,ንጥሉ አይቀዘቅዝም ምክንያቱም ንጥሉ በራስሰር አይቆጠርም
 DocType: GST HSN Code,HSN Code,HSN ኮድ
 DocType: GSTR 3B Report,September,መስከረም
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,አስተዳደራዊ ወጪዎች
@@ -4898,6 +4942,7 @@
 DocType: Opportunity,Sales Stage,የሽያጭ ደረጃ
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,የሽያጭ ትእዛዞቹን ካስቀመጡ በኋላ በቃላት ውስጥ ይታያሉ.
 DocType: Item Reorder,Re-order Level,ደረጃን እንደገና ትዕዛዝ
+DocType: Shift Type,Enable Auto Attendance,በራስ ተገኝነት አንቃ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,ምርጫ
 ,Department Analytics,መምሪያ ትንታኔ
 DocType: Crop,Scientific Name,ሳይንሳዊ ስም
@@ -4910,6 +4955,7 @@
 DocType: Quiz Activity,Quiz Activity,የጥያቄ እንቅስቃሴ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} በትክክለኛ የዊንበር ፊደል ውስጥ አይደለም
 DocType: Timesheet,Billed,ተከፈለ
+apps/erpnext/erpnext/config/support.py,Issue Type.,የችግር አይነት.
 DocType: Restaurant Order Entry,Last Sales Invoice,የመጨረሻው የሽያጭ ደረሰኝ
 DocType: Payment Terms Template,Payment Terms,የክፍያ ውል
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",የተያዙ ቁጥሮች: ቁጥሩ ለሽያጭ ቀርቧል ነገር ግን አልደረሰም.
@@ -5003,6 +5049,7 @@
 DocType: Account,Asset,ንብረት
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} የጤና አጠባበቅ ዕቅድ ፕሮግራም የለውም. በጤና እንክብካቤ የህክምና ባለሙያ ጌታ ላይ አክለው
 DocType: Vehicle,Chassis No,ሻይስ ቁጥር
+DocType: Employee,Default Shift,ነባሪ ሽግግር
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,የኩባንያ አህጽሮተ ቃል
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,ቁሳቁሶች የለውዝ ዛፍ
 DocType: Article,LMS User,የ LMS ተጠቃሚ
@@ -5050,6 +5097,7 @@
 DocType: Sales Person,Parent Sales Person,የወላጅ ሽያጭ ሰው
 DocType: Student Group Creation Tool,Get Courses,ኮርሶች ያግኙ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ረድፍ # {0}: መጠኑ 1 መሆን አለበት, ምክንያቱም ንጥሉ ቋሚ ንብረት ነው. እባክዎን በተለያየ ረድፍ ለብዙ ጂዮዎች ይጠቀሙ."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),የስራ ሰዓቶች ከዚህ በታች ያልተጠቀሱ የስራ ሰዓቶች. (ለማሰናከል ዜሮ)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,በግብይት ውስጥ ብቻ የወረቀት መጋጠጦች ይፈቀዳሉ
 DocType: Grant Application,Organization,ድርጅት
 DocType: Fee Category,Fee Category,የአገልግሎት ምድብ
@@ -5062,6 +5110,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,እባክዎ ለዚህ የሥልጠና በዓል ያለዎትን ሁኔታ ያሻሽሉ
 DocType: Volunteer,Morning,ጠዋት
 DocType: Quotation Item,Quotation Item,የዝርዝር ንጥል
+apps/erpnext/erpnext/config/support.py,Issue Priority.,ቅድሚያ መስጠት.
 DocType: Journal Entry,Credit Card Entry,የክሬዲት ካርድ መግቢያ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","የሰዓት ማስገቢያ ተዘሏል, ተንሸራታቹ {0} እስከ {1} የገባበት ቀዳዳ {2} ወደ {3} ይደግማል"
 DocType: Journal Entry Account,If Income or Expense,የገቢ ወይም ወጪ ከሆነ
@@ -5109,11 +5158,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,ውሂብ አስመጣ እና ቅንጅቶች
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","ራስ-መርጣ አማራጮች ከተመረጡ, ደንበኞቻቸው ከሚመለከታቸው የ &quot;ታማኝ ፌዴሬሽን&quot; (ተቆጥረው) ጋር በቀጥታ ይያዛሉ."
 DocType: Account,Expense Account,የወጪ ሂሳብ
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,የቀጣሪው ቼክ ተመዝግቦ የሚገኘበት ጊዜ ከመድረሱ በፊት ያለው ጊዜ.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ከአሳዳጊ ጋር ያለው ግንኙነት 1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,ካርኒን ይፍጠሩ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},የክፍያ ጥያቄ አስቀድሞም ይገኛል {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',ተቀጥቶ በ {0} ላይ ተቆጠረ ተቀጣሪ &#39;ግራ&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},ይክፈሉ {0} {1}
+DocType: Company,Sales Settings,የሽያጭ ቅንብሮች
 DocType: Sales Order Item,Produced Quantity,የተፈጨ ቁጥር
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,በሚቀጥለው አገናኝ ላይ የቁጥር ጥያቄን ማግኘት ይቻላል
 DocType: Monthly Distribution,Name of the Monthly Distribution,የወርሃዊ ስርጭት ስም
@@ -5192,6 +5243,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,ለሽያጭ እና ለግዢ ነባሪ የግብር አብነቶች ተፈጥረዋል.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ከክፍል ውጣ {0} ተሸካሚ ማስተላለፍ አይቻልም
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,የዕዳ ሂሳብ ወደ ተቀናሽ ሂሳብ መቀበል የሚቻል ነው
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,ስምምነቱ የሚጠናቀቅበት ቀን ከዛሬ ያነሰ ሊሆን አይችልም.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,እንደ ነባሪ አዘጋጅ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),የዚህ ጥቅል የተጣራ ክብደት. (በንጥል የተጣራ የተጣራ ክብደት ድምር ይሰላል)
 apps/erpnext/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py,Cannot set the field <b>{0}</b> for copying in variants,በተለዋጭ ውስጥ ለማዘጋጀት መስኩን <b>{0}</b> ማቀናበር አይቻልም
@@ -5217,8 +5269,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,ጊዜያቸው ያልደረሱ ታች
 DocType: Shipping Rule,Shipping Rule Type,የመርከብ ደንብ ዓይነት
 DocType: Job Offer,Accepted,ተቀባይነት አግኝቷል
-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> \ ሰርዝ"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,ለግምገማ መስፈርትዎ አስቀድመው ገምግመውታል {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,የቡድን ቁጥሮች ይምረጡ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),ዕድሜ (ቀኖች)
@@ -5245,6 +5295,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,ጎራዎችዎን ይምረጡ
 DocType: Agriculture Task,Task Name,ተግባር ስም
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,ክምችት ምዝገባዎች ቀድሞ ለስራ ትእዛዝ ተከፍተዋል
+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> \ ሰርዝ"
 ,Amount to Deliver,የሚያድሱበት መጠን
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,ኩባንያ {0} አይገኝም
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ለተጠቀሱት ንጥሎች አገናኝ ለማድረግ በመጠባበቅ ላይ ያለ የይዘት ጥያቄ የለም.
@@ -5293,6 +5345,7 @@
 DocType: Lab Prescription,Test Code,የሙከራ ኮድ
 DocType: Purchase Taxes and Charges,On Previous Row Total,ባለፈው ረድፍ ጠቅላላ
 DocType: Student,Student Email Address,የተማሪ ኢሜይል አድራሻ
+,Delayed Item Report,የዘገየው የንጥል ሪፖርት
 DocType: Academic Term,Education,ትምህርት
 DocType: Supplier Quotation,Supplier Address,የአቅራቢ አድራሻ
 DocType: Salary Detail,Do not include in total,በአጠቃላይ አያካትቱ
@@ -5300,7 +5353,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} አይገኝም
 DocType: Purchase Receipt Item,Rejected Quantity,ውድቅ የተደረገ እ
 DocType: Cashier Closing,To TIme,ለ TIme
-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: Daily Work Summary Group User,Daily Work Summary Group User,ዕለታዊ የጥናት ማጠቃለያ ቡድን ተጠቃሚ
 DocType: Fiscal Year Company,Fiscal Year Company,የፋይናንስ ዓመት ካምፓኒ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,ተለዋጭ ንጥል እንደ የንጥል ኮድ ተመሳሳይ መሆን የለበትም
@@ -5352,6 +5404,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,በማደል ማቆሚያዎች መካከል ያለው መዘግየት
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[እለታዎች] የቆዩ እቃዎችን የቆሸሸ
 DocType: Promotional Scheme,Promotional Scheme Product Discount,የማስተዋወቂያ ዕቅድ የምርት ቅናሽ
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,ቅድሚያ የሚሰጠው ጉዳይ አስቀድሞ አልዎት
 DocType: Account,Asset Received But Not Billed,እዳ የተቀበል ቢሆንም ግን አልተከፈለም
 DocType: POS Closing Voucher,Total Collected Amount,ጠቅላላ የተሰበሰበው መጠን
 DocType: Course,Default Grading Scale,ነባሪ የደረጃ ስሌት መለኪያ
@@ -5394,6 +5447,7 @@
 DocType: Contract,Fulfilment Terms,የመሟላት ለውጦች
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ከቡድን ያልሆኑ ቡድኖች
 DocType: Student Guardian,Mother,እናት
+DocType: Issue,Service Level Agreement Fulfilled,የአገልግሎት ደረጃ ስምምነት ይጠናቀቃል
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,ያልተሰጠ ሰራተኛ ጥቅማጥቅሞችን ግብር ይቀንሳል
 DocType: Travel Request,Travel Funding,የጉዞ የገንዘብ ድጋፍ
 DocType: Shipping Rule,Fixed,ተጠግኗል
@@ -5423,10 +5477,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ምንም ንጥሎች አልተገኙም.
 DocType: Item Attribute,From Range,ከርቀት
 DocType: Clinical Procedure,Consumables,ዕቃዎች
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; እና &#39;timestamp&#39; የሚፈለጉ ናቸው.
 DocType: Purchase Taxes and Charges,Reference Row #,የማጣቀሻ ረድፍ #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},እባክዎን &#39;የንብረት አፈፃፀም ዋጋ ማዕከል&#39; በኩባንያ ውስጥ ያቀናብሩ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,ረድፍ # {0}: የባለጉዳይ ድርጊቱን ለማጠናቀቅ የክፍያ ሰነድ ያስፈልጋል
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,የእርስዎን የሽያጭ ትዕዛዝ ውሂብ ከአማዞን MWS ለመሳብ ይህን አዝራር ጠቅ ያድርጉ.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),የግማሽ ቀን ምልክት የተደረገበት የስራ ሰዓት. (ለማሰናከል ዜሮ)
 ,Assessment Plan Status,የግምገማ ዕቅድ ሁኔታ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,እባክዎ መጀመሪያ {0} ይምረጡ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,የሰራተኛ መዝገብ ለመፍጠር ይህን ይላኩ
@@ -5497,6 +5553,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,ክፍት የሚሆን
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,ማጣሪያዎችን ቀያይር
 DocType: Production Plan,Material Request Detail,የጥራት ጥያቄ ዝርዝር
+DocType: Shift Type,Process Attendance After,ሂደት ተሳታፊ በኋላ
 DocType: Material Request Item,Quantity and Warehouse,ብዛት እና መጋዘን
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,ወደ ፕሮግራሞች ሂድ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},ረድፍ # {0}: ማጣቀሻዎች {1} {2} አባዛ
@@ -5554,6 +5611,7 @@
 DocType: Pricing Rule,Party Information,የድግስ መረጃ
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debtors ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,እስከ ቀን ድረስ ከሰራተኞች የማስታቂያ ቀን በላይ ሊሆን አይችልም
+DocType: Shift Type,Enable Exit Grace Period,መውጣት የ Grace ክፍለ ጊዜን አንቃ
 DocType: Expense Claim,Employees Email Id,የሠራተኞች የኢሜል መታወቂያ
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,የሻጭ ዋጋ ከሻርክፍ ወደ ኤአርፒኢዜል ዋጋ ዝርዝር
 DocType: Healthcare Settings,Default Medical Code Standard,ነባሪ የሕክምና ኮድ መደበኛ
@@ -5584,7 +5642,6 @@
 DocType: Budget,Applicable on Material Request,በወሳኝ ጥያቄ ላይ ተ
 DocType: Support Settings,Search APIs,ኤፒአይ ፈልግ
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,የሽያጭ ምርት በመቶኛ ለሽያጭ ትእዛዝ
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,ዝርዝሮች
 DocType: Purchase Invoice,Supplied Items,የተዘጋጁ ዕቃዎች
 DocType: Leave Control Panel,Select Employees,ሰራተኞችን ይምረጡ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},በብድር ውስጥ የወለድ ገቢን ይምረጡ {0}
@@ -5610,7 +5667,7 @@
 ,Supplier-Wise Sales Analytics,አቅራቢ-ጥሩ የሽያጭ ትንታኔዎች
 DocType: GSTR 3B Report,February,የካቲት
 DocType: Appraisal,For Employee,ለተቀጣሪ
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,ትክክለኛው የመላኪያ ቀን
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,ትክክለኛው የመላኪያ ቀን
 DocType: Sales Partner,Sales Partner Name,የሽያጭ አጋር ስም
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,የዝቅተኛ ዋጋ ረድፍ {0}: የአበሻ ማስወገጃ ቀን ልክ እንደ ያለፈበት ቀን ገብቷል
 DocType: GST HSN Code,Regional,ክልላዊ
@@ -5649,6 +5706,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,የአገልግሎት አቅራቢ ካርድ
 DocType: Travel Itinerary,Travel To,ወደ ጉዞ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,ተመዝግበው ይግቡ እና ተመዝግበው ይውጡ
 DocType: POS Closing Voucher,Difference,ልዩነት
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,ትንሽ
 DocType: Work Order Item,Work Order Item,የስራ ቅደም ተከተል ንጥል
@@ -5682,6 +5740,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,መድሃኒት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ተዘግቷል
 DocType: Patient,Medical History,የህክምና ታሪክ
+DocType: Expense Claim,Expense Taxes and Charges,ወጭ ግብር እና ክፍያዎች
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,የደንበኝነት ምዝገባን ከመሰረዝዎ ወይም ምዝገባውን እንደትከፈል ከመመዝገብዎ በፊት የክፍያ መጠየቂያ ቀን ካለፈ በኋላ ያሉት ቀናት
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,የማጠናቀቅ ማስታወሻ {0} አስቀድሞ ገብቷል
 DocType: Patient Relation,Family,ቤተሰብ
@@ -5714,7 +5773,6 @@
 DocType: Dosage Strength,Strength,ጥንካሬ
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,ይህንን ግብይት ለማጠናቀቅ {0} የ {1} አሃዶች በ {2} ውስጥ ያስፈልጋሉ.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,የቢሮ ውለታ ተረፈ ምርቶች
-DocType: Bank Guarantee,Customer,ደንበኛ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",ከነቃ የፕሮግራም የምዝገባ መሳሪያ የግድ የአካዳሚክ ቃል ግዴታ ይሆናል.
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ለ ጅት የተመሰረተ የተማሪ ቡድን, የተማሪ ቦት ለእያንዳንዱ ተማሪ ከፕሮግራሙ ምዝገባ ጋር የተረጋገጠ ይሆናል."
 DocType: Course,Topics,ርዕሶች
@@ -5872,6 +5930,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),መዝጊያ (መከፈቻ + ጠቅላላ)
 DocType: Supplier Scorecard Criteria,Criteria Formula,የመስፈርት ቀመር
 apps/erpnext/erpnext/config/support.py,Support Analytics,ትንታኔዎችን ያግዙ
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),የመሳተፍ የመሳሪያ መታወቂያ (ባዮሜትሪክ / ኤም አር መለያ መታወቂያ)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,ግምገማ እና እርምጃ
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","መለያው በረዶ ከሆነ, ግቤቶች ለተገደቡ ተጠቃሚዎች ይፈቀዳሉ."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,ከአበበ ከዋለ በኋላ ያለው መጠን
@@ -5893,6 +5952,7 @@
 DocType: Salary Slip,Loan Repayment,ብድር ክፍያ
 DocType: Employee Education,Major/Optional Subjects,ዋና / አማራጭ ነክ ጉዳዮች
 DocType: Soil Texture,Silt,ዝለል
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,የአቅራቢዎች እና አድራሻዎች አቅራቢ
 DocType: Bank Guarantee,Bank Guarantee Type,የባንክ ዋስትና ቃል አይነት
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ካሰናከሉ, «የተሸነለ ጠቅላላ» መስክ በማንኛውም ግብይት ውስጥ አይታይም"
 DocType: Pricing Rule,Min Amt,ደቂቃ አፐት
@@ -5931,6 +5991,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,የደረሰኝ ቅሬታ ማቅረቢያ መሣሪያን መክፈት
 DocType: Soil Analysis,(Ca+Mg)/K,(ካም + ኤምግ) / ኬ
 DocType: Bank Reconciliation,Include POS Transactions,የ POS ሽግግሮችን አክል
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},ለተሰጠው የሰራተኛው የመስክ እሴት ሰራተኛ ምንም አልተገኘም. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),የተቀበሉት መጠን (የኩባንያው የገንዘብ ምንዛሬ)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","የአካባቢው ማከማቻ ሙሉ ነው, አያድንም"
 DocType: Chapter Member,Chapter Member,የምዕራፍ አባል
@@ -5963,6 +6024,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,ምንም የተማሪ ቡድኖች አልተፈጠሩም.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},ተመሳሳይ ረድፍ {0} በተመሳሳይ {1} ላይ
 DocType: Employee,Salary Details,የደሞዝ ዝርዝሮች
+DocType: Employee Checkin,Exit Grace Period Consequence,የ Grace Perit Consequence መውጣት
 DocType: Bank Statement Transaction Invoice Item,Invoice,ደረሰኝ
 DocType: Special Test Items,Particulars,ዝርዝሮች
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,እባክዎ በንጥል ወይም መጋዘን ላይ ተመስርተው ማጣሪያ ያዘጋጁ
@@ -6063,6 +6125,7 @@
 DocType: Serial No,Out of AMC,ከ AMC ውጭ
 DocType: Job Opening,"Job profile, qualifications required etc.","የስራ ዝርዝር, አስፈላጊ መመዘኛዎች ወዘተ."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,ወደ ዋናው መርከብ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,ጥያቄውን ለማስረከብ ይፈልጋሉ?
 DocType: Opportunity Item,Basic Rate,መሠረታዊ ደረጃ
 DocType: Compensatory Leave Request,Work End Date,የስራ መጨረሻ ቀን
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,ጥሬ እቃዎች ጥያቄ
@@ -6247,6 +6310,7 @@
 DocType: Sales Order Item,Gross Profit,ጠቅላላ ትርፍ
 DocType: Quality Inspection,Item Serial No,የእቃ ዕቃ ዝርዝር ቁጥር
 DocType: Asset,Insurer,ኢንሹራንስ
+DocType: Employee Checkin,OUT,ውጣ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,መጠን መግዛት
 DocType: Asset Maintenance Task,Certificate Required,የምስክር ወረቀት ያስፈልጋል
 DocType: Retention Bonus,Retention Bonus,የማቆየት ጉርሻ
@@ -6359,6 +6423,8 @@
 DocType: Invoice Discounting,Sanctioned,ተገድሏል
 DocType: Course Enrollment,Course Enrollment,ኮርስ ምዝገባ
 DocType: Item,Supplier Items,የአቅራቢ ንጥሎች
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",የመጀመሪያ ጊዜ ከ &lt;End&gt; \ {0} በላይ ወይም እኩል ሊሆን አይችልም.
 DocType: Sales Order,Not Applicable,ተፈፃሚ የማይሆን
 DocType: Support Search Source,Response Options,የምላሽ አማራጮች
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} በ 0 እና 100 መካከል የሆነ እሴት መሆን አለበት
@@ -6443,7 +6509,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,ቋሚ ንብረት
 DocType: Purchase Order,Ref SQ,Ref QQ
 DocType: Salary Structure,Total Earning,ጠቅላላ ገቢ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የሽያጭ ቡድን&gt; ግዛት
 DocType: Share Balance,From No,ከ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,የክፍያ ማስታረቅ ደረሰኝ
 DocType: Purchase Invoice,Taxes and Charges Added,ግብሮችን እና ክፍያዎች ተጨምረዋል
@@ -6551,6 +6616,7 @@
 DocType: POS Profile,Ignore Pricing Rule,የዋጋ አሰጣጡን መመሪያ ችላ በል
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,ምግብ
 DocType: Lost Reason Detail,Lost Reason Detail,የጠፋበት ምክንያት
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},የሚከተሉት ተከታታይ ቁጥሮች ተፈጠሩ. <br> {0}
 DocType: Maintenance Visit,Customer Feedback,የደንበኛ ግብረመልስ
 DocType: Serial No,Warranty / AMC Details,የዋስትና / AMC ዝርዝሮች
 DocType: Issue,Opening Time,የሚከፈትበት ጊዜ
@@ -6599,6 +6665,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,የኩባንያ ስም ተመሳሳይ አይደለም
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,የሰራተኛ ማስተዋወቂያ ከፍ ከሚያደርጉበት ቀን በፊት ገቢ ሊደረግ አይችልም
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ከ {0} በፊት የቆዩ የግብይት ንግዶች ለማዘመን አይፈቀድም
+DocType: Employee Checkin,Employee Checkin,Employee Checkin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},የመጀመሪያ ቀን ለንጥል {0} የመጨረሻ ቀን ማብቂያ መሆን አለበት
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,የደንበኛ ዋጋዎችን ይፍጠሩ
 DocType: Buying Settings,Buying Settings,ቅንብሮችን መግዛት
@@ -6620,6 +6687,7 @@
 DocType: Patient,Patient Demographics,የታካሚዎች ብዛት
 DocType: Share Transfer,To Folio No,ለ Folio ቁጥር
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,ከብሮሮቶች የገንዘብ ምንጮች
+DocType: Employee Checkin,Log Type,የምዝግብ ዓይነት
 DocType: Stock Settings,Allow Negative Stock,አሉታዊ መለኪያ ይፍቀዱ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,ማንኛቸውም ንጥሎች በብዛትና በጥቅም ላይ ምንም ለውጥ የለም.
 DocType: Asset,Purchase Date,የተገዛበት ቀን
@@ -6664,6 +6732,7 @@
 DocType: Vital Signs,Very Hyper,እጅግ በጣም ከፍተኛ
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,የንግድዎን ባህሪ ይምረጡ.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,እባክዎ ወር እና ዓመት ይምረጡ
+DocType: Service Level,Default Priority,ነባሪ ቅድሚያ
 DocType: Student Log,Student Log,የተማሪ መዝገብ
 DocType: Shopping Cart Settings,Enable Checkout,Checkout ያንቁ
 apps/erpnext/erpnext/config/settings.py,Human Resources,የሰው ሀይል አስተዳደር
@@ -6692,7 +6761,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ከ ERPNext ጋር ግዢን ያገናኙ
 DocType: Homepage Section Card,Subtitle,ንኡስ ርእስ
 DocType: Soil Texture,Loam,ፈገግታ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; አቅራቢ አይነት
 DocType: BOM,Scrap Material Cost(Company Currency),የተረፈ ቁሳቁስ ወጪ (የኩባንያው የገንዘብ ምንዛሬ)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,የማድረስ የማሳወቂያ ማስታወሻ {0} መቅረብ የለበትም
 DocType: Task,Actual Start Date (via Time Sheet),ትክክለኛው የመጀመሪያ ቀን (በጊዜ ዝርዝር)
@@ -6748,6 +6816,7 @@
 DocType: Drug Prescription,Dosage,የመመገቢያ
 DocType: Cheque Print Template,Starting position from top edge,ከከጡ ጠርዝ አጀማመርን ጀምር
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),የቀጠሮ ጊዜ (ደቂቃ)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},ይህ ሰራተኛ ቀደም ብሎ በተመሳሳዩ የጊዜ ማህተም ጋር ምዝግብ አለው. {0}
 DocType: Accounting Dimension,Disable,አሰናክል
 DocType: Email Digest,Purchase Orders to Receive,ለመቀበል የግዢ ትዕዛዞች
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,የምርት ትዕዛዞችን ለሚከተሉት መንቀል አይችልም:
@@ -6763,7 +6832,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,ለንዐስ ኮንትራት ሽጥ
 DocType: Job Card,Timing Detail,የዝግጅት ዝርዝር
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,የሚፈለግበት በ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} የ {1} አስመጪ
 DocType: Job Offer Term,Job Offer Term,የሥራ ቅልጥፍ
 DocType: SMS Center,All Contact,ሁሉም እውቂያ
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
@@ -6814,7 +6882,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,ንጥል {0} ለ &quot;Serial Nos&quot; አልተዘጋጀም
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,ከስቴት
 DocType: Leave Type,Maximum Continuous Days Applicable,ከፍተኛው ቀጣይ ቀናት ሊተገበር ይችላል
-apps/erpnext/erpnext/config/support.py,Support Team.,የድጋፍ ቡድን.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,እባክህ መጀመሪያ የኩባንያ ስም አስገባ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,ማስመጣት ተሳክቷል
 DocType: Guardian,Alternate Number,ተለዋጭ ቁጥር
@@ -6906,6 +6973,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,ረድፍ # {0}: ንጥል ታክሏል
 DocType: Student Admission,Eligibility and Details,ብቁነት እና ዝርዝሮች
 DocType: Staffing Plan,Staffing Plan Detail,የሰራተኛ እቅድ ዝርዝር
+DocType: Shift Type,Late Entry Grace Period,Late Entry Grace Period
 DocType: Email Digest,Annual Income,አመታዊ ገቢ
 DocType: Journal Entry,Subscription Section,የምዝገባ ክፍል
 DocType: Salary Slip,Payment Days,የክፍያ ቀናቶች
@@ -6955,6 +7023,7 @@
 DocType: Journal Entry Account,Account Balance,የሂሳብ ሚዛን
 DocType: Asset Maintenance Log,Periodicity,ወቅታዊነት
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,የህክምና መዝገብ
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,በሱ ፈረሱ ለሚወጡት ፍተሻ የምዝግብ ወረቀት ያስፈልጋል. {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,አፈፃፀም
 DocType: Item,Valuation Method,የግምገማ ዘዴ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} ከሽያጭ ደረሰኝ {1}
@@ -7039,6 +7108,7 @@
 DocType: Loan Type,Loan Name,የብድር ስም
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,ነባሪ የክፍያ ስልትን ያዘጋጁ
 DocType: Quality Goal,Revision,ክለሳ
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,የጉዞ ዘግይቶ ከመድረሱ በፊት ያለው ጊዜ እንደ መጀመሪያው (በደቂቃዎች) የሚታይበት ጊዜ.
 DocType: Healthcare Service Unit,Service Unit Type,የአገልግሎት አይ ጠቅላላ ምድብ
 DocType: Purchase Invoice,Return Against Purchase Invoice,በግዢ ደረሰኝ ላይ ይመልሱ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,ሚስጥራዊ አፍልቅ
@@ -7194,12 +7264,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,ኮስሜቲክስ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ተጠቃሚውን ከማስቀመጥዎ በፊት ተከታታይን እንዲመርጥ ለማስገደድ ከፈለጉ ይህንን ያረጋግጡ. ይህንን ቢያረጋግጡ ምንም ነባሪ አይኖርም.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,በዚህ ተግባር ውስጥ ያሉ ተጠቃሚዎች የታሰሩ መለያዎችን እንዲያቀናብሩ እና በቀዝቃዛ መለያዎች የሂሳብ መለያዎች እንዲፈጥሩ / እንዲቀይሩ ተፈቅዶላቸዋል
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የእቃ ቁጥር&gt; የንጥል ቡድን&gt; ብራንድ
 DocType: Expense Claim,Total Claimed Amount,አጠቃላይ የይገባኛል ጥያቄ መጠን
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},ለክንሽን {1} በቀጣይ {0} ቀናት ውስጥ የሰዓት ማስገቢያ ማግኘት አልተቻለም
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,ማጠራቀሚያ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,አባልነትዎ በ 30 ቀናት ውስጥ የሚያልቅ ከሆነ ብቻ መታደስ የሚችሉት
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},እሴት በ {0} እና በ {1} መካከል መሆን አለበት
 DocType: Quality Feedback,Parameters,ልኬቶች
+DocType: Shift Type,Auto Attendance Settings,የመኪና የመቆጣጠሪያ ቅንብሮች
 ,Sales Partner Transaction Summary,የሽያጭ ደንበኛ ግብይት ማጠቃለያ
 DocType: Asset Maintenance,Maintenance Manager Name,የጥገና አስተዳዳሪ ስም
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,የዝርዝር ዝርዝሮችን ለማግኘት አስፈላጊ ነው.
@@ -7290,10 +7362,10 @@
 DocType: Pricing Rule,Validate Applied Rule,የተተገበረ ደንብ አረጋግጥ
 DocType: Job Card Item,Job Card Item,የስራ ካርድ ንጥል
 DocType: Homepage,Company Tagline for website homepage,የኩባንያ የመለያ መጻፊያ መስመር ለድር ጣቢያ ገፅ መነሻ ገጽ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,የእሴት ምላሽ እና የፍላጎት ቅድሚያ ለሚሰጥ {0} በ {{0}} መረጃ {{}} ያቀናብሩ.
 DocType: Company,Round Off Cost Center,ቅናሽ ዋጋ ወጪ ማዕከል
 DocType: Supplier Scorecard Criteria,Criteria Weight,መስፈርት ክብደት
 DocType: Asset,Depreciation Schedules,ትርፍ ትርዒት
-DocType: Expense Claim Detail,Claim Amount,የይገባኛል መጠን
 DocType: Subscription,Discounts,ቅናሾች
 DocType: Shipping Rule,Shipping Rule Conditions,የማጓጓዣ ደንብ ሁኔታዎች
 DocType: Subscription,Cancelation Date,የተሻረበት ቀን
@@ -7321,7 +7393,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,ዜሮ እሴቶችን አሳይ
 DocType: Employee Onboarding,Employee Onboarding,ተቀጣሪ ሰራተኛ
 DocType: POS Closing Voucher,Period End Date,የጊዜ ማብቂያ ቀን
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,የሽያጭ ዕድሎች በአስፈላጊነት
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,በዝርዝሩ ውስጥ የመጀመሪያ የመጠቆም ፀባይ እንደ ነባሪው ይልቀቁት.
 DocType: POS Settings,POS Settings,የ POS ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,ሁሉም መለያዎች
@@ -7342,7 +7413,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ረድፍ # {0}: ደረጃው እንደ {1} ነው: {2} ({3} / {4}) ነው
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-yYYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,የጤና እንክብካቤ አገልግሎት እቃዎች
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,ምንም መዛግብት አልተገኙም
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,የዕድሜ መግፋት 3
 DocType: Vital Signs,Blood Pressure,የደም ግፊት
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,ዒላማ በርቷል
@@ -7389,6 +7459,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,ስብስቦች
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,መከላከያ
 DocType: Item,Has Batch No,ባች ቁጥር አለው
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,ቀናት ዘግይተዋል
 DocType: Lead,Person Name,የግል ስም
 DocType: Item Variant,Item Variant,የንጥል ልዩነት
 DocType: Training Event Employee,Invited,ተጋብዘዋል
@@ -7409,7 +7480,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",የመጀመሪያዎቹ እና የመጨረሻዎቹን ቀናት በሚሰራበት የደመወዝ ጊዜ ውስጥ አይደለም {0} ማስላት አይቻልም.
 DocType: POS Profile,Only show Customer of these Customer Groups,የእነዚህ የሽያጭ ቡድኖች ደንበኛን ብቻ ያሳዩ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,ኢንቮይሱን ለማስቀመጥ ንጥሎችን ምረጥ
-DocType: Service Level,Resolution Time,የምስል ሰዓት
+DocType: Service Level Priority,Resolution Time,የምስል ሰዓት
 DocType: Grading Scale Interval,Grade Description,የደረጃ መግለጫ
 DocType: Homepage Section,Cards,ካርዶች
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,የጥራት ስብሰባዎች ደቂቃዎች
@@ -7436,6 +7507,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,የባንክ የሂሳብ ሚዛን በጄኔራል ሌድጀር እንደተገለፀው
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),የጤና እንክብካቤ (ቤታ)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,ነባሪ መጋዘን የሽያጭ ትዕዛዝ እና የማድረስ ማስታወሻን ለመፍጠር
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,የ {0} በ {{0} መረጃ መለኪያ ጊዜ ከከፍታን አቋም በላይ ሊበልጥ አይችልም.
 DocType: Opportunity,Customer / Lead Name,ደንበኛ / መሪ ስም
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-yYYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,የይገባኛል ጥያቄ ያልተነሳበት መጠን
@@ -7481,7 +7553,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,ግቤቶችን እና አድራሻዎችን ማስመጣት
 DocType: Item,List this Item in multiple groups on the website.,ይህንን ንጥል በድርቡ ላይ በበርካታ ቡድኖች ውስጥ ይዘርዝሩ.
 DocType: Request for Quotation,Message for Supplier,ለአቅራቢ መልዕክት
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,{0} እንደ የሻጭ ግብይት በንጥል {1} እንዳለ መቀየር አይቻልም.
 DocType: Healthcare Practitioner,Phone (R),ስልክ (አር)
 DocType: Maintenance Team Member,Team Member,የቡድን አባል
 DocType: Asset Category Account,Asset Category Account,የንብረት ምድብ መለያ
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index b0628ae..86b6f01 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,تم إلغاء الموعد {0} وفاتورة المبيعات {1}
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,عنوان بريدك الإلكتروني...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,تضمين إدخالات دفتر افتراضي
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,تضمين إدخالات دفتر افتراضي
 DocType: Activity Cost,Activity Type,نوع النشاط
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب الربح / الخسارة عند التخلص من الأصول
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,إدخالات الدفع
 DocType: Employee Education,Class / Percentage,الطبقة / النسبة المئوية
 ,Electronic Invoice Register,تسجيل الفاتورة الإلكترونية
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,عدد مرات الحدوث التي يتم بعدها تنفيذ النتيجة.
 DocType: Sales Invoice,Is Return (Credit Note),هو العائد (ملاحظة الائتمان)
+DocType: Price List,Price Not UOM Dependent,السعر لا يعتمد على UOM
 DocType: Lab Test Sample,Lab Test Sample,عينة اختبار مختبر
 DocType: Shopify Settings,status html,الوضع أتش تي أم أل
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",على سبيل المثال 2012 ، 2012-13
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,صافي الأجر
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,إجمالي الفاتورة Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,مستهلكات الفاتورة بشكل منفصل
+DocType: Shift Type,Working Hours Threshold for Absent,ساعات العمل عتبة الغياب
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},لا يمكن تخصيص الميزانية مقابل حساب المجموعة {0}
 DocType: Purchase Receipt Item,Rate and Amount,معدل ومبلغ
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,خارج إعدادات المريض
 DocType: Asset,Insurance End Date,تاريخ انتهاء التأمين
 DocType: Bank Account,Branch Code,رمز الفرع
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,وقت الاستجابة
 apps/erpnext/erpnext/public/js/conf.js,User Forum,منتدى المستخدم
 DocType: Landed Cost Item,Landed Cost Item,بند تكلفة الهبوط
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,البائع والمشتري لا يمكن أن يكون هو نفسه
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,نقل
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),بحث عن عنصر (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} النتيجة المقدمة
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,من تاريخ لا يمكن أن يكون أكبر من إلى
 DocType: Supplier,Supplier of Goods or Services.,المورد من السلع أو الخدمات.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,اسم الحساب الجديد. ملاحظة: يرجى عدم إنشاء حسابات للعملاء والموردين
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,مجموعة الطلاب أو الجدول الدراسي إلزامي
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,اسم المهارة
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,طباعة بطاقة تقرير
 DocType: Soil Texture,Ternary Plot,مؤامرة ثلاثية
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,تذاكر الدعم الفني
 DocType: Asset Category Account,Fixed Asset Account,حساب الأصول الثابتة
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,آخر
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,إلزامي للميزانية العمومية
 DocType: Payment Entry,Total Allocated Amount,المبلغ الإجمالي المخصص
 DocType: Sales Invoice,Get Advances Received,الحصول على السلف المستلمة
+DocType: Shift Type,Last Sync of Checkin,آخر مزامنة للفحص
 DocType: Student,B-,ب-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,البند ضريبة المبلغ المدرجة في القيمة
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,فصيلة الدم
 apps/erpnext/erpnext/config/healthcare.py,Masters,سادة
 DocType: Crop,Crop Spacing UOM,تباعد المحاصيل UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,الوقت بعد وقت بدء التحول عندما يُعتبر تسجيل الوصول متأخرًا (بالدقائق).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,يكتشف
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,لم يتم العثور على فواتير معلقة
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} الوظائف الشاغرة و {1} ميزانية {2} المخطط لها بالفعل للشركات التابعة لـ {3}. \ يمكنك فقط التخطيط حتى {4} للوظائف الشاغرة والميزانية {5} وفقًا لخطة التوظيف {6} للشركة الأم {3}.
 DocType: Promotional Scheme,Product Discount Slabs,ألواح خصم المنتج
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,المتوسط المتحرك
 DocType: Employee Attendance Tool,Unmarked Attendance,الحضور غير المميز
 DocType: Homepage Section,Number of Columns,عدد الأعمدة
+DocType: Issue Priority,Issue Priority,أولوية الإصدار
 DocType: Holiday List,Add Weekly Holidays,أضف عطلات أسبوعية
 DocType: Shopify Log,Shopify Log,سجل Shopify
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,إنشاء راتب الراتب
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,تاريخ الاصدار
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,يرجى تحديد دفعة للعنصر {0}. يتعذر العثور على مجموعة واحدة تفي بهذا المطلب
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,لا يمكن إنشاء مكافأة الاحتفاظ للموظفين اليسار
+DocType: Employee Checkin,Location / Device ID,الموقع / معرف الجهاز
 DocType: Purchase Order,To Receive,لاستقبال
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,أنت في وضع عدم الاتصال. لن تتمكن من إعادة التحميل حتى يكون لديك شبكة.
 DocType: Course Activity,Enrollment,تسجيل
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},الحد الأقصى: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,الفواتير الإلكترونية معلومات مفقودة
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,لم يتم إنشاء طلب مادة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 DocType: Loan,Total Amount Paid,المبلغ الإجمالي المدفوع
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,تم بالفعل تحرير كل هذه العناصر
 DocType: Training Event,Trainer Name,اسم المدرب
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},يرجى ذكر اسم العميل المتوقع في الرصاص {0}
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,الأسهم المصالحة البند
+DocType: Shift Type,Early Exit Consequence,نتيجة الخروج المبكر
 DocType: Item Group,General Settings,الاعدادات العامة
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ إرسال فاتورة المورد /
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,أدخل اسم المستفيد قبل التقديم.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,تأكيد الدفعة
 ,Available Stock for Packing Items,الأسهم المتاحة لعناصر التعبئة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},يرجى إزالة هذه الفاتورة {0} من نموذج C {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,كل صالح في الاختيار والمغادرة
 DocType: Support Search Source,Query Route String,سلسلة طريق الاستعلام
 DocType: Customer Feedback Template,Customer Feedback Template,قالب ملاحظات العملاء
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,ونقلت إلى العملاء أو العروض.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,السيطرة على إذن
 ,Daily Work Summary Replies,ملخص ملخص العمل اليومي
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},تمت دعوتك للتعاون في المشروع: {0}
+DocType: Issue,Response By Variance,الرد بواسطة التباين
 DocType: Item,Sales Details,تفاصيل المبيعات
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,رؤوس الرسائل لقوالب الطباعة.
 DocType: Salary Detail,Tax on additional salary,ضريبة على الراتب الإضافي
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,تقدم المهمة
 DocType: Journal Entry,Opening Entry,فتح الدخول
 DocType: Bank Guarantee,Charges Incurred,الرسوم المتكبدة
+DocType: Shift Type,Working Hours Calculation Based On,ساعات العمل حساب على أساس
 DocType: Work Order,Material Transferred for Manufacturing,نقل المواد للتصنيع
 DocType: Products Settings,Hide Variants,إخفاء المتغيرات
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,تعطيل تخطيط القدرات وتتبع الوقت
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,الإهتمامات
 DocType: Purchase Receipt Item Supplied,Consumed Qty,الكمية المستهلكة
 DocType: Education Settings,Education Manager,مدير التعليم
+DocType: Employee Checkin,Shift Actual Start,التحول الفعلي البداية
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,تخطيط سجلات الوقت خارج ساعات عمل محطة العمل.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},نقاط الولاء: {0}
 DocType: Healthcare Settings,Registration Message,رسالة التسجيل
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,تم إنشاء الفاتورة بالفعل لجميع ساعات الفوترة
 DocType: Sales Partner,Contact Desc,الاتصال تنازلي
 DocType: Purchase Invoice,Pricing Rules,قواعد التسعير
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",نظرًا لوجود معاملات حالية مقابل العنصر {0} ، لا يمكنك تغيير قيمة {1}
 DocType: Hub Tracked Item,Image List,قائمة الصور
 DocType: Item Variant Settings,Allow Rename Attribute Value,السماح بإعادة تسمية قيمة السمة
-DocType: Price List,Price Not UOM Dependant,السعر لا يعتمد على UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),الوقت (بالدقائق)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,الأساسية
 DocType: Loan,Interest Income Account,حساب دخل الفوائد
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,حدد POS Profile
 DocType: Support Settings,Get Latest Query,الحصول على أحدث الاستعلام
 DocType: Employee Incentive,Employee Incentive,حافز الموظف
+DocType: Service Level,Priorities,أولويات
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,إضافة بطاقات أو أقسام مخصصة على الصفحة الرئيسية
 DocType: Homepage,Hero Section Based On,قسم البطل على أساس
 DocType: Project,Total Purchase Cost (via Purchase Invoice),إجمالي تكلفة الشراء (عبر فاتورة الشراء)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,الكمية المطلوبة
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: مستودع مرفوض إلزامي ضد العنصر المرفوض {1}
 ,Received Items To Be Billed,العناصر المستلمة المطلوب دفعها
-DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
+DocType: Attendance,Working Hours,ساعات العمل
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,طريقة الدفع
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,بنود طلب الشراء غير المستلمة في الوقت المحدد
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,المدة بالأيام
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن المورد الخاص بك
 DocType: Item Default,Default Selling Cost Center,مركز تكلفة البيع الافتراضي
 DocType: Sales Partner,Address & Contacts,العنوان وجهات الاتصال
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Subscriber,Subscriber,مكتتب
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) غير متوفر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,الرجاء تحديد تاريخ النشر أولاً
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,المهام التي تم إنشاؤها
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,يجب أن يكون BOM الافتراضي ({0}) نشطًا لهذا العنصر أو القالب الخاص به
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,نسبة العمولة ٪
-DocType: Service Level,Response Time,وقت الاستجابة
+DocType: Service Level Priority,Response Time,وقت الاستجابة
 DocType: Woocommerce Settings,Woocommerce Settings,إعدادات Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,يجب أن تكون الكمية إيجابية
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,تعيين بيانات المعاملات
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,يتطلب العميل المتوقع اسم شخص أو اسم مؤسسة
 DocType: Student,Guardians,أولياء الأمور
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,اختر العلامة التجارية ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,الدخل المتوسط
 DocType: Shipping Rule,Calculate Based On,حساب بناء على
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},سجل الحضور {0} موجود ضد الطالب {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,تاريخ المعاملة
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,إلغاء الاشتراك
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,لا يمكن تعيين اتفاقية مستوى الخدمة {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,صافي الراتب المبلغ
 DocType: Account,Liability,مسؤولية
 DocType: Employee,Bank A/C No.,رقم البنك
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,المادة الخام رمز البند
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,تم إرسال فاتورة الشراء {0} بالفعل
 DocType: Fees,Student Email,بريد الطالب
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},تكرار BOM: {0} لا يمكن أن يكون أصلًا أو تابعًا لـ {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,الحصول على عناصر من خدمات الرعاية الصحية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,لم يتم تقديم إدخال الأسهم {0}
 DocType: Item Attribute Value,Item Attribute Value,قيمة سمة البند
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,حدد عناصر لتصنيعها
 DocType: Leave Application,Leave Approver Name,اترك اسم الموافقة
 DocType: Shareholder,Shareholder,المساهم
-DocType: Issue,Agreement Status,حالة الاتفاق
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,الإعدادات الافتراضية لبيع المعاملات.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,يرجى اختيار قبول الطالب وهو إلزامي لمقدم الطلب الطالب المدفوع
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,اختر BOM
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,حساب الدخل
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,جميع المستودعات
 DocType: Contract,Signee Details,تفاصيل Signee
+DocType: Shift Type,Allow check-out after shift end time (in minutes),السماح بتسجيل المغادرة بعد وقت انتهاء التحول (بالدقائق)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,تدبير
 DocType: Item Group,Check this if you want to show in website,تحقق هذا إذا كنت تريد أن تظهر في الموقع
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,السنة المالية {0} غير موجودة
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,معدل الفواتير
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},تحذير: يوجد {0} # {1} آخر ضد إدخال المخزون {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,يرجى تمكين إعدادات خرائط Google لتقدير الطرق وتحسينها
+DocType: Purchase Invoice Item,Page Break,فاصل صفحة
 DocType: Supplier Scorecard Criteria,Max Score,أقصى درجة
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,لا يمكن أن يكون تاريخ بدء السداد قبل تاريخ الصرف.
 DocType: Support Search Source,Support Search Source,دعم البحث المصدر
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,نقل الموظف
 ,Sales Funnel,قمع المبيعات
 DocType: Agriculture Analysis Criteria,Water Analysis,تحليل المياه
+DocType: Shift Type,Begin check-in before shift start time (in minutes),ابدأ تسجيل الوصول قبل وقت بدء التحول (بالدقائق)
 DocType: Accounts Settings,Accounts Frozen Upto,الحسابات المجمدة تصل
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,لا يوجد شيء للتحرير.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",العملية {0} أطول من أي ساعات عمل متاحة في محطة العمل {1} ، قسم العملية إلى عمليات متعددة
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},أمر المبيعات {0} هو {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),التأخير في الدفع (أيام)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,أدخل تفاصيل الاستهلاك
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO العملاء
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,يجب أن يكون تاريخ التسليم المتوقع بعد تاريخ أمر المبيعات
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,كمية البند لا يمكن أن يكون صفرا
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,سمة غير صالحة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},يرجى اختيار BOM مقابل العنصر {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,نوع الفاتورة
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,بعد الظهر
 DocType: Vital Signs,Nutrition Values,قيم التغذية
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),وجود الحمى (درجة حرارة&gt; 38.5 درجة مئوية / 101.3 درجة فهرنهايت أو درجة حرارة ثابتة&gt; 38 درجة مئوية / 100.4 درجة فهرنهايت)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,عكس مركز التجارة الدولية
 DocType: Project,Collect Progress,جمع التقدم
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,طاقة
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,العناصر المطلوبة لفواتير
 DocType: Taxable Salary Slab,To Amount,لكمية
 DocType: Purchase Invoice,Is Return (Debit Note),هو العودة (مذكرة الخصم)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/config/desktop.py,Getting Started,ابدء
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,دمج
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,لا يمكن تغيير تاريخ بدء السنة المالية وتاريخ نهاية السنة المالية بمجرد حفظ السنة المالية.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},لا يمكن أن يكون تاريخ بدء الصيانة قبل تاريخ التسليم للمسلسل رقم {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,الصف {0}: سعر الصرف إلزامي
 DocType: Purchase Invoice,Select Supplier Address,اختر عنوان المورد
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",الكمية المتاحة هي {0} ، تحتاج إلى {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,الرجاء إدخال سر عميل API
 DocType: Program Enrollment Fee,Program Enrollment Fee,رسوم التسجيل في البرنامج
+DocType: Employee Checkin,Shift Actual End,التحول نهاية الفعلية
 DocType: Serial No,Warranty Expiry Date,تاريخ انتهاء الضمان
 DocType: Hotel Room Pricing,Hotel Room Pricing,غرفة فندق التسعير
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted",اللوازم الخاضعة للضريبة إلى الخارج (بخلاف تصنيف الصفر ، لا يوجد تقييم ومعفى
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,قراءة 5
 DocType: Shopping Cart Settings,Display Settings,اعدادات العرض
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,يرجى تحديد عدد الإهلاكات المحجوزة
+DocType: Shift Type,Consequence after,النتيجة بعد
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,ما الذى تحتاج المساعدة به؟
 DocType: Journal Entry,Printing Settings,إعدادات الطباعة
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,الخدمات المصرفية
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,عنوان الفواتير هو نفس عنوان الشحن
 DocType: Account,Cash,السيولة النقدية
 DocType: Employee,Leave Policy,ترك السياسة
+DocType: Shift Type,Consequence,نتيجة
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,عنوان الطالب
 DocType: GST Account,CESS Account,حساب CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: مركز التكلفة مطلوب لحساب &quot;الربح والخسارة&quot; {2}. يرجى إعداد مركز تكلفة افتراضي للشركة.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,قسيمة إغلاق الفترة
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,اسم الجارديان 2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,الرجاء إدخال حساب المصاريف
+DocType: Issue,Resolution By Variance,القرار عن طريق التباين
 DocType: Employee,Resignation Letter Date,تاريخ خطاب الاستقالة
 DocType: Soil Texture,Sandy Clay,الصلصال الرملي
 DocType: Upload Attendance,Attendance To Date,الحضور حتى الآن
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,عرض الآن
 DocType: Item Price,Valid Upto,صالحة تصل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},يجب أن تكون نوع المرجع المرجعي أحد {0}
+DocType: Employee Checkin,Skip Auto Attendance,تخطي الحضور التلقائي
 DocType: Payment Request,Transaction Currency,عملة تداولية
 DocType: Loan,Repayment Schedule,جدول الدفع
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,إنشاء نموذج إدخال مخزون الاحتفاظ
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS إغلاق ضرائب القسيمة
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,العمل مهيأ
 DocType: POS Profile,Applicable for Users,ينطبق على المستخدمين
+,Delayed Order Report,تأخر تقرير الطلب
 DocType: Training Event,Exam,امتحان
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,تم العثور على عدد غير صحيح من إدخالات دفتر الأستاذ العام. ربما تكون قد اخترت حسابًا خاطئًا في المعاملة.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,مجرى البيع
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,سيتم تطبيق الشروط على جميع العناصر المختارة مجتمعة.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,تهيئة
 DocType: Hotel Room,Capacity,سعة
+DocType: Employee Checkin,Shift End,التحول نهاية
 DocType: Installation Note Item,Installed Qty,الكمية المثبتة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,الدُفعة {0} من العنصر {1} معطلة.
 DocType: Hotel Room Reservation,Hotel Reservation User,حجز فندق المستخدم
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,تم تكرار يوم العمل مرتين
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,اتفاقية مستوى الخدمة مع نوع الكيان {0} والكيان {1} موجودة بالفعل.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},مجموعة العناصر غير مذكورة في العنصر الرئيسي للعنصر {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},خطأ في الاسم: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,مطلوب إقليم في ملف POS
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,تاريخ الجدول الزمني
 DocType: Packing Slip,Package Weight Details,حزمة الوزن التفاصيل
 DocType: Job Applicant,Job Opening,فتح فرص العمل
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,آخر مزامنة ناجحة معروفة لفحص الموظف. أعد ضبط هذا فقط إذا كنت متأكدًا من مزامنة جميع السجلات من جميع المواقع. يرجى عدم تعديل هذا إذا كنت غير متأكد.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,التكلفة الفعلية
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),لا يمكن أن يكون إجمالي التقدم ({0}) مقابل الأمر {1} أكبر من الإجمالي الكلي ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,تم تحديث متغيرات العنصر
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,الحصول على الدعوات
 DocType: Tally Migration,Is Day Book Data Imported,يتم استيراد بيانات دفتر اليوم
 ,Sales Partners Commission,مبيعات شركاء لجنة
+DocType: Shift Type,Enable Different Consequence for Early Exit,تمكين عواقب مختلفة للخروج المبكر
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,قانوني
 DocType: Loan Application,Required by Date,مطلوب حسب التاريخ
 DocType: Quiz Result,Quiz Result,نتيجة مسابقة
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},قائمة عطلة اختيارية غير محددة لفترة الإجازة {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,يرجى تعيين حقل معرف المستخدم في سجل الموظف لتعيين دور الموظف
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,الوقت لحل
 DocType: Training Event,Training Event,حدث التدريب
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",ويبلغ ضغط الدم الطبيعي المريح عند البالغين حوالي 120 مم زئبقي الانقباضي ، و 80 مم زئبق انبساطي ، يختصر &quot;120/80 مم زئبق&quot;
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,سيقوم النظام بجلب كل الإدخالات إذا كانت قيمة الحد صفرا.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,وافق
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},من تاريخ يجب أن يكون في غضون السنة المالية. بافتراض من التاريخ = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,يرجى تعيين مجموعة الموردين في إعدادات الشراء.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} هي حالة حضور غير صالحة.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,فتح حساب مؤقت
 DocType: Purchase Invoice,Cash/Bank Account,النقد / الحساب المصرفي
 DocType: Quality Meeting Table,Quality Meeting Table,جدول اجتماع الجودة
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",الغذاء والمشروبات والتبغ
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,جدول دراسي
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,البند الحكمة التفاصيل الضريبية
+DocType: Shift Type,Attendance will be marked automatically only after this date.,سيتم تمييز الحضور تلقائيًا بعد هذا التاريخ فقط.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,اللوازم المقدمة لحاملي UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,طلب عروض الأسعار
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,لا يمكن تغيير العملة بعد عمل إدخالات باستخدام بعض العملات الأخرى
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,هو البند من المحور
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,إجراءات الجودة.
 DocType: Share Balance,No of Shares,عدد الأسهم
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),الصف {0}: الكمية غير متوفرة لـ {4} في المستودع {1} في وقت نشر الإدخال ({2} {3})
 DocType: Quality Action,Preventive,وقائي
 DocType: Support Settings,Forum URL,عنوان URL للمنتدى
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,الموظف والحضور
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,الضرائب والرسوم الافتراضية
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,ويستند هذا على المعاملات ضد هذا المورد. انظر الجدول الزمني أدناه للحصول على التفاصيل
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,أدخل تاريخ البدء والانتهاء للاتفاقية.
 DocType: Delivery Note Item,Against Sales Invoice,ضد فاتورة المبيعات
 DocType: Loyalty Point Entry,Purchase Amount,مبلغ الشراء
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين &quot;Lost&quot; أثناء إجراء &quot;أمر المبيعات&quot;.
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,اسم المنظمة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,صالحة من وحقول تصل صالحة إلزامية للتراكمية
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: الدفعة لا يجب أن تكون مماثلة لل {1} {2}
-DocType: Employee,Leave Details,ترك التفاصيل
+DocType: Employee Checkin,Shift Start,تحول البداية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,يتم تجميد المعاملات المالية قبل {0}
 DocType: Driver,Issuing Date,تاريخ الإصدار
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,الطالب
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,تفاصيل قالب رسم التدفقات النقدية
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,التوظيف والتدريب
 DocType: Drug Prescription,Interval UOM,فاصل UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,إعدادات فترة السماح للحضور التلقائي
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,من العملة والعملة لا يمكن أن يكون هو نفسه
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,الصيدلة
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,ساعات الدعم
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} تم إلغاؤه أو إغلاقه
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,الصف {0}: الدفع مقابل العميل يجب أن يكون رصيدًا
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),مجموعة بواسطة قسيمة (الموحدة)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,مدير الإقليم
 DocType: Lab Test,Sample ID,رقم تعريف العينة
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,السلة فارغة
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,تم وضع علامة على الحضور حسب تسجيل وصول الموظف
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,يجب تقديم الأصل {0}
 ,Absent Student Report,غائب تقرير الطالب
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,المدرجة في الربح الإجمالي
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,المبلغ الممول
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} لم يتم تقديمه لذلك لا يمكن إكمال الإجراء
 DocType: Subscription,Trial Period End Date,تاريخ انتهاء الفترة التجريبية
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,بالتناوب إدخالات مثل IN و OUT خلال نفس التحول
 DocType: BOM Update Tool,The new BOM after replacement,BOM الجديد بعد الاستبدال
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,البند 5
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,افتتاح مؤقت
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,المورد المحتمل
 ,Issued Items Against Work Order,البنود الصادرة ضد أمر العمل
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,إنشاء فاتورة {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 DocType: Student,Joining Date,تاريخ الانضمام
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,طلب موقع
 DocType: Purchase Invoice,Against Expense Account,ضد حساب النفقات
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 ,Point of Sale,نقطة البيع
 DocType: Authorization Rule,Approving User  (above authorized value),موافقة المستخدم (أعلى من القيمة المصرح بها)
+DocType: Service Level Agreement,Entity,كيان
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},تم نقل المبلغ {0} {1} من {2} إلى {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},العميل {0} لا ينتمي إلى المشروع {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,من اسم الحزب
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),تكوين الرمال (٪)
 DocType: Production Plan,MFG-PP-.YYYY.-,مبدعين-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,استيراد بيانات دفتر اليوم
+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; سلسلة التسمية
 DocType: Asset,Asset Owner Company,شركة مالك الأصول
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,مركز التكلفة مطلوب لحجز مطالبة حساب
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} رقم تسلسلي صالح للعنصر {1}
@@ -3399,7 +3432,6 @@
 DocType: Asset,Asset Owner,مالك الأصول
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},المستودع إلزامي للسهم العنصر {0} في الصف {1}
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
-DocType: Marketplace Settings,Last Sync On,آخر مزامنة في
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,يرجى ضبط صف واحد على الأقل في جدول الضرائب والرسوم
 DocType: Asset Maintenance Team,Maintenance Team Name,اسم فريق الصيانة
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,الرسم البياني لمراكز التكلفة
@@ -3415,12 +3447,12 @@
 DocType: Job Card,WIP Warehouse,مستودع WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},لم يتم تعيين معرف المستخدم للموظف {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}",الكمية المتاحة هي {0} ، تحتاج إلى {1}
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,تم إنشاء المستخدم {0}
 DocType: Stock Settings,Item Naming By,تسمية البند
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,أمر
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,هذه مجموعة عملاء جذرية ولا يمكن تحريرها.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,طلب المواد {0} تم إلغاؤه أو إيقافه
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,يعتمد بشكل صارم على نوع السجل في فحص الموظف
 DocType: Purchase Order Item Supplied,Supplied Qty,الكمية الموردة
 DocType: Cash Flow Mapper,Cash Flow Mapper,مخطط التدفق النقدي
 DocType: Soil Texture,Sand,رمل
@@ -3479,6 +3511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,مجموعة عناصر مكررة موجودة في جدول مجموعة العناصر
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,الراتب السنوي
 DocType: Supplier Scorecard,Weighting Function,وظيفة الترجيح
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,خطأ في تقييم صيغة المعايير
 ,Lab Test Report,تقرير اختبار المعمل
 DocType: BOM,With Operations,مع العمليات
@@ -3492,6 +3525,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,لا توجد مدفوعات متاحة لمجلة الدخول
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} طالب غير نشط
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,جعل دخول الأسهم
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},تكرار BOM: {0} لا يمكن أن يكون أصلًا أو تابعًا لـ {1}
 DocType: Employee Onboarding,Activities,أنشطة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,أتلست مستودع واحد إلزامي
 ,Customer Credit Balance,رصيد ائتمان العميل
@@ -3504,9 +3538,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,برنامج الولاء المتعدد الموجود للعميل. يرجى اختيار يدويا.
 DocType: Patient,Medication,أدوية
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,اختر برنامج الولاء
+DocType: Employee Checkin,Attendance Marked,الحضور ملحوظ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,مواد أولية
 DocType: Sales Order,Fully Billed,فاتورة بالكامل
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},يرجى تحديد سعر الغرفة الفندقية على {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,حدد أولوية واحدة فقط كإعداد افتراضي.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},يرجى تحديد / إنشاء حساب (دفتر الأستاذ) للنوع - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,يجب أن يكون المبلغ الإجمالي للائتمان / الخصم مطابقًا لإدخال دفتر اليومية المرتبط
 DocType: Purchase Invoice Item,Is Fixed Asset,هو أصل ثابت
@@ -3527,6 +3563,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,تأكيد الموعد
 DocType: Shopping Cart Settings,Orders,أوامر
 DocType: HR Settings,Retirement Age,سن التقاعد
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,الكمية المتوقعة
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},الحذف غير مسموح به للبلد {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصل {1} موجود بالفعل {2}
@@ -3610,11 +3647,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,محاسب
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},توجد قسيمة الإغلاق لنقاط البيع في {0} بين التاريخ {1} و {2}
 apps/erpnext/erpnext/config/help.py,Navigating,التنقل
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,لا تتطلب الفواتير المستحقة إعادة تقييم سعر الصرف
 DocType: Authorization Rule,Customer / Item Name,اسم العميل / البند
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,لا يمكن أن يحتوي المسلسل الجديد على مستودع. يجب تعيين المستودع بواسطة &quot;دخول الأسهم&quot; أو &quot;إيصال الشراء&quot;
 DocType: Issue,Via Customer Portal,عبر بوابة العملاء
 DocType: Work Order Operation,Planned Start Time,وقت البدء المخطط
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} هو {2}
+DocType: Service Level Priority,Service Level Priority,أولوية مستوى الخدمة
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,لا يمكن أن يكون عدد الإهلاكات المحجوزة أكبر من إجمالي عدد الإهلاكات
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,حصة ليدجر
 DocType: Journal Entry,Accounts Payable,حسابات قابلة للدفع
@@ -3725,7 +3764,6 @@
 DocType: Delivery Note,Delivery To,تسليم الى
 DocType: Bank Statement Transaction Settings Item,Bank Data,بيانات البنك
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,المجدولة تصل
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,الحفاظ على ساعات الفواتير وساعات العمل نفسه على الجدول الزمني
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,تتبع العروض حسب مصدر الرصاص.
 DocType: Clinical Procedure,Nursing User,تمريض المستخدم
 DocType: Support Settings,Response Key List,قائمة مفتاح الاستجابة
@@ -3893,6 +3931,7 @@
 DocType: Work Order Operation,Actual Start Time,وقت البدء الفعلي
 DocType: Antibiotic,Laboratory User,مستخدم المختبر
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,مزادات على الانترنت
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,تم تكرار الأولوية {0}.
 DocType: Fee Schedule,Fee Creation Status,حالة إنشاء الرسوم
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,برامج
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,ترتيب المبيعات للدفع
@@ -3959,6 +3998,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,لا يمكن استرجاع المعلومات لـ {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,يجب أن تكون عملة الفوترة مساوية لعملة الشركة الافتراضية أو عملة حساب الطرف
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,الرجاء إدخال رقم تعريف الموظف لهذا البائع
+DocType: Shift Type,Early Exit Consequence after,نتيجة الخروج المبكر بعد
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,إنشاء فتح المبيعات وفواتير الشراء
 DocType: Disease,Treatment Period,فترة العلاج
 apps/erpnext/erpnext/config/settings.py,Setting up Email,إعداد البريد الإلكتروني
@@ -3976,7 +4016,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,أسم الطالب:
 DocType: SMS Log,Sent On,أرسلت في
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,فاتورة المبيعات
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,لا يمكن أن يكون زمن الاستجابة أكبر من وقت القرار
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",بالنسبة لمجموعة الطلاب القائمة على الدورة التدريبية ، سيتم التحقق من صحة الدورة التدريبية لكل طالب من الدورات المسجلة في تسجيل البرنامج.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,اللوازم داخل الدولة
 DocType: Employee,Create User Permission,إنشاء إذن المستخدم
@@ -4015,6 +4054,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,شروط العقد القياسية للمبيعات أو الشراء.
 DocType: Sales Invoice,Customer PO Details,تفاصيل العميل PO
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,المريض غير موجود
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,حدد أولوية افتراضية.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,أزل العنصر إذا كانت الرسوم غير قابلة للتطبيق على هذا العنصر
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,توجد مجموعة عملاء بنفس الاسم ، يرجى تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4054,6 +4094,7 @@
 DocType: Support Settings,Support Portal,بوابة الدعم
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,لا يمكن أن يكون تاريخ انتهاء المهمة <b>{0}</b> أقل من <b>{1}</b> تاريخ البدء المتوقع <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},الموظف {0} في إجازة يوم {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},اتفاقية مستوى الخدمة هذه تخص العميل {0}
 DocType: Employee,Held On,عقدت في
 DocType: Healthcare Practitioner,Practitioner Schedules,جداول ممارس
 DocType: Project Template Task,Begin On (Days),ابدأ (بالأيام)
@@ -4061,6 +4102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},أمر العمل كان {0}
 DocType: Inpatient Record,Admission Schedule Date,تاريخ جدول القبول
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,تعديل قيمة الأصول
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,حدد الحضور استنادًا إلى &quot;فحص الموظف&quot; للموظفين المعينين لهذا التحول.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,الإمدادات المقدمة إلى الأشخاص غير المسجلين
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,جميع الوظائف
 DocType: Appointment Type,Appointment Type,نوع الموعد
@@ -4174,7 +4216,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الإجمالي للحزمة. عادة الوزن الصافي + وزن مواد التعبئة والتغليف. (للطباعة)
 DocType: Plant Analysis,Laboratory Testing Datetime,اختبار المختبر
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,لا يمكن أن يحتوي العنصر {0} على دُفعات
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,خط أنابيب المبيعات حسب المرحلة
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,قوة مجموعة الطلاب
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,كشف المعاملات البنكية
 DocType: Purchase Order,Get Items from Open Material Requests,الحصول على عناصر من طلبات المواد المفتوحة
@@ -4256,7 +4297,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,تظهر الشيخوخة مستودع الحكمة
 DocType: Sales Invoice,Write Off Outstanding Amount,شطب المبلغ المعلقة
 DocType: Payroll Entry,Employee Details,تفاصيل الموظف
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,لا يمكن أن يكون وقت البدء أكبر من وقت الانتهاء لـ {0}.
 DocType: Pricing Rule,Discount Amount,مقدار الخصم
 DocType: Healthcare Service Unit Type,Item Details,تفاصيل العنصر
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},إعلان ضريبي مكرر لـ {0} للفترة {1}
@@ -4309,7 +4349,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,صافي الراتب لا يمكن أن يكون سلبيا
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,عدد التفاعلات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},لا يمكن نقل الصف {0} # العنصر {1} أكثر من {2} مقابل أمر الشراء {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,تحول
+DocType: Attendance,Shift,تحول
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,معالجة الرسم البياني للحسابات والأطراف
 DocType: Stock Settings,Convert Item Description to Clean HTML,تحويل وصف العنصر لتنظيف HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,جميع مجموعات الموردين
@@ -4380,6 +4420,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,وحدة خدمة الوالدين
 DocType: Sales Invoice,Include Payment (POS),تشمل الدفع (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,حقوق الملكية الخاصة
+DocType: Shift Type,First Check-in and Last Check-out,تسجيل الوصول الأول وتسجيل المغادرة الأخير
 DocType: Landed Cost Item,Receipt Document,وثيقة استلام
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,المورد سجل الأداء الفترة
 DocType: Employee Grade,Default Salary Structure,هيكل الراتب الافتراضي
@@ -4462,6 +4503,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,إنشاء طلب شراء
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,تحديد الميزانية للسنة المالية.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,لا يمكن أن يكون جدول الحسابات فارغًا.
+DocType: Employee Checkin,Entry Grace Period Consequence,دخول فترة سماح نتيجة
 ,Payment Period Based On Invoice Date,فترة الدفع بناءً على تاريخ الفاتورة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},لا يمكن أن يكون تاريخ التثبيت قبل تاريخ التسليم للعنصر {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,رابط لطلب المواد
@@ -4470,6 +4512,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},الصف {0}: إدخال Reorder موجود بالفعل لهذا المستودع {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,تاريخ الوثيقة
 DocType: Monthly Distribution,Distribution Name,اسم التوزيع
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,تم تكرار يوم العمل {0}.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,المجموعة إلى غير المجموعة
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,التحديث في التقدم. قد يستغرق بعض الوقت.
 DocType: Item,"Example: ABCD.#####
@@ -4482,6 +4525,7 @@
 DocType: Vehicle Log,Fuel Qty,الكمية الوقود
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 رقم الجوال
 DocType: Invoice Discounting,Disbursed,صرف
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,الوقت بعد نهاية النوبة التي يتم خلالها تسجيل المغادرة للحضور.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,صافي التغير في الحسابات المستحقة الدفع
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,غير متوفر
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,دوام جزئى
@@ -4495,7 +4539,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,إظهار PDC في الطباعة
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify المورد
 DocType: POS Profile User,POS Profile User,المستخدم الشخصي POS
-DocType: Student,Middle Name,الاسم الوسطى
 DocType: Sales Person,Sales Person Name,اسم شخص المبيعات
 DocType: Packing Slip,Gross Weight,الوزن الإجمالي
 DocType: Journal Entry,Bill No,مشروع قانون لا
@@ -4504,7 +4547,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-مدونة فيديو-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,اتفاقية مستوى الخدمة
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,يرجى اختيار الموظف والتاريخ أولا
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,يتم إعادة حساب معدل تقييم البنود مع الأخذ في الاعتبار قيمة قسيمة تكلفة الهبوط
 DocType: Timesheet,Employee Detail,تفاصيل الموظف
 DocType: Tally Migration,Vouchers,قسائم
@@ -4539,7 +4581,7 @@
 DocType: Additional Salary,Date on which this component is applied,تاريخ تطبيق هذا المكون
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,قائمة المساهمين المتاحين بأرقام مطوية
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,حسابات بوابة الإعداد.
-DocType: Service Level,Response Time Period,زمن الاستجابة
+DocType: Service Level Priority,Response Time Period,زمن الاستجابة
 DocType: Purchase Invoice,Purchase Taxes and Charges,شراء الضرائب والرسوم
 DocType: Course Activity,Activity Date,تاريخ النشاط
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,اختيار أو إضافة عميل جديد
@@ -4564,6 +4606,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,السنة المالية
 DocType: Sales Invoice Item,Deferred Revenue,الإيرادات المؤجلة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,يجب تحديد أتلست واحد من البيع أو الشراء
+DocType: Shift Type,Working Hours Threshold for Half Day,ساعات العمل عتبة لمدة نصف يوم
 ,Item-wise Purchase History,البند حكيمة تاريخ الشراء
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},لا يمكن تغيير تاريخ إيقاف الخدمة للعنصر في الصف {0}
 DocType: Production Plan,Include Subcontracted Items,تشمل البنود المتعاقد عليها من الباطن
@@ -4596,6 +4639,7 @@
 DocType: BOM,Allow Same Item Multiple Times,السماح لنفس العنصر عدة مرات
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,إنشاء BOM
 DocType: Healthcare Practitioner,Charges,شحنة
+DocType: Employee,Attendance and Leave Details,تفاصيل الحضور والإجازة
 DocType: Student,Personal Details,تفاصيل شخصية
 DocType: Sales Order,Billing and Delivery Status,الفواتير وحالة التسليم
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,الصف {0}: للمورد {0} عنوان البريد الإلكتروني مطلوب لإرسال البريد الإلكتروني
@@ -4647,7 +4691,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},أدخل القيمة betweeen {0} و {1}
 DocType: Purchase Order,Order Confirmation Date,تاريخ تأكيد الطلب
 DocType: Delivery Trip,Calculate Estimated Arrival Times,احسب أوقات الوصول المقدرة
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,مستهلكات
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,تاريخ بدء الاشتراك
@@ -4670,7 +4713,7 @@
 DocType: Journal Entry Account,Journal Entry Account,حساب دخول اليومية
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,مختلف
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,نشاط المنتدى
-DocType: Service Level,Resolution Time Period,فترة القرار الوقت
+DocType: Service Level Priority,Resolution Time Period,فترة القرار الوقت
 DocType: Request for Quotation,Supplier Detail,المورد التفاصيل
 DocType: Project Task,View Task,عرض المهمة
 DocType: Serial No,Purchase / Manufacture Details,شراء / تصنيع التفاصيل
@@ -4737,6 +4780,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن تغيير المستودع إلا عن طريق إدخال / تسليم المخزون / إيصال الشراء
 DocType: Support Settings,Close Issue After Days,إغلاق العدد بعد أيام
 DocType: Payment Schedule,Payment Schedule,جدول الدفع
+DocType: Shift Type,Enable Entry Grace Period,تمكين فترة السماح بالدخول
 DocType: Patient Relation,Spouse,الزوج
 DocType: Purchase Invoice,Reason For Putting On Hold,سبب التأجيل
 DocType: Item Attribute,Increment,زيادة راتب
@@ -4876,6 +4920,7 @@
 DocType: Vehicle Log,Invoice Ref,المرجع الفاتورة
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},نموذج C لا ينطبق على الفاتورة: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,تم إنشاء الفاتورة
+DocType: Shift Type,Early Exit Grace Period,الخروج المبكر فترة سماح
 DocType: Patient Encounter,Review Details,مراجعة التفاصيل
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,الصف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر.
 DocType: Account,Account Number,رقم حساب
@@ -4887,7 +4932,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL",قابل للتطبيق إذا كانت الشركة SpA أو SApA أو SRL
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,الظروف المتداخلة الموجودة بين:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,مدفوعة وغير المسلمة
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,رمز العنصر إلزامي لأنه لا يتم ترقيم العنصر تلقائيًا
 DocType: GST HSN Code,HSN Code,رمز HSN
 DocType: GSTR 3B Report,September,سبتمبر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,المصروفات الإدارية
@@ -4923,6 +4967,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,حساب CWIP
 DocType: SMS Log,Sender Name,اسم المرسل
 DocType: Pricing Rule,Supplier Group,مجموعة الموردين
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",قم بتعيين وقت البدء ووقت الانتهاء لـ \ Support Day {0} في الفهرس {1}.
 DocType: Employee,Date of Issue,تاريخ المسألة
 ,Requested Items To Be Transferred,العناصر المطلوبة ليتم نقلها
 DocType: Employee,Contract End Date,تاريخ انتهاء العقد
@@ -4933,6 +4979,7 @@
 DocType: Opportunity,Sales Stage,مرحلة المبيعات
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,في الكلمات سيكون مرئيًا بمجرد حفظ أمر المبيعات.
 DocType: Item Reorder,Re-order Level,إعادة ترتيب المستوى
+DocType: Shift Type,Enable Auto Attendance,تمكين الحضور التلقائي
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,تفضيل
 ,Department Analytics,قسم التحليلات
 DocType: Crop,Scientific Name,الاسم العلمي
@@ -4945,6 +4992,7 @@
 DocType: Quiz Activity,Quiz Activity,مسابقة النشاط
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} ليس في &quot;جدول الرواتب&quot; صالح
 DocType: Timesheet,Billed,فاتورة
+apps/erpnext/erpnext/config/support.py,Issue Type.,نوع القضية.
 DocType: Restaurant Order Entry,Last Sales Invoice,فاتورة المبيعات الأخيرة
 DocType: Payment Terms Template,Payment Terms,شروط الدفع
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",الكمية المحجوزة: الكمية المطلوبة للبيع ، ولكن لم يتم تسليمها.
@@ -5040,6 +5088,7 @@
 DocType: Account,Asset,الأصول
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} لا يحتوي على جدول ممارسي الرعاية الصحية. إضافته في الرعاية الصحية ممارس ماجستير
 DocType: Vehicle,Chassis No,رقم الشاسيه
+DocType: Employee,Default Shift,التحول الافتراضي
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,اختصار الشركة
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,شجرة المواد بيل
 DocType: Article,LMS User,LMS المستخدم
@@ -5087,6 +5136,7 @@
 DocType: Sales Person,Parent Sales Person,مندوب مبيعات الوالد
 DocType: Student Group Creation Tool,Get Courses,الحصول على الدورات
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن تكون الكمية 1 ، حيث أن العنصر هو أصل ثابت. يرجى استخدام صف منفصل لكمية متعددة.
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),ساعات العمل أدناه التي يتم وضع علامة الغائب. (صفر لتعطيل)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,العقد الورقية هي فقط المسموح بها في المعاملة
 DocType: Grant Application,Organization,منظمة
 DocType: Fee Category,Fee Category,فئة الرسوم
@@ -5099,6 +5149,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,يرجى تحديث حالتك لهذا الحدث التدريبي
 DocType: Volunteer,Morning,صباح
 DocType: Quotation Item,Quotation Item,البند الاقتباس
+apps/erpnext/erpnext/config/support.py,Issue Priority.,أولوية الإصدار.
 DocType: Journal Entry,Credit Card Entry,إدخال بطاقة الائتمان
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",تم تخطي الفاصل الزمني ، تداخل الفاصل الزمني {0} إلى {1} مع الخارجة من الفاصل الزمني {2} إلى {3}
 DocType: Journal Entry Account,If Income or Expense,إذا كان الدخل أو المصاريف
@@ -5149,11 +5200,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,استيراد البيانات والإعدادات
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",إذا تم اختيار الاشتراك التلقائي ، فسيتم ربط العملاء تلقائيًا ببرنامج الولاء المعني (عند الحفظ)
 DocType: Account,Expense Account,حساب المصاريف
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,الوقت الذي يسبق وقت بدء التحول الذي يتم خلاله فحص تسجيل الموظف للحضور.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,العلاقة مع الجارديان 1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,إنشاء فاتورة
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},طلب الدفع موجود بالفعل {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',يجب تعيين الموظف المرتاح على {0} على أنه &quot;يسار&quot;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},ادفع {0} {1}
+DocType: Company,Sales Settings,إعدادات المبيعات
 DocType: Sales Order Item,Produced Quantity,الكمية المنتجة
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,يمكن الوصول إلى طلب الاقتباس من خلال النقر على الرابط التالي
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
@@ -5232,6 +5285,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,يتم إنشاء قوالب الضريبة الافتراضية للمبيعات والشراء.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,لا يمكن إعادة إرسال نوع ترك {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,يجب أن يكون الحساب المدين &quot;حساب المدينين&quot;
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,لا يمكن أن يكون تاريخ انتهاء الاتفاقية أقل من اليوم.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},يرجى ضبط الحساب في المستودع {0} أو حساب الجرد الافتراضي في الشركة {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,تعيين كافتراضي
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),الوزن الصافي لهذه الحزمة. (يتم حسابه تلقائيًا كمجموع الوزن الصافي للعناصر)
@@ -5258,8 +5312,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,دفعات منتهية الصلاحية
 DocType: Shipping Rule,Shipping Rule Type,نوع الشحن القاعدة
 DocType: Job Offer,Accepted,وافقت
-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> \ لإلغاء هذا المستند"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,لقد قمت بالفعل بتقييم معايير التقييم {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,حدد أرقام الدُفعات
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),العمر (أيام)
@@ -5286,6 +5338,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,اختر المجالات الخاصة بك
 DocType: Agriculture Task,Task Name,اسم المهمة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,الأسهم المدخلات التي تم إنشاؤها بالفعل لأمر العمل
+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> \ لإلغاء هذا المستند"
 ,Amount to Deliver,مبلغ التسليم
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,الشركة {0} غير موجودة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,لم يتم العثور على طلبات مواد معلقة لربط العناصر المحددة.
@@ -5335,6 +5389,7 @@
 DocType: Lab Prescription,Test Code,كود الاختبار
 DocType: Purchase Taxes and Charges,On Previous Row Total,في الصف السابق المجموع
 DocType: Student,Student Email Address,عنوان البريد الإلكتروني للطالب
+,Delayed Item Report,تأخر تقرير البند
 DocType: Academic Term,Education,التعليم
 DocType: Supplier Quotation,Supplier Address,عنوان المورد
 DocType: Salary Detail,Do not include in total,لا تدرج في المجموع
@@ -5342,7 +5397,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} غير موجود
 DocType: Purchase Receipt Item,Rejected Quantity,الكمية المرفوضة
 DocType: Cashier Closing,To TIme,الى وقت
-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: Daily Work Summary Group User,Daily Work Summary Group User,مستخدم مجموعة ملخص العمل اليومي
 DocType: Fiscal Year Company,Fiscal Year Company,شركة السنة المالية
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,يجب ألا يكون العنصر البديل هو نفسه رمز العنصر
@@ -5394,6 +5448,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,التأخير بين توقف التسليم
 DocType: Stock Settings,Freeze Stocks Older Than [Days],تجميد الأسهم أقدم من [أيام]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,خصم المنتج خطة ترويجية
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,أولوية الإصدار موجودة بالفعل
 DocType: Account,Asset Received But Not Billed,الأصول المتلقاة ولكن غير مسددة
 DocType: POS Closing Voucher,Total Collected Amount,إجمالي المبلغ المحصل
 DocType: Course,Default Grading Scale,مقياس التقدير الافتراضي
@@ -5436,6 +5491,7 @@
 DocType: Contract,Fulfilment Terms,شروط الوفاء
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,غير مجموعة إلى مجموعة
 DocType: Student Guardian,Mother,أم
+DocType: Issue,Service Level Agreement Fulfilled,اتفاقية مستوى الخدمة
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,خصم الضريبة على استحقاقات الموظفين غير المطالب بها
 DocType: Travel Request,Travel Funding,تمويل السفر
 DocType: Shipping Rule,Fixed,ثابت
@@ -5465,10 +5521,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,لم يتم العثور على العناصر.
 DocType: Item Attribute,From Range,من المدى
 DocType: Clinical Procedure,Consumables,المواد الاستهلاكية
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,مطلوب &quot;employee_field_value&quot; و &quot;الطابع الزمني&quot;.
 DocType: Purchase Taxes and Charges,Reference Row #,مرجع الصف #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},يرجى تعيين &quot;مركز تكلفة استهلاك الأصول&quot; في الشركة {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,الصف # {0}: مستند الدفع مطلوب لإكمال trasaction
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,انقر فوق هذا الزر لسحب بيانات &quot;أمر المبيعات&quot; من Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),ساعات العمل أدناه التي يتم وضع علامة نصف يوم. (صفر لتعطيل)
 ,Assessment Plan Status,حالة خطة التقييم
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,يرجى اختيار {0} أولاً
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,أرسل هذا لإنشاء سجل الموظف
@@ -5539,6 +5597,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,تعيين فتح
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,تبديل المرشحات
 DocType: Production Plan,Material Request Detail,طلب المواد التفاصيل
+DocType: Shift Type,Process Attendance After,عملية الحضور بعد
 DocType: Material Request Item,Quantity and Warehouse,الكمية والمستودعات
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,الذهاب إلى البرامج
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},الصف # {0}: إدخال مكرر في المراجع {1} {2}
@@ -5596,6 +5655,7 @@
 DocType: Pricing Rule,Party Information,معلومات الحزب
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),المدينون ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,حتى الآن لا يمكن أن يكون أكبر من تاريخ تخفيف الموظف
+DocType: Shift Type,Enable Exit Grace Period,تمكين الخروج فترة سماح
 DocType: Expense Claim,Employees Email Id,معرف البريد الإلكتروني للموظفين
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,تحديث السعر من Shopify إلى ERPNext قائمة الأسعار
 DocType: Healthcare Settings,Default Medical Code Standard,الرمز الطبي الافتراضي القياسي
@@ -5626,7 +5686,6 @@
 DocType: Budget,Applicable on Material Request,ينطبق على طلب المواد
 DocType: Support Settings,Search APIs,بحث واجهات برمجة التطبيقات
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,نسبة الإنتاج الزائد لأمر المبيعات
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,مواصفات
 DocType: Purchase Invoice,Supplied Items,العناصر الموردة
 DocType: Leave Control Panel,Select Employees,حدد الموظفين
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},حدد حساب دخل الفوائد في القرض {0}
@@ -5652,7 +5711,7 @@
 ,Supplier-Wise Sales Analytics,المورد الحكمة تحليلات المبيعات
 DocType: GSTR 3B Report,February,شهر فبراير
 DocType: Appraisal,For Employee,للموظف
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,تاريخ التسليم الفعلي
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,تاريخ التسليم الفعلي
 DocType: Sales Partner,Sales Partner Name,اسم شريك المبيعات
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,صف الإهلاك {0}: يتم إدخال تاريخ بدء الإهلاك كتاريخ سابق
 DocType: GST HSN Code,Regional,إقليمي
@@ -5691,6 +5750,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,سجل أداء المورد
 DocType: Travel Itinerary,Travel To,يسافر إلى
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,مارك الحضور
+DocType: Shift Type,Determine Check-in and Check-out,تحديد الوصول والمغادرة
 DocType: POS Closing Voucher,Difference,فرق
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,صغير
 DocType: Work Order Item,Work Order Item,ترتيب العمل البند
@@ -5724,6 +5784,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,المخدرات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} مغلق
 DocType: Patient,Medical History,تاريخ طبى
+DocType: Expense Claim,Expense Taxes and Charges,مصاريف الضرائب والرسوم
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,عدد الأيام التي انقضت بعد تاريخ الفاتورة قبل إلغاء الاشتراك أو تعليم الاشتراك على أنه غير مدفوع
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ملاحظة التثبيت {0} تم إرسالها بالفعل
 DocType: Patient Relation,Family,عائلة
@@ -5756,7 +5817,6 @@
 DocType: Dosage Strength,Strength,قوة
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} وحدات {1} مطلوبة في {2} لإكمال هذه المعاملة.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,ارتجاعي المواد الخام من الباطن بناء على
-DocType: Bank Guarantee,Customer,زبون
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",في حالة التمكين ، سيكون الحقل الأكاديمي إلزاميًا في أداة تسجيل البرنامج.
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",بالنسبة إلى مجموعة الطلاب القائمة على الدُفعات ، سيتم التحقق من &quot;مجموعة الدُفعات&quot; لكل طالب من &quot;تسجيل البرنامج&quot;.
 DocType: Course,Topics,المواضيع
@@ -5836,6 +5896,7 @@
 DocType: Chapter,Chapter Members,أعضاء الفصل
 DocType: Warranty Claim,Service Address,عنوان الخدمة
 DocType: Journal Entry,Remark,تعليق
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),الصف {0}: الكمية غير متوفرة {4} في المستودع {1} في وقت نشر الإدخال ({2} {3})
 DocType: Patient Encounter,Encounter Time,لقاء الوقت
 DocType: Serial No,Invoice Details,تفاصيل الفاتورة
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups",يمكن إجراء حسابات أخرى ضمن مجموعات ، ولكن يمكن إجراء إدخالات مقابل مجموعات غير
@@ -5916,6 +5977,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),إغلاق (الافتتاح + المجموع)
 DocType: Supplier Scorecard Criteria,Criteria Formula,معايير الصيغة
 apps/erpnext/erpnext/config/support.py,Support Analytics,تحليلات الدعم
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),معرف جهاز الحضور (معرف بطاقة الهوية / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,مراجعة والعمل
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",إذا تم تجميد الحساب ، يُسمح بإدخال قيود على المستخدمين المقيدين.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,المبلغ بعد الاستهلاك
@@ -5937,6 +5999,7 @@
 DocType: Salary Slip,Loan Repayment,سداد القروض
 DocType: Employee Education,Major/Optional Subjects,الموضوعات الرئيسية / الاختيارية
 DocType: Soil Texture,Silt,طمي
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,عناوين الموردين والاتصالات
 DocType: Bank Guarantee,Bank Guarantee Type,نوع الضمان البنكي
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",في حالة التعطيل ، لن يكون حقل &quot;مجموع مدور&quot; مرئيًا في أي معاملة
 DocType: Pricing Rule,Min Amt,مين امت
@@ -5975,6 +6038,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,فتح عنصر أداة إنشاء الفاتورة
 DocType: Soil Analysis,(Ca+Mg)/K,(الكالسيوم والمغنيسيوم +) / K
 DocType: Bank Reconciliation,Include POS Transactions,تشمل معاملات نقاط البيع
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},لم يتم العثور على موظف لقيمة حقل الموظف المحدد. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),المبلغ المستلم (عملة الشركة)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save",LocalStorage ممتلئ ، لم يحفظ
 DocType: Chapter Member,Chapter Member,عضو الفصل
@@ -6007,6 +6071,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,لم يتم إنشاء مجموعات طلاب.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},صف مكرر {0} بنفس {1}
 DocType: Employee,Salary Details,تفاصيل الراتب
+DocType: Employee Checkin,Exit Grace Period Consequence,الخروج من فترة السماح
 DocType: Bank Statement Transaction Invoice Item,Invoice,فاتورة
 DocType: Special Test Items,Particulars,تفاصيل
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,يرجى ضبط عامل التصفية على أساس العنصر أو المستودع
@@ -6108,6 +6173,7 @@
 DocType: Serial No,Out of AMC,خارج AMC
 DocType: Job Opening,"Job profile, qualifications required etc.",ملف الوظيفة والمؤهلات المطلوبة وما إلى ذلك
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,السفينة الى الدولة
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,هل ترغب في تقديم طلب المواد
 DocType: Opportunity Item,Basic Rate,المعدل الاساسي
 DocType: Compensatory Leave Request,Work End Date,تاريخ انتهاء العمل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,طلب المواد الخام
@@ -6293,6 +6359,7 @@
 DocType: Sales Order Item,Gross Profit,اجمالي الربح
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
 DocType: Asset,Insurer,شركة التأمين
+DocType: Employee Checkin,OUT,خارج
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,شراء المبلغ
 DocType: Asset Maintenance Task,Certificate Required,الشهادة المطلوبة
 DocType: Retention Bonus,Retention Bonus,مكافأة الاحتفاظ
@@ -6408,6 +6475,8 @@
 DocType: Invoice Discounting,Sanctioned,تقرها
 DocType: Course Enrollment,Course Enrollment,تسجيل بالطبع
 DocType: Item,Supplier Items,عناصر المورد
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",لا يمكن أن يكون وقت البدء أكبر من أو يساوي End Time \ لـ {0}.
 DocType: Sales Order,Not Applicable,لايمكن تطبيقه
 DocType: Support Search Source,Response Options,خيارات الاستجابة
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} يجب أن تكون قيمة بين 0 و 100
@@ -6494,7 +6563,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,أصول ثابتة
 DocType: Purchase Order,Ref SQ,المرجع SQ
 DocType: Salary Structure,Total Earning,مجموع الأرباح
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 DocType: Share Balance,From No,من لا
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,فاتورة تسوية المدفوعات
 DocType: Purchase Invoice,Taxes and Charges Added,الضرائب والرسوم المضافة
@@ -6602,6 +6670,7 @@
 DocType: POS Profile,Ignore Pricing Rule,تجاهل قاعدة التسعير
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,طعام
 DocType: Lost Reason Detail,Lost Reason Detail,تفاصيل السبب المفقود
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},تم إنشاء الأرقام التسلسلية التالية: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,ملاحظات العملاء
 DocType: Serial No,Warranty / AMC Details,الضمان / تفاصيل AMC
 DocType: Issue,Opening Time,وقت مفتوح
@@ -6651,6 +6720,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,اسم الشركة ليس نفسه
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,لا يمكن تقديم ترقية الموظف قبل تاريخ الترقية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},غير مسموح بتحديث معاملات الأسهم الأقدم من {0}
+DocType: Employee Checkin,Employee Checkin,فحص الموظف
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ الانتهاء للعنصر {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,إنشاء عروض الأسعار للعملاء
 DocType: Buying Settings,Buying Settings,شراء الإعدادات
@@ -6672,6 +6742,7 @@
 DocType: Patient,Patient Demographics,التركيبة السكانية المريض
 DocType: Share Transfer,To Folio No,إلى رقم الورقة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,التدفقات النقدية من العمليات
+DocType: Employee Checkin,Log Type,نوع السجل
 DocType: Stock Settings,Allow Negative Stock,السماح للسهم السلبي
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,لا يوجد أي من العناصر أي تغيير في الكمية أو القيمة.
 DocType: Asset,Purchase Date,تاريخ الشراء
@@ -6716,6 +6787,7 @@
 DocType: Vital Signs,Very Hyper,فرط جدا
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,حدد طبيعة عملك.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,يرجى اختيار الشهر والسنة
+DocType: Service Level,Default Priority,الأولوية الافتراضية
 DocType: Student Log,Student Log,سجل الطالب
 DocType: Shopping Cart Settings,Enable Checkout,تمكين Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,الموارد البشرية
@@ -6744,7 +6816,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ربط Shopify مع ERPNext
 DocType: Homepage Section Card,Subtitle,عنوان فرعي
 DocType: Soil Texture,Loam,طين
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 DocType: BOM,Scrap Material Cost(Company Currency),تكلفة المواد الخردة (عملة الشركة)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,يجب تسليم ملاحظة التسليم {0}
 DocType: Task,Actual Start Date (via Time Sheet),تاريخ البدء الفعلي (عبر ورقة الوقت)
@@ -6800,6 +6871,7 @@
 DocType: Drug Prescription,Dosage,جرعة
 DocType: Cheque Print Template,Starting position from top edge,موقف انطلاق من الحافة العلوية
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),مدة التعيين (بالدقائق)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},هذا الموظف لديه بالفعل سجل بنفس الطابع الزمني. {0}
 DocType: Accounting Dimension,Disable,تعطيل
 DocType: Email Digest,Purchase Orders to Receive,أوامر الشراء لتلقيها
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,لا يمكن رفع أوامر الإنتاج من أجل:
@@ -6815,7 +6887,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,نقل المواد للعقد من الباطن
 DocType: Job Card,Timing Detail,توقيت التفاصيل
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,مطلوب في
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},استيراد {0} من {1}
 DocType: Job Offer Term,Job Offer Term,مدة عرض الوظيفة
 DocType: SMS Center,All Contact,كل الاتصال
 DocType: Project Task,Project Task,المشاريع المهمة
@@ -6866,7 +6937,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,لم يتم إعداد العنصر {0} للرقم التسلسلي. تحقق من عنصر العنصر الرئيسي
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,من الدولة
 DocType: Leave Type,Maximum Continuous Days Applicable,أقصى أيام متواصلة قابلة للتطبيق
-apps/erpnext/erpnext/config/support.py,Support Team.,فريق الدعم.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,الرجاء إدخال اسم الشركة أولاً
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,استيراد ناجح
 DocType: Guardian,Alternate Number,عدد البديل
@@ -6958,6 +7028,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,الصف # {0}: تمت إضافة العنصر
 DocType: Student Admission,Eligibility and Details,الأهلية والتفاصيل
 DocType: Staffing Plan,Staffing Plan Detail,تفاصيل خطة التوظيف
+DocType: Shift Type,Late Entry Grace Period,فترة سماح الدخول المتأخرة
 DocType: Email Digest,Annual Income,الدخل السنوي
 DocType: Journal Entry,Subscription Section,قسم الاشتراك
 DocType: Salary Slip,Payment Days,أيام الدفع
@@ -7008,6 +7079,7 @@
 DocType: Journal Entry Account,Account Balance,رصيد الحساب
 DocType: Asset Maintenance Log,Periodicity,دورية
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,السجل الطبي
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,نوع السجل مطلوب لتسجيلات الوقوع في التحول: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,إعدام
 DocType: Item,Valuation Method,طريقة التقييم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
@@ -7092,6 +7164,7 @@
 DocType: Loan Type,Loan Name,اسم القرض
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,ضبط الوضع الافتراضي للدفع
 DocType: Quality Goal,Revision,مراجعة
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,الوقت الذي يسبق وقت نهاية التحول عندما يتم تسجيل المغادرة في وقت مبكر (بالدقائق).
 DocType: Healthcare Service Unit,Service Unit Type,نوع وحدة الخدمة
 DocType: Purchase Invoice,Return Against Purchase Invoice,العودة مقابل فاتورة الشراء
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,توليد سر
@@ -7247,12 +7320,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,مستحضرات التجميل
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,حدد هذا إذا كنت تريد إجبار المستخدم على تحديد سلسلة قبل الحفظ. لن يكون هناك تقصير في حالة التحقق من ذلك.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يُسمح للمستخدمين الذين يقومون بهذا الدور بتعيين حسابات مجمدة وإنشاء / تعديل إدخالات المحاسبة مقابل الحسابات المجمدة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},يتعذر العثور على الفاصل الزمني في الأيام {0} التالية للتشغيل {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,تغليف
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,لا يمكنك التجديد إلا إذا انتهت عضويتك خلال 30 يومًا
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},يجب أن تكون القيمة بين {0} و {1}
 DocType: Quality Feedback,Parameters,المعلمات
+DocType: Shift Type,Auto Attendance Settings,إعدادات الحضور التلقائي
 ,Sales Partner Transaction Summary,ملخص معاملات شريك المبيعات
 DocType: Asset Maintenance,Maintenance Manager Name,اسم مدير الصيانة
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,هناك حاجة لجلب تفاصيل البند.
@@ -7344,10 +7419,10 @@
 DocType: Pricing Rule,Validate Applied Rule,التحقق من صحة القاعدة المطبقة
 DocType: Job Card Item,Job Card Item,بند بطاقة الوظيفة
 DocType: Homepage,Company Tagline for website homepage,شركة سطر الوصف لموقع الصفحة الرئيسية
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,اضبط وقت الاستجابة ودقة الأولوية {0} في الفهرس {1}.
 DocType: Company,Round Off Cost Center,جولة خارج مركز التكلفة
 DocType: Supplier Scorecard Criteria,Criteria Weight,معايير الوزن
 DocType: Asset,Depreciation Schedules,جداول الاستهلاك
-DocType: Expense Claim Detail,Claim Amount,مبلغ المطالبة
 DocType: Subscription,Discounts,خصومات
 DocType: Shipping Rule,Shipping Rule Conditions,شروط الشحن القاعدة
 DocType: Subscription,Cancelation Date,تاريخ الإلغاء
@@ -7375,7 +7450,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,إظهار قيم الصفر
 DocType: Employee Onboarding,Employee Onboarding,موظف على متن الطائرة
 DocType: POS Closing Voucher,Period End Date,تاريخ انتهاء الفترة
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,فرص المبيعات حسب المصدر
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,سيتم تعيين &quot;موافقة الإجازة&quot; الأولى في القائمة على أنها &quot;موافقة الإجازة&quot; الافتراضية.
 DocType: POS Settings,POS Settings,إعدادات POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,جميع الحسابات
@@ -7396,7 +7470,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,الصف # {0}: يجب أن يكون السعر هو نفسه {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,عناصر خدمة الرعاية الصحية
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,لا توجد سجلات
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,الشيخوخة المدى 3
 DocType: Vital Signs,Blood Pressure,ضغط الدم
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,الهدف في
@@ -7443,6 +7516,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,دفعات
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,دفاع
 DocType: Item,Has Batch No,لديه رقم الدفعة
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,الأيام المتأخرة
 DocType: Lead,Person Name,اسم الشخص
 DocType: Item Variant,Item Variant,متغير البند
 DocType: Training Event Employee,Invited,دعوة
@@ -7464,7 +7538,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",لا يمكن حساب تواريخ البدء والانتهاء في &quot;جدول الرواتب&quot; الصحيح ، {0}.
 DocType: POS Profile,Only show Customer of these Customer Groups,أظهر فقط عميل مجموعات العملاء هذه
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,حدد عناصر لحفظ الفاتورة
-DocType: Service Level,Resolution Time,وفر الوقت
+DocType: Service Level Priority,Resolution Time,وفر الوقت
 DocType: Grading Scale Interval,Grade Description,وصف الصف
 DocType: Homepage Section,Cards,بطاقات
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,محضر اجتماع الجودة
@@ -7491,6 +7565,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,رصيد كشف الحساب حسب دفتر الأستاذ العام
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),الرعاية الصحية (تجريبي)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,المستودع الافتراضي لإنشاء أمر المبيعات ومذكرة التسليم
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,لا يمكن أن يكون زمن الاستجابة لـ {0} في الفهرس {1} أكبر من وقت الدقة.
 DocType: Opportunity,Customer / Lead Name,اسم العميل / الرصاص
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,المبلغ غير المطالب به
@@ -7537,7 +7612,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,استيراد الأطراف والعناوين
 DocType: Item,List this Item in multiple groups on the website.,أدرج هذا العنصر في مجموعات متعددة على الموقع الإلكتروني.
 DocType: Request for Quotation,Message for Supplier,رسالة للمورد
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,لا يمكن تغيير {0} حيث توجد معاملة الأسهم للعنصر {1}.
 DocType: Healthcare Practitioner,Phone (R),الهاتف (ص)
 DocType: Maintenance Team Member,Team Member,أعضاء الفريق
 DocType: Asset Category Account,Asset Category Account,حساب فئة الأصول
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 6ede7b4..82bb231 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Назначаването {0} и фактурата за продажби {1} са анулирани
 DocType: Purchase Receipt,Vehicle Number,Номер на превозното средство
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Вашата електронна поща...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Включване на записи по подразбиране в книгата
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Включване на записи по подразбиране в книгата
 DocType: Activity Cost,Activity Type,Тип дейност
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
 DocType: Company,Gain/Loss Account on Asset Disposal,Сметка за печалба / загуба при обезвреждане на активи
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Платежни записи
 DocType: Employee Education,Class / Percentage,Клас / Процент
 ,Electronic Invoice Register,Регистър на електронните фактури
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Номерът на събитието, след което последствието се изпълнява."
 DocType: Sales Invoice,Is Return (Credit Note),Възвръщаемост (кредитна бележка)
+DocType: Price List,Price Not UOM Dependent,Цена Не UOM Зависими
 DocType: Lab Test Sample,Lab Test Sample,Лабораторна проба
 DocType: Shopify Settings,status html,състояние html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За напр. 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Нетно плащане
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Общо фактуриран Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Консумативи Фактурата отделно
+DocType: Shift Type,Working Hours Threshold for Absent,Праг на работното време за липса
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде зададен срещу профил в групата {0}
 DocType: Purchase Receipt Item,Rate and Amount,Тарифа и сума
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Настройки за пациента
 DocType: Asset,Insurance End Date,Крайна дата на застраховката
 DocType: Bank Account,Branch Code,Клон на клон
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Време за отговор
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Потребителски форум
 DocType: Landed Cost Item,Landed Cost Item,Позиция за цената на сушата
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Продавачът и купувачът не могат да бъдат еднакви
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,прехвърляне
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Търсене на елемент (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Резултатът е изпратен
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,От дата не може да бъде по-голяма от тази към днешна дата
 DocType: Supplier,Supplier of Goods or Services.,Доставчик на стоки или услуги.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Име на новия профил. Забележка: Моля, не създавайте сметки за клиенти и доставчици"
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Учебната група или График на курса е задължително
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Име на умението
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Отпечатайте отчетната карта
 DocType: Soil Texture,Ternary Plot,Ternary Парцел
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Билети за поддръжка
 DocType: Asset Category Account,Fixed Asset Account,Сметка с фиксирани активи
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Последен
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Задължително за баланса
 DocType: Payment Entry,Total Allocated Amount,Общо разпределена сума
 DocType: Sales Invoice,Get Advances Received,Получете получени аванси
+DocType: Shift Type,Last Sync of Checkin,Последна синхронизация на регистрацията
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,"Стойност на данъка, включена в стойността"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Кръвна група
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Изрязване на интервалите UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Времето след началото на смяна, когато регистрацията се счита за закъсняла (в минути)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,изследвам
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Не са намерени неизплатени фактури
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",Вече са планирани {0} свободни работни места и {1} бюджет за {2} за дъщерни дружества от {3}. Можете да планирате само за {4} свободни работни места и бюджет {5} според плана за персонал {6} за компанията-майка {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Плочи с отстъпка за продукти
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Подвижна средна
 DocType: Employee Attendance Tool,Unmarked Attendance,Немаркирано присъствие
 DocType: Homepage Section,Number of Columns,Брой колони
+DocType: Issue Priority,Issue Priority,Приоритет на издаване
 DocType: Holiday List,Add Weekly Holidays,Добавете седмични празници
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Създайте фиш за заплатите
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Дата на издаване
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете пакет за елемент {0}. Не може да се намери отделен пакет, който отговаря на това изискване"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Не може да се създаде бонус за задържане за останалите служители
+DocType: Employee Checkin,Location / Device ID,ID на местоположението / устройството
 DocType: Purchase Order,To Receive,Получавам
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Няма да можете да се презареждате, докато имате мрежа."
 DocType: Course Activity,Enrollment,записване
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Макс: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Липсва информация за електронното фактуриране
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Няма създадена заявка за материал
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група продукти&gt; Марка
 DocType: Loan,Total Amount Paid,Общо изплатена сума
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Всички тези елементи вече са фактурирани
 DocType: Training Event,Trainer Name,Име на обучителя
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Моля, посочете водещото име в олово {0}"
 DocType: Employee,You can enter any date manually,Можете да въведете всяка дата ръчно
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Елемент за съгласуване на запасите
+DocType: Shift Type,Early Exit Consequence,Последствие от ранен изход
 DocType: Item Group,General Settings,Основни настройки
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Срокът за плащане не може да бъде преди публикуването / датата на фактурата на доставчика
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Въведете името на Бенефициента преди подаване.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Потвърждение за плащане
 ,Available Stock for Packing Items,Налична складова наличност за опаковъчни артикули
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+DocType: Shift Type,Every Valid Check-in and Check-out,Всяко валидно настаняване и напускане
 DocType: Support Search Source,Query Route String,Поредица от заявки за маршрут
 DocType: Customer Feedback Template,Customer Feedback Template,Шаблон за обратна връзка с клиенти
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Цитати за водещи или клиенти.
@@ -1204,6 +1212,7 @@
 DocType: Authorization Control,Authorization Control,Контрол за оторизация
 ,Daily Work Summary Replies,Обобщени отговори за ежедневната работа
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Поканени сте да сътрудничите по проекта: {0}
+DocType: Issue,Response By Variance,Отговор чрез отклонение
 DocType: Item,Sales Details,Подробности за продажбите
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Големи букви за шаблони за печат.
 DocType: Salary Detail,Tax on additional salary,Данък върху допълнителната заплата
@@ -1327,6 +1336,7 @@
 DocType: Project,Task Progress,Прогрес на задачата
 DocType: Journal Entry,Opening Entry,Отваряне на запис
 DocType: Bank Guarantee,Charges Incurred,Възникнали такси
+DocType: Shift Type,Working Hours Calculation Based On,Изчисление на работното време въз основа на
 DocType: Work Order,Material Transferred for Manufacturing,Прехвърлен материал за производство
 DocType: Products Settings,Hide Variants,Скриване на варианти
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Деактивиране на планирането на капацитета и проследяването на времето
@@ -1356,6 +1366,7 @@
 DocType: Guardian,Interests,Интереси
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Консумирано количество
 DocType: Education Settings,Education Manager,Мениджър образование
+DocType: Employee Checkin,Shift Actual Start,Превключване на действителния старт
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планирайте времевите дневници извън работното време на работната станция.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Точки за лоялност: {0}
 DocType: Healthcare Settings,Registration Message,Съобщение за регистрация
@@ -1380,9 +1391,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Фактурата вече е създадена за всички часове за фактуриране
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Purchase Invoice,Pricing Rules,Правила за ценообразуване
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като съществуват съществуващи транзакции срещу елемент {0}, не можете да промените стойността на {1}"
 DocType: Hub Tracked Item,Image List,Списък с изображения
 DocType: Item Variant Settings,Allow Rename Attribute Value,Разрешаване на преименуване на стойността на атрибута
-DocType: Price List,Price Not UOM Dependant,Цена Не UOM Зависими
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Време (в минути)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Основен
 DocType: Loan,Interest Income Account,Сметка за доходи от лихви
@@ -1392,6 +1403,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Изберете POS профил
 DocType: Support Settings,Get Latest Query,Вземете последната заявка
 DocType: Employee Incentive,Employee Incentive,Стимулиране на служителите
+DocType: Service Level,Priorities,Приоритети
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Добавете карти или персонализирани раздели на началната страница
 DocType: Homepage,Hero Section Based On,Раздел Герой въз основа на
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Обща цена на покупката (чрез фактура за покупка)
@@ -1452,7 +1464,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Поръчано количество
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отхвърления склад е задължителен срещу отхвърлен елемент {1}
 ,Received Items To Be Billed,Получени елементи за таксуване
-DocType: Salary Slip Timesheet,Working Hours,Работни часове
+DocType: Attendance,Working Hours,Работни часове
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Режим на плащане
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,"Елементи на поръчка за доставка, които не са получени навреме"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Продължителност в дни
@@ -1572,7 +1584,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за Вашия доставчик
 DocType: Item Default,Default Selling Cost Center,По подразбиране продаващ разходен център
 DocType: Sales Partner,Address & Contacts,Адрес и контакти
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте номерационните серии за посещаемост чрез Настройка&gt; Номерационни серии"
 DocType: Subscriber,Subscriber,абонат
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) няма наличност
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,"Моля, първо изберете Дата на осчетоводяване"
@@ -1583,7 +1594,7 @@
 DocType: Detected Disease,Tasks Created,Създадени задачи
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Стандартната спецификация ({0}) трябва да е активна за този елемент или неговия шаблон
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Процент на Комисията%
-DocType: Service Level,Response Time,Време за реакция
+DocType: Service Level Priority,Response Time,Време за реакция
 DocType: Woocommerce Settings,Woocommerce Settings,Настройки за Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Количеството трябва да бъде положително
 DocType: Contract,CRM,CRM
@@ -1600,7 +1611,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Съпоставяне на данни за транзакции
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Олово изисква или име на лице или име на организацията
 DocType: Student,Guardians,пазители
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в образованието&gt; Настройки на образованието"
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Изберете марка ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Среден доход
 DocType: Shipping Rule,Calculate Based On,Изчислете въз основа на
@@ -1637,6 +1647,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Съществува запис за присъствие {0} срещу Студент {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Дата на сделката
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Отмяна на абонамента
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Споразумението за нивото на обслужване не можа да бъде зададено {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Размер на нетната заплата
 DocType: Account,Liability,отговорност
 DocType: Employee,Bank A/C No.,Банков A / C No.
@@ -1702,7 +1713,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Код на суровината
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Фактура за покупка {0} вече е подадена
 DocType: Fees,Student Email,Студентски имейл
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Рекурсия на спецификацията: {0} не може да бъде родител или дете от {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Вземете артикули от здравни услуги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Вписването на запас {0} не е подадено
 DocType: Item Attribute Value,Item Attribute Value,Стойност на атрибута на елемента
@@ -1727,7 +1737,6 @@
 DocType: Production Plan,Select Items to Manufacture,Изберете Елементи за производство
 DocType: Leave Application,Leave Approver Name,Напускане на името на одобрителя
 DocType: Shareholder,Shareholder,акционер
-DocType: Issue,Agreement Status,Статус на споразумението
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Настройки по подразбиране за продажба на транзакции.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Моля изберете Студентски прием, който е задължителен за платения кандидат-студент"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Изберете BOM
@@ -1990,6 +1999,7 @@
 DocType: Account,Income Account,Сметка за доходи
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Всички складове
 DocType: Contract,Signee Details,Подробности за Signee
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Разрешаване на напускането след края на смяна (в минути)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Доставяне
 DocType: Item Group,Check this if you want to show in website,"Проверете това, ако искате да се показват в уебсайта"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Фискалната година {0} не е намерена
@@ -2056,6 +2066,7 @@
 DocType: Activity Cost,Billing Rate,Тарифа за таксуване
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Предупреждение: Друг {0} # {1} съществува срещу запис на запас {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,"Моля, активирайте настройките на Google Карти, за да оцените и оптимизирате маршрутите"
+DocType: Purchase Invoice Item,Page Break,Разделител на страница
 DocType: Supplier Scorecard Criteria,Max Score,Максимален резултат
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Началната дата за изплащане не може да бъде преди датата на изплащане.
 DocType: Support Search Source,Support Search Source,Подкрепете източника на търсене
@@ -2124,6 +2135,7 @@
 DocType: Employee Transfer,Employee Transfer,Трансфер на служители
 ,Sales Funnel,Фуния на продажбите
 DocType: Agriculture Analysis Criteria,Water Analysis,Анализ на водата
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Започнете регистрацията преди началото на смяна (в минути)
 DocType: Accounts Settings,Accounts Frozen Upto,"Сметки, замразени Upto"
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Няма какво да се редактира.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операцията {0} по-дълга от всички налични работни часове на работната станция {1}, разбива операцията на няколко операции"
@@ -2137,7 +2149,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Продажната поръчка {0} е {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Забавяне на плащането (дни)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Въведете подробности за амортизацията
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO на клиенти
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Очакваната дата на доставка трябва да е след датата на поръчката за продажба
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Количеството на елемента не може да бъде нула
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Невалиден атрибут
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},"Моля, изберете BOM срещу елемент {0}"
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Тип фактура
@@ -2147,6 +2161,7 @@
 DocType: Volunteer,Afternoon,следобед
 DocType: Vital Signs,Nutrition Values,Хранителни стойности
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Наличие на треска (температура&gt; 38,5 ° C / 101,3 ° F или продължителна температура&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в човешките ресурси&gt; Настройки за човешки ресурси"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC обърната
 DocType: Project,Collect Progress,Събиране на напредъка
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Енергия
@@ -2197,6 +2212,7 @@
 ,Ordered Items To Be Billed,Поръчани позиции за таксуване
 DocType: Taxable Salary Slab,To Amount,Към сума
 DocType: Purchase Invoice,Is Return (Debit Note),Е възвръщаемост (дебитна бележка)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Приготвяме се да започнем
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,сливам
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Не може да се промени началната дата на фискалната година и крайната дата на фискалната година, след като фискалната година бъде запазена."
@@ -2215,8 +2231,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Началната дата на поддръжката не може да бъде преди датата на доставка за сериен номер {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Ред {0}: Обменният курс е задължителен
 DocType: Purchase Invoice,Select Supplier Address,Изберете Адрес на доставчика
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Наличното количество е {0}, трябва {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,"Моля, въведете тайната за потребителските услуги на API"
 DocType: Program Enrollment Fee,Program Enrollment Fee,Такса за записване в програмата
+DocType: Employee Checkin,Shift Actual End,Превключване на действителния край
 DocType: Serial No,Warranty Expiry Date,Срок на валидност на гаранцията
 DocType: Hotel Room Pricing,Hotel Room Pricing,Цени на хотелските стаи
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Външни облагаеми доставки (различни от нулеви, нулеви и освободени)"
@@ -2276,6 +2294,7 @@
 DocType: Quality Inspection Reading,Reading 5,Четене 5
 DocType: Shopping Cart Settings,Display Settings,Настройки на дисплея
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,"Моля, задайте брой резервирани амортизации"
+DocType: Shift Type,Consequence after,Следствие след това
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,За какво ти е необходима помощ?
 DocType: Journal Entry,Printing Settings,Настройки за печат
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,банково дело
@@ -2285,6 +2304,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Адресът за фактуриране е същият като адреса за доставка
 DocType: Account,Cash,Пари в брой
 DocType: Employee,Leave Policy,Оставете политика
+DocType: Shift Type,Consequence,следствие
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Адрес на ученика
 DocType: GST Account,CESS Account,Профил в CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Разходен център се изисква за сметка „Печалба и загуба“ {2}. Моля, задайте по подразбиране Разходен център за Компанията."
@@ -2349,6 +2369,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Ваучер за приключване на периода
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Име на Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,"Моля, въведете сметката за разходи"
+DocType: Issue,Resolution By Variance,Разделителна способност по отклонение
 DocType: Employee,Resignation Letter Date,Дата на подаване на оставка
 DocType: Soil Texture,Sandy Clay,Санди Клей
 DocType: Upload Attendance,Attendance To Date,Дата на присъствие
@@ -2361,6 +2382,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Преглед сега
 DocType: Item Price,Valid Upto,Валиден до момента
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Справочният Doctype трябва да е един от {0}
+DocType: Employee Checkin,Skip Auto Attendance,Прескачане на автоматичното присъствие
 DocType: Payment Request,Transaction Currency,Валута на транзакцията
 DocType: Loan,Repayment Schedule,График на погасяване
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Създайте запис за запазване на образеца за запазване
@@ -2432,6 +2454,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Такси за затваряне на ваучери за ПОС
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Действие е инициализирано
 DocType: POS Profile,Applicable for Users,Приложимо за потребители
+,Delayed Order Report,Отчет за отложена поръчка
 DocType: Training Event,Exam,Изпит
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Неправилен брой намерени записи за Главна книга. Може да сте избрали грешна сметка в транзакцията.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Тръбопровод за продажби
@@ -2446,10 +2469,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,"Условията ще се прилагат за всички избрани елементи, комбинирани."
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Конфигуриране
 DocType: Hotel Room,Capacity,Капацитет
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Инсталирано количество
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Партидата {0} от елемент {1} е деактивирана.
 DocType: Hotel Room Reservation,Hotel Reservation User,Потребител на хотелски резервации
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Работният ден е повторен два пъти
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Споразумението за нивото на услугата с тип обект {0} и елемент {1} вече съществува.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},"Група елементи, които не са споменати в главния елемент на артикул {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Грешка в името: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Територията се изисква в профила на POS
@@ -2497,6 +2521,7 @@
 DocType: Depreciation Schedule,Schedule Date,Дата на разписанието
 DocType: Packing Slip,Package Weight Details,Подробности за теглото на пакета
 DocType: Job Applicant,Job Opening,Откриване на работа
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Последна известна успешна синхронизация на проверка на служители. Нулирайте това само ако сте сигурни, че всички регистрационни файлове са синхронизирани от всички местоположения. Моля, не променяйте това, ако не сте сигурни."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Реална цена
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Общият аванс ({0}) срещу поръчка {1} не може да бъде по-голям от общия брой ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Варианти на артикула са актуализирани
@@ -2541,6 +2566,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Вземи фактури
 DocType: Tally Migration,Is Day Book Data Imported,Данните за дневната книга са импортирани
 ,Sales Partners Commission,Комисия за търговски партньори
+DocType: Shift Type,Enable Different Consequence for Early Exit,Активиране на различни последствия за ранен изход
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,правен
 DocType: Loan Application,Required by Date,Изисква се по дата
 DocType: Quiz Result,Quiz Result,Резултат от теста
@@ -2600,7 +2626,6 @@
 DocType: Pricing Rule,Pricing Rule,Правило за ценообразуване
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Незадължителен списък за почивка не е зададен за периода на отпуск {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Моля, задайте полето за потребителски идентификатор в запис на служител, за да зададете роля на служител"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Време за разрешаване
 DocType: Training Event,Training Event,Събитие за обучение
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормалното кръвно налягане в покой при възрастен е приблизително 120 mm Hg систолично и 80 mmHg диастолично, съкратено &quot;120/80 mmHg&quot;."
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Системата ще извлече всички записи, ако граничната стойност е нула."
@@ -2644,6 +2669,7 @@
 DocType: Student Applicant,Approved,одобрен
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},"От дата трябва да бъде в рамките на фискалната година. Ако приемем, че от дата = {0}"
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,"Моля, задайте група доставчици в настройките за покупка."
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} е невалиден статус на присъствие.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Временна отваряща сметка
 DocType: Purchase Invoice,Cash/Bank Account,Парични средства / банкови сметки
 DocType: Quality Meeting Table,Quality Meeting Table,Таблица за качество на срещата
@@ -2679,6 +2705,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Храни, напитки и тютюневи изделия"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,График на курса
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Елемент Wise Данъчен детайл
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Присъствието ще бъде маркирано автоматично само след тази дата.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Доставки на притежателите на UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Заявка за оферти
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Валутата не може да се променя след извършване на вписвания с друга валута
@@ -2727,7 +2754,6 @@
 DocType: Item,Is Item from Hub,Е елемент от Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Процедура за качество.
 DocType: Share Balance,No of Shares,Брой акции
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),"Ред {0}: Количество, което не е налице за {4} в склада {1} в момента на публикуване на записа ({2} {3})"
 DocType: Quality Action,Preventive,профилактичен
 DocType: Support Settings,Forum URL,URL адрес на форума
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Служител и присъствие
@@ -2949,7 +2975,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Такси и такси по подразбиране
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Това се основава на сделки срещу този доставчик. За подробности вижте графиката по-долу
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Въведете начална и крайна дата за споразумението.
 DocType: Delivery Note Item,Against Sales Invoice,Срещу фактурата за продажби
 DocType: Loyalty Point Entry,Purchase Amount,Сума за покупка
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Не може да се зададе като изгубен като поръчка за продажба.
@@ -2973,7 +2998,7 @@
 DocType: Lead,Organization Name,Наименование на организацията
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Валидните от валидните полета за довършване са задължителни за кумулативното
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Партиден номер трябва да бъде същият като {1} {2}
-DocType: Employee,Leave Details,Оставете подробности
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Борсовите транзакции преди {0} са замразени
 DocType: Driver,Issuing Date,Дата на издаване
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Заявител
@@ -3018,9 +3043,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Детайли за шаблона за картографиране на паричния поток
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Набиране и обучение
 DocType: Drug Prescription,Interval UOM,Интервал UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Настройки за гратисен период за автоматично присъствие
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,От валута и от валута не може да бъде същото
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Фармацевтични
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Часове за поддръжка
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} е отменен или затворен
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ред {0}: Авансът срещу Клиента трябва да бъде кредитен
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Групиране по ваучер (консолидиран)
@@ -3130,6 +3157,7 @@
 DocType: Territory,Territory Manager,Териториален мениджър
 DocType: Lab Test,Sample ID,Идентификатор на мостра
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Количката е празна
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Участието е отбелязано по заявка на служител
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Трябва да се подаде актив {0}
 ,Absent Student Report,Отсъствие на студентски доклад
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Включени в брутната печалба
@@ -3137,7 +3165,9 @@
 DocType: Travel Request Costing,Funded Amount,Финансирана сума
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не е изпратен, така че действието не може да бъде завършено"
 DocType: Subscription,Trial Period End Date,Дата на приключване на пробния период
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Редуващи се записи като IN и OUT по време на същата смяна
 DocType: BOM Update Tool,The new BOM after replacement,Новата спецификация след подмяната
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Точка 5
 DocType: Employee,Passport Number,Номер на паспорт
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Временно отваряне
@@ -3253,6 +3283,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Възможен доставчик
 ,Issued Items Against Work Order,Издадени позиции срещу работна поръчка
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Създаване на {0} Фактура
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в образованието&gt; Настройки за образование"
 DocType: Student,Joining Date,Дата на присъединяване
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Заявяващ сайт
 DocType: Purchase Invoice,Against Expense Account,Срещу разходна сметка
@@ -3292,6 +3323,7 @@
 DocType: Landed Cost Item,Applicable Charges,Приложими такси
 ,Point of Sale,Точка на продажба
 DocType: Authorization Rule,Approving User  (above authorized value),Одобряване на потребителя (над разрешената стойност)
+DocType: Service Level Agreement,Entity,единица
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Сумата {0} {1} прехвърлена от {2} в {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проект {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,От името на партията
@@ -3338,6 +3370,7 @@
 DocType: Soil Texture,Sand Composition (%),Състав на пясъка (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Данни за деня на импортиране
+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; Серия на имената"
 DocType: Asset,Asset Owner Company,Дружество собственик на активи
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Разходен център се изисква за резервиране на претенция за разход
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} валидни серийни номера за елемент {1}
@@ -3398,7 +3431,6 @@
 DocType: Asset,Asset Owner,Собственик на активи
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Складът е задължителен за съставката {0} в ред {1}
 DocType: Stock Entry,Total Additional Costs,Общо допълнителни разходи
-DocType: Marketplace Settings,Last Sync On,Последно синхронизиране е включено
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,"Моля, задайте поне един ред в таблицата Данъци и такси"
 DocType: Asset Maintenance Team,Maintenance Team Name,Име на екипа за поддръжка
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Диаграма на разходни центрове
@@ -3414,12 +3446,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Потребителският идентификатор не е зададен за служител {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","На разположение е {0}, трябва {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Създаден е потребител {0}
 DocType: Stock Settings,Item Naming By,Позициониране на елемент от
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,поръчан
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Това е основна група клиенти и не може да се редактира.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Заявката за материал {0} се отменя или спира
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Строго базиран на типа на регистрационния файл в Служебния чек
 DocType: Purchase Order Item Supplied,Supplied Qty,Доставян обем
 DocType: Cash Flow Mapper,Cash Flow Mapper,Картограф на паричните потоци
 DocType: Soil Texture,Sand,Пясък
@@ -3478,6 +3510,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Групата дублирани елементи е намерена в таблицата на групата елементи
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Годишна заплата
 DocType: Supplier Scorecard,Weighting Function,Функция за претегляне
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Грешка при оценката на формулата за критерии
 ,Lab Test Report,Отчет за лабораторни тестове
 DocType: BOM,With Operations,С операции
@@ -3491,6 +3524,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Няма възможност за възстановяване на суми за влизане в дневника
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} е неактивен студент
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Направете влизане на склад
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Рекурсия на спецификацията: {0} не може да бъде родител или дете от {1}
 DocType: Employee Onboarding,Activities,дейности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Поне един склад е задължителен
 ,Customer Credit Balance,Баланс на кредитните кредити
@@ -3503,9 +3537,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,"Намерена е многократна програма за лоялност за клиента. Моля, изберете ръчно."
 DocType: Patient,Medication,лечение
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Изберете Програма за лоялност
+DocType: Employee Checkin,Attendance Marked,Посещаемост
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Сурови материали
 DocType: Sales Order,Fully Billed,Напълно фактуриран
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Моля, задайте цена за хотелска стая на {}"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Изберете само един приоритет като по подразбиране.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},"Моля, идентифицирайте / създайте профил (Ledger) за тип - {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Общата кредитна / дебитна сума трябва да бъде същата като свързаното вписване в дневника
 DocType: Purchase Invoice Item,Is Fixed Asset,Е фиксиран актив
@@ -3526,6 +3562,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Потвърждение за среща
 DocType: Shopping Cart Settings,Orders,Поръчки
 DocType: HR Settings,Retirement Age,Пенсионна възраст
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,Прожектиран брой
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Изтриването не е разрешено за държава {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Ред # {0}: Актив {1} вече е {2}
@@ -3609,11 +3646,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,касиер счетоводител
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Пореден период за ПОС затваряне на ваучера съществува за {0} между датата {1} и {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Навигация
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Неизплатени фактури изискват преоценка на валутния курс
 DocType: Authorization Rule,Customer / Item Name,Име на клиент / артикул
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нов сериен номер не може да има склад. Складът трябва да бъде зададен чрез влизане в склад или с получаване на покупка
 DocType: Issue,Via Customer Portal,Чрез клиентски портал
 DocType: Work Order Operation,Planned Start Time,Планирано начално време
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} е {2}
+DocType: Service Level Priority,Service Level Priority,Приоритет на нивото на обслужване
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Броят на амортизациите не може да бъде по-голям от общия брой амортизации
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Споделете Ledger
 DocType: Journal Entry,Accounts Payable,Задължения по сметки
@@ -3724,7 +3763,6 @@
 DocType: Delivery Note,Delivery To,Доставка до
 DocType: Bank Statement Transaction Settings Item,Bank Data,Банкови данни
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Планирано Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Поддържане на разплащателни часове и работни часове Също и в разписанието
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Водене на трасе от водещ източник.
 DocType: Clinical Procedure,Nursing User,Потребител на сестрински грижи
 DocType: Support Settings,Response Key List,Списък с ключови отговори
@@ -3892,6 +3930,7 @@
 DocType: Work Order Operation,Actual Start Time,Действително начално време
 DocType: Antibiotic,Laboratory User,Потребител на лабораторията
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Онлайн търгове
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Приоритетът {0} е повторен.
 DocType: Fee Schedule,Fee Creation Status,Създаване на такса
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Софтуеъри
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Поръчка към плащане
@@ -3958,6 +3997,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Информацията за {0} не можа да бъде извлечена.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,"Валутата на фактуриране трябва да е равна или на валутата на фирмата по подразбиране, или на валутата на партидата на партията"
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,"Моля, въведете Id на служителя на този продавач"
+DocType: Shift Type,Early Exit Consequence after,Последващо след ранно излизане
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Създаване на отварящи фактури за продажби и покупки
 DocType: Disease,Treatment Period,Период на лечение
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Настройка на имейл
@@ -3975,7 +4015,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Име на ученика:
 DocType: SMS Log,Sent On,Изпратено на
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Фактура
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Времето за отговор не може да бъде по-голямо от времето за разрешаване
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За курсова група, курса ще бъде валидиран за всеки ученик от записаните курсове по участие в програмата."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Вътрешнодържавни доставки
 DocType: Employee,Create User Permission,Създаване на потребителско разрешение
@@ -4014,6 +4053,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Стандартни договорни условия за продажба или покупка.
 DocType: Sales Invoice,Customer PO Details,Подробности за клиентските PO
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пациентът не е намерен
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Изберете приоритет по подразбиране.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Премахнете елемента, ако таксите не са приложими за този елемент"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Съществува клиентска група със същото име, моля променете името на клиента или преименувайте групата клиенти"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4053,6 +4093,7 @@
 DocType: Support Settings,Support Portal,Портал за поддръжка
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Крайната дата на задачата <b>{0}</b> не може да бъде по-малка от <b>{1}</b> очакваната начална дата <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Служител {0} е напуснал на {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Това споразумение за ниво на услугата е специфично за клиента {0}
 DocType: Employee,Held On,Проведена на
 DocType: Healthcare Practitioner,Practitioner Schedules,Разписания на практикуващия
 DocType: Project Template Task,Begin On (Days),Начало на (дни)
@@ -4060,6 +4101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Работната поръчка е {0}
 DocType: Inpatient Record,Admission Schedule Date,Дата на приемане
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Корекция на стойността на активите
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Отбележете посещаемостта на базата на „Проверка на служителите“ за служителите, назначени за тази промяна."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Доставки за нерегистрирани лица
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Всички работни места
 DocType: Appointment Type,Appointment Type,Тип на срещата
@@ -4173,7 +4215,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тегло на опаковката. Обикновено нетно тегло + тегло на опаковъчния материал. (за печат)
 DocType: Plant Analysis,Laboratory Testing Datetime,Време за лабораторно изпитване
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Елементът {0} не може да има пакет
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Търговски тръбопровод по етап
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Сила на студентската група
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Въвеждане на транзакция в банковите извлечения
 DocType: Purchase Order,Get Items from Open Material Requests,Получаване на елементи от отворени заявки за материали
@@ -4255,7 +4296,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Покажи стареенето на склад
 DocType: Sales Invoice,Write Off Outstanding Amount,Напишете неизплатена сума
 DocType: Payroll Entry,Employee Details,Данни за служителя
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Началното време не може да бъде по-голямо от Крайно време за {0}.
 DocType: Pricing Rule,Discount Amount,Стойност на намалението
 DocType: Healthcare Service Unit Type,Item Details,Подробности за елемента
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Дублирана данъчна декларация на {0} за период {1}
@@ -4308,7 +4348,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Нетното възнаграждение не може да бъде отрицателно
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Брой на взаимодействията
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Ред {0} # Артикул {1} не може да бъде прехвърлен повече от {2} срещу Поръчка за покупка {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,изместване
+DocType: Attendance,Shift,изместване
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Обработка на сметки и страни
 DocType: Stock Settings,Convert Item Description to Clean HTML,Конвертиране на Описание на елемент в Чисто HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Всички групи доставчици
@@ -4379,6 +4419,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Отдел „Родителски услуги“
 DocType: Sales Invoice,Include Payment (POS),Включване на плащане (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Частен капитал
+DocType: Shift Type,First Check-in and Last Check-out,Първа регистрация и последно напускане
 DocType: Landed Cost Item,Receipt Document,Документ за получаване
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Период на оценка на доставчика
 DocType: Employee Grade,Default Salary Structure,Структура на заплатите по подразбиране
@@ -4461,6 +4502,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Създайте поръчка за доставка
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Определете бюджет за финансова година.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Таблицата на профилите не може да бъде празна.
+DocType: Employee Checkin,Entry Grace Period Consequence,Следствие на гратисен период за влизане
 ,Payment Period Based On Invoice Date,Период на плащане въз основа на датата на фактурата
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Датата на инсталиране не може да бъде преди датата на доставка за елемент {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Връзка към заявката за материал
@@ -4469,6 +4511,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: вече съществува запис за повторно подреждане за този склад {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Дата на документа
 DocType: Monthly Distribution,Distribution Name,Име на разпространението
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Работният ден {0} е повторен.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,"Група към група, която не е група"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Актуализация в процес на изпълнение. Може да отнеме известно време.
 DocType: Item,"Example: ABCD.#####
@@ -4481,6 +4524,7 @@
 DocType: Vehicle Log,Fuel Qty,Количество гориво
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Изплатени
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Време след края на смяната, по време на което се счита за посещение."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Нетна промяна в задълженията по сметки
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Не е наличен
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Непълен работен ден
@@ -4494,7 +4538,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Показване на PDC в печат
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify доставчик
 DocType: POS Profile User,POS Profile User,Потребителски профил на POS
-DocType: Student,Middle Name,Презиме
 DocType: Sales Person,Sales Person Name,Име на продавача
 DocType: Packing Slip,Gross Weight,Брутно тегло
 DocType: Journal Entry,Bill No,Законопроект №
@@ -4503,7 +4546,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-Vlog-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Споразумение за нивото на обслужване
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,"Моля, първо изберете Служител и Дата"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,"Коефициентът за оценка на позицията се преизчислява, като се има предвид стойността на ваучера за разход за земя"
 DocType: Timesheet,Employee Detail,Подробности за служителите
 DocType: Tally Migration,Vouchers,Ваучери
@@ -4538,7 +4580,7 @@
 DocType: Additional Salary,Date on which this component is applied,"Дата, на която се прилага този компонент"
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Списък на наличните акционери с номера на фолио
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Настройка на акаунти на шлюза.
-DocType: Service Level,Response Time Period,Период на реакция
+DocType: Service Level Priority,Response Time Period,Период на реакция
 DocType: Purchase Invoice,Purchase Taxes and Charges,Данъци и такси за покупка
 DocType: Course Activity,Activity Date,Дата на дейността
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Изберете или добавете нов клиент
@@ -4563,6 +4605,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Финансова година
 DocType: Sales Invoice Item,Deferred Revenue,Отложени приходи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Най-малко трябва да бъде избран един от Продажбите или Закупуването
+DocType: Shift Type,Working Hours Threshold for Half Day,Праг на работното време за половин ден
 ,Item-wise Purchase History,История на покупката
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Датата за спиране на услугата за ред в ред {0} не може да се промени
 DocType: Production Plan,Include Subcontracted Items,Включете подизпълнители
@@ -4595,6 +4638,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Разрешаване на един и същ елемент няколко пъти
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Създайте спецификация
 DocType: Healthcare Practitioner,Charges,Обвинения
+DocType: Employee,Attendance and Leave Details,Присъствие и детайл
 DocType: Student,Personal Details,Лични данни
 DocType: Sales Order,Billing and Delivery Status,Състояние на фактуриране и доставка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За доставчика {0} Имейл адресът се изисква за изпращане на имейл
@@ -4646,7 +4690,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Въведете стойност между {0} и {1}
 DocType: Purchase Order,Order Confirmation Date,Дата на потвърждение на поръчката
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Изчислете прогнозните времена на пристигане
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в човешките ресурси&gt; Настройки за човешки ресурси"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,консумативи
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Начална дата на абонамента
@@ -4669,7 +4712,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Сметка за влизане в дневника
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,вариант
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Дейност на форума
-DocType: Service Level,Resolution Time Period,Период на разделителна способност
+DocType: Service Level Priority,Resolution Time Period,Период на разделителна способност
 DocType: Request for Quotation,Supplier Detail,Детайли на доставчика
 DocType: Project Task,View Task,Преглед на задача
 DocType: Serial No,Purchase / Manufacture Details,Детайли за покупка / производство
@@ -4736,6 +4779,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складът може да се променя само чрез влизане / доставка на акции / разписка за покупка
 DocType: Support Settings,Close Issue After Days,Затваряне на проблема след дни
 DocType: Payment Schedule,Payment Schedule,Схема на плащане
+DocType: Shift Type,Enable Entry Grace Period,Активиране на гратисния период за влизане
 DocType: Patient Relation,Spouse,Съпруг
 DocType: Purchase Invoice,Reason For Putting On Hold,Причина за задържане
 DocType: Item Attribute,Increment,увеличение
@@ -4875,6 +4919,7 @@
 DocType: Vehicle Log,Invoice Ref,Фактура Реф
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-формулярът не е приложим за Фактура: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Създадена фактура
+DocType: Shift Type,Early Exit Grace Period,Предсрочен гратисен период
 DocType: Patient Encounter,Review Details,Подробности за прегледа
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Ред {0}: Стойността на часовете трябва да бъде по-голяма от нула.
 DocType: Account,Account Number,Номер на сметка
@@ -4886,7 +4931,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Приложимо, ако компанията е SpA, SApA или SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Намерени са припокриващи се условия между:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Платени и неизпратени
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Кодът на елемента е задължителен, защото елементът не е автоматично номериран"
 DocType: GST HSN Code,HSN Code,Код на HSN
 DocType: GSTR 3B Report,September,Септември
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Административни разходи
@@ -4922,6 +4966,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Сметка CWIP
 DocType: SMS Log,Sender Name,Име на подателя
 DocType: Pricing Rule,Supplier Group,Група доставчици
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Задайте Начален час и Краен час за Ден на поддръжката {0} в индекс {1}.
 DocType: Employee,Date of Issue,Дата на издаване
 ,Requested Items To Be Transferred,Искани елементи за прехвърляне
 DocType: Employee,Contract End Date,Крайна дата на договора
@@ -4932,6 +4978,7 @@
 DocType: Opportunity,Sales Stage,Етап на продажби
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Words ще се вижда след като запазите клиентската поръчка.
 DocType: Item Reorder,Re-order Level,Ниво на пренареждане
+DocType: Shift Type,Enable Auto Attendance,Активиране на автоматичното присъствие
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Предпочитание
 ,Department Analytics,Отдел Анализ
 DocType: Crop,Scientific Name,Научно наименование
@@ -4944,6 +4991,7 @@
 DocType: Quiz Activity,Quiz Activity,Дейност на теста
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} не е в валиден период на заплащане
 DocType: Timesheet,Billed,таксува
+apps/erpnext/erpnext/config/support.py,Issue Type.,Вид на проблема.
 DocType: Restaurant Order Entry,Last Sales Invoice,Последна фактура за продажби
 DocType: Payment Terms Template,Payment Terms,Условия за плащане
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Резервирано Количество: Поръчано за продажба, но не доставено."
@@ -5038,6 +5086,7 @@
 DocType: Account,Asset,Актив
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} не разполага с график за практикуващия лекар. Добавете го в капитана на лекаря
 DocType: Vehicle,Chassis No,Шаси №
+DocType: Employee,Default Shift,По подразбиране Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Съкращение на фирмата
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Дърво на материала
 DocType: Article,LMS User,LMS потребител
@@ -5086,6 +5135,7 @@
 DocType: Sales Person,Parent Sales Person,Лице за продажба на родители
 DocType: Student Group Creation Tool,Get Courses,Вземи курсове
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количеството трябва да е 1, тъй като елементът е фиксиран актив. Моля, използвайте отделен ред за няколко броя."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Работно време, под което Absent е отбелязано. (Нула за деактивиране)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,В транзакцията са позволени само листови възли
 DocType: Grant Application,Organization,организация
 DocType: Fee Category,Fee Category,Категория на таксата
@@ -5098,6 +5148,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,"Моля, актуализирайте състоянието си за това обучение"
 DocType: Volunteer,Morning,Сутрин
 DocType: Quotation Item,Quotation Item,Предмет на оферта
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Приоритет на издаване.
 DocType: Journal Entry,Credit Card Entry,Въвеждане на кредитна карта
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Времевият интервал е пропуснат, слотът {0} до {1} се припокрива с съществуващ слот {2} до {3}"
 DocType: Journal Entry Account,If Income or Expense,Ако доход или разход
@@ -5148,11 +5199,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Импортиране на данни и настройки
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Ако е избрано Автоматично включване, тогава клиентите автоматично ще бъдат свързани с съответната програма за лоялност (при запазване)"
 DocType: Account,Expense Account,Сметка за разходи
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Времето преди началото на смяната, по време на което се смята, че служителят се регистрира за присъствие."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Връзка с Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Създайте фактура
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Заявката за плащане вече съществува {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',"Служителят, освободен от {0}, трябва да бъде зададен като „Ляво“"
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Плащане {0} {1}
+DocType: Company,Sales Settings,Настройки за продажби
 DocType: Sales Order Item,Produced Quantity,Произведено количество
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,"Заявката за оферта може да бъде получена, като кликнете върху следната връзка"
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечната дистрибуция
@@ -5231,6 +5284,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Създават се шаблони за данъци по подразбиране за продажби и покупки.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Типът на напускане {0} не може да бъде прехвърлен
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Дебит За сметка трябва да бъде сметка за получаване
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Крайната дата на споразумението не може да бъде по-малка от днешната.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},"Моля, задайте профил в Warehouse {0} или профила по подразбиране за рекламните места в компанията {1}"
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Е активирана по подразбиране
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нетното тегло на този пакет. (изчислява се автоматично като сума от нетното тегло на елементите)
@@ -5257,8 +5311,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Изтеклите партиди
 DocType: Shipping Rule,Shipping Rule Type,Тип правило за доставка
 DocType: Job Offer,Accepted,Приемани
-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> , за да отмените този документ"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Вече сте оценили критериите за оценка {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Изберете Пакетни номера
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Възраст (дни)
@@ -5285,6 +5337,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Изберете домейните си
 DocType: Agriculture Task,Task Name,Име на задачата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Запазени записи вече създадени за работна поръчка
+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> , за да отмените този документ"
 ,Amount to Deliver,Сума за доставка
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Фирма {0} не съществува
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Не са намерени предстоящи заявки за материали, за да се свържат за дадените елементи."
@@ -5334,6 +5388,7 @@
 DocType: Lab Prescription,Test Code,Код за тестване
 DocType: Purchase Taxes and Charges,On Previous Row Total,На Общо предишен ред
 DocType: Student,Student Email Address,Имейл адрес на ученика
+,Delayed Item Report,Отложен доклад за позиция
 DocType: Academic Term,Education,образование
 DocType: Supplier Quotation,Supplier Address,Адрес на доставчика
 DocType: Salary Detail,Do not include in total,Не включвайте общо
@@ -5341,7 +5396,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} не съществува
 DocType: Purchase Receipt Item,Rejected Quantity,Отхвърлено количество
 DocType: Cashier Closing,To TIme,Към Времето
-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: Daily Work Summary Group User,Daily Work Summary Group User,Ежедневен потребител на групата с резюме на работата
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Алтернативният елемент не трябва да е същият като кода на артикула
@@ -5393,6 +5447,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Забавяне между спирането на доставката
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Замразяване на запаси, по-стари от [дни]"
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Промоционална продуктова отстъпка
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Вече съществува приоритет за издаване
 DocType: Account,Asset Received But Not Billed,"Полученият актив, но не таксуван"
 DocType: POS Closing Voucher,Total Collected Amount,Общо събрана сума
 DocType: Course,Default Grading Scale,Стандартна скала за оценяване
@@ -5435,6 +5490,7 @@
 DocType: Contract,Fulfilment Terms,Условия за изпълнение
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Без група в група
 DocType: Student Guardian,Mother,майка
+DocType: Issue,Service Level Agreement Fulfilled,Изпълнено е Споразумение за нивото на обслужване
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Приспадане на данък за неплатени обезщетения на служители
 DocType: Travel Request,Travel Funding,Финансиране на пътуванията
 DocType: Shipping Rule,Fixed,определен
@@ -5464,10 +5520,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Няма намерени елементи.
 DocType: Item Attribute,From Range,От обхват
 DocType: Clinical Procedure,Consumables,Консумативи
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&quot;employee_field_value&quot; и &quot;timestamp&quot; са задължителни.
 DocType: Purchase Taxes and Charges,Reference Row #,Референтен ред #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},"Моля, задайте „Център на разходите за амортизация на активите“ в Фирмата {0}"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Ред # {0}: Документът за плащане е необходим за завършване на транзакцията
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Кликнете върху този бутон, за да изтеглите данните си от поръчката за продажба от Amazon MWS."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Работно време, под което се отбелязва половин ден. (Нула за деактивиране)"
 ,Assessment Plan Status,Статус на плана за оценка
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,"Моля, първо изберете {0}"
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Изпратете това, за да създадете запис на служител"
@@ -5538,6 +5596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Задайте Отвори
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Превключване на филтрите
 DocType: Production Plan,Material Request Detail,Детайли за заявката на материала
+DocType: Shift Type,Process Attendance After,Присъствие на процеса след
 DocType: Material Request Item,Quantity and Warehouse,Количество и склад
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Отидете в Програми
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Ред # {0}: дублиран запис в препратки {1} {2}
@@ -5595,6 +5654,7 @@
 DocType: Pricing Rule,Party Information,Информация за парти
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Длъжници ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Към днешна дата не може да бъде по-голяма от датата на освобождаване на служителя
+DocType: Shift Type,Enable Exit Grace Period,Активиране на изходния гратисен период
 DocType: Expense Claim,Employees Email Id,Идент. № на служителите
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Актуализиране на цената от Shopify To ERPNext ценова листа
 DocType: Healthcare Settings,Default Medical Code Standard,Стандарт за стандартния медицински код
@@ -5625,7 +5685,6 @@
 DocType: Budget,Applicable on Material Request,Прилага се при заявка за материал
 DocType: Support Settings,Search APIs,API за търсене
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Процент на свръхпроизводство за клиентска поръчка
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Спецификации
 DocType: Purchase Invoice,Supplied Items,Доставяни артикули
 DocType: Leave Control Panel,Select Employees,Изберете Служители
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Изберете сметка за доход от лихви в заем {0}
@@ -5651,7 +5710,7 @@
 ,Supplier-Wise Sales Analytics,Анализ на продажбите в зависимост от доставчика
 DocType: GSTR 3B Report,February,февруари
 DocType: Appraisal,For Employee,За служител
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Действителна дата на доставка
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Действителна дата на доставка
 DocType: Sales Partner,Sales Partner Name,Име на търговски партньор
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Амортизационен ред {0}: Началната дата на амортизацията се въвежда като крайна дата
 DocType: GST HSN Code,Regional,областен
@@ -5690,6 +5749,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Карта за оценка на доставчика
 DocType: Travel Itinerary,Travel To,Пътувам до
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Марк Присъствие
+DocType: Shift Type,Determine Check-in and Check-out,Определете настаняването и напускането
 DocType: POS Closing Voucher,Difference,разлика
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,малък
 DocType: Work Order Item,Work Order Item,Елемент на работна поръчка
@@ -5723,6 +5783,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Лекарство
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} е затворен
 DocType: Patient,Medical History,Медицинска история
+DocType: Expense Claim,Expense Taxes and Charges,Разходи и такси
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Брой дни след изтичане на датата на фактуриране преди отмяна на абонамента за абонамент или като неплатено
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Бележка за инсталиране {0} вече е изпратена
 DocType: Patient Relation,Family,семейство
@@ -5755,7 +5816,6 @@
 DocType: Dosage Strength,Strength,сила
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,"В {2} са необходими {0} единици от {1}, за да завършите тази транзакция."
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Сурови материали за подфункции въз основа на
-DocType: Bank Guarantee,Customer,клиент
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ако е разрешено, полето Academic Term ще бъде задължително в инструмента за записване в програмата."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","За студентска група, базирана на партиди, студентската партида ще бъде валидирана за всеки ученик от програмата за записване."
 DocType: Course,Topics,Теми
@@ -5835,6 +5895,7 @@
 DocType: Chapter,Chapter Members,Членове на глава
 DocType: Warranty Claim,Service Address,Адрес на услугата
 DocType: Journal Entry,Remark,Забележка
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: количеството не е налично за {4} в склада {1} в момента на публикуване на записа ({2} {3})
 DocType: Patient Encounter,Encounter Time,Време за среща
 DocType: Serial No,Invoice Details,Подробности за фактурата
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни профили могат да се правят в Групи, но записите могат да се правят срещу не-Групи"
@@ -5915,6 +5976,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Затваряне (отваряне + общо)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Формула на критериите
 apps/erpnext/erpnext/config/support.py,Support Analytics,Поддръжка на Google Анализ
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Идентификационен номер на устройството за присъствие (биометричен / RF идентификатор)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Преглед и действие
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразена, записите са разрешени за ограничени потребители."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Сума след амортизация
@@ -5936,6 +5998,7 @@
 DocType: Salary Slip,Loan Repayment,Погасяване на кредита
 DocType: Employee Education,Major/Optional Subjects,Основни / незадължителни теми
 DocType: Soil Texture,Silt,тиня
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Адреси и контакти на доставчика
 DocType: Bank Guarantee,Bank Guarantee Type,Тип банкова гаранция
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако е забранено, полето &quot;Закръглено общо&quot; няма да се вижда при никаква транзакция"
 DocType: Pricing Rule,Min Amt,Мин Амт
@@ -5974,6 +6037,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Откриване на елемент за създаване на фактура
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Включване на POS транзакции
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Не е намерен служител за дадената стойност на полето на служителя. &quot;{}&quot;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Получена сума (валута на фирмата)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage е пълен, не спаси"
 DocType: Chapter Member,Chapter Member,Член на глава
@@ -6006,6 +6070,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Не са създадени Студентски групи.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Дублира се ред {0} със същия {1}
 DocType: Employee,Salary Details,Подробности за заплатите
+DocType: Employee Checkin,Exit Grace Period Consequence,Изход от следствие на грациозния период
 DocType: Bank Statement Transaction Invoice Item,Invoice,фактура
 DocType: Special Test Items,Particulars,подробности
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,"Моля, задайте филтър въз основа на елемент или склад"
@@ -6107,6 +6172,7 @@
 DocType: Serial No,Out of AMC,Извън AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Професионален профил, необходима квалификация и др."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Корабно състояние
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Искате ли да подадете заявката за материал
 DocType: Opportunity Item,Basic Rate,Основен курс
 DocType: Compensatory Leave Request,Work End Date,Крайна дата на работа
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Заявка за суровини
@@ -6292,6 +6358,7 @@
 DocType: Sales Order Item,Gross Profit,Брутна печалба
 DocType: Quality Inspection,Item Serial No,Елемент Сериен №
 DocType: Asset,Insurer,застраховател
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Сума за покупка
 DocType: Asset Maintenance Task,Certificate Required,Изисква се сертификат
 DocType: Retention Bonus,Retention Bonus,Бонус за задържане
@@ -6407,6 +6474,8 @@
 DocType: Invoice Discounting,Sanctioned,санкционирана
 DocType: Course Enrollment,Course Enrollment,Записване на курса
 DocType: Item,Supplier Items,Артикули на доставчика
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Началното време не може да бъде по-голямо или равно на Крайно време за {0}.
 DocType: Sales Order,Not Applicable,Не е приложимо
 DocType: Support Search Source,Response Options,Опции за отговор
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} трябва да бъде стойност между 0 и 100
@@ -6493,7 +6562,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Фиксирани активи
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Общо приходи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 DocType: Share Balance,From No,От Не
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Фактура за съгласуване на плащанията
 DocType: Purchase Invoice,Taxes and Charges Added,Добавени са данъци и такси
@@ -6601,6 +6669,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Игнориране на ценообразуването
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Храна
 DocType: Lost Reason Detail,Lost Reason Detail,Подробности за изгубени причини
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Бяха създадени следните серийни номера: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Обратна връзка от клиента
 DocType: Serial No,Warranty / AMC Details,Подробности за гаранцията / AMC
 DocType: Issue,Opening Time,Време на отваряне
@@ -6650,6 +6719,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Името на фирмата не е същото
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Промоцията за служители не може да бъде подадена преди датата на промоцията
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Не е разрешено да се актуализират стоковите транзакции, по-стари от {0}"
+DocType: Employee Checkin,Employee Checkin,Служебна проверка
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Началната дата трябва да е по-малка от крайната дата за елемент {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Създайте котировки на клиенти
 DocType: Buying Settings,Buying Settings,Настройки за покупка
@@ -6671,6 +6741,7 @@
 DocType: Patient,Patient Demographics,Демография на пациента
 DocType: Share Transfer,To Folio No,Към Фолио No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Паричен поток от операции
+DocType: Employee Checkin,Log Type,Тип на регистъра
 DocType: Stock Settings,Allow Negative Stock,Разрешаване на отрицателен запас
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Нито една от позициите няма промяна в количеството или стойността.
 DocType: Asset,Purchase Date,Дата на закупуване
@@ -6715,6 +6786,7 @@
 DocType: Vital Signs,Very Hyper,Много хипер
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Изберете естеството на бизнеса си.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,"Моля, изберете месец и година"
+DocType: Service Level,Default Priority,Приоритет по подразбиране
 DocType: Student Log,Student Log,Студентски дневник
 DocType: Shopping Cart Settings,Enable Checkout,Активиране на Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Човешки ресурси
@@ -6743,7 +6815,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Свържете Shopify с ERPNext
 DocType: Homepage Section Card,Subtitle,подзаглавие
 DocType: Soil Texture,Loam,глинеста почва
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: BOM,Scrap Material Cost(Company Currency),Цена на материал за скрап (валута на фирмата)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Бележка за доставка {0} не трябва да се изпраща
 DocType: Task,Actual Start Date (via Time Sheet),Действителна начална дата (чрез лист с данни)
@@ -6799,6 +6870,7 @@
 DocType: Drug Prescription,Dosage,дозиране
 DocType: Cheque Print Template,Starting position from top edge,Начална позиция от горния край
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Продължителност на срещата (мин.)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Този служител вече има регистър със същата дата. {0}
 DocType: Accounting Dimension,Disable,правя неспособен
 DocType: Email Digest,Purchase Orders to Receive,Поръчки за покупка за получаване
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Поръчки за продукти не могат да бъдат повдигнати за:
@@ -6814,7 +6886,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Прехвърлен материал за подизпълнение
 DocType: Job Card,Timing Detail,Подробности за времето
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Задължително включено
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Импортиране на {0} от {1}
 DocType: Job Offer Term,Job Offer Term,Срок на предложението за работа
 DocType: SMS Center,All Contact,Всички контакти
 DocType: Project Task,Project Task,Задача на проекта
@@ -6865,7 +6936,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Елемент {0} не е настроен за Серийни номера
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,От държавата
 DocType: Leave Type,Maximum Continuous Days Applicable,Приложими максимални продължителни дни
-apps/erpnext/erpnext/config/support.py,Support Team.,Подкрепящ отбор.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,"Моля, първо въведете име на фирма"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Импортиране е успешно
 DocType: Guardian,Alternate Number,Алтернативен номер
@@ -6957,6 +7027,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Ред # {0}: Елементът е добавен
 DocType: Student Admission,Eligibility and Details,Допустимост и подробности
 DocType: Staffing Plan,Staffing Plan Detail,Подробности за плана за персонала
+DocType: Shift Type,Late Entry Grace Period,Оттегляне на гратисен период
 DocType: Email Digest,Annual Income,Годишен доход
 DocType: Journal Entry,Subscription Section,Секция Абонамент
 DocType: Salary Slip,Payment Days,Дни на плащане
@@ -7007,6 +7078,7 @@
 DocType: Journal Entry Account,Account Balance,Салдо по сметка
 DocType: Asset Maintenance Log,Periodicity,периодичност
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Медицинска документация
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,"Типът на регистрационния файл се изисква за регистриране, което пада в смяна: {0}."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Екзекуция
 DocType: Item,Valuation Method,Метод за оценка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} срещу фактура за продажби {1}
@@ -7091,6 +7163,7 @@
 DocType: Loan Type,Loan Name,Име на заема
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Задайте стандартния начин на плащане
 DocType: Quality Goal,Revision,ревизия
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Времето преди края на смяната, когато проверката се счита за ранна (в минути)."
 DocType: Healthcare Service Unit,Service Unit Type,Тип единица за обслужване
 DocType: Purchase Invoice,Return Against Purchase Invoice,Връщане срещу фактура за покупка
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Генериране на тайна
@@ -7246,12 +7319,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Козметични продукти
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Поставете отметка, ако искате да принудите потребителя да избере серия, преди да запази. Няма да има по подразбиране, ако проверите това."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,На потребителите с тази роля е разрешено да задават замразени сметки и да създават / променят счетоводни записи срещу замразени сметки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група продукти&gt; Марка
 DocType: Expense Claim,Total Claimed Amount,Обща заявена сума
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери времевото каре в следващите {0} дни за операция {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Обобщавайки
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Можете да го подновите, само ако членството ви изтече в рамките на 30 дни"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Стойността трябва да е между {0} и {1}
 DocType: Quality Feedback,Parameters,Параметри
+DocType: Shift Type,Auto Attendance Settings,Настройки за автоматично посещение
 ,Sales Partner Transaction Summary,Резюме на транзакциите на търговски партньори
 DocType: Asset Maintenance,Maintenance Manager Name,Име на мениджъра за поддръжка
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Необходимо е да изтеглите Детайли на елемента.
@@ -7343,10 +7418,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Проверка на приложеното правило
 DocType: Job Card Item,Job Card Item,Позиция на служебната карта
 DocType: Homepage,Company Tagline for website homepage,Фирмен надпис за начална страница на уебсайта
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Задайте Време за отговор и Разделителна способност за Приоритет {0} в индекс {1}.
 DocType: Company,Round Off Cost Center,Център за закръглени разходи
 DocType: Supplier Scorecard Criteria,Criteria Weight,Тегло на критериите
 DocType: Asset,Depreciation Schedules,Амортизационни разписания
-DocType: Expense Claim Detail,Claim Amount,Сума на иска
 DocType: Subscription,Discounts,Отстъпки
 DocType: Shipping Rule,Shipping Rule Conditions,Условия за правилата за изпращане
 DocType: Subscription,Cancelation Date,Дата на анулиране
@@ -7374,7 +7449,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Показване на нулеви стойности
 DocType: Employee Onboarding,Employee Onboarding,Служител на борда
 DocType: POS Closing Voucher,Period End Date,Дата на приключване на периода
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Възможности за продажба от Източник
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Първият одобрител на напускане в списъка ще бъде зададен като подразбиращо се одобрение за отпуск.
 DocType: POS Settings,POS Settings,POS настройки
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Всички профили
@@ -7395,7 +7469,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Скоростта трябва да бъде същата като {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Позиции за здравни услуги
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,не са намерени записи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Диапазон на стареене 3
 DocType: Vital Signs,Blood Pressure,Кръвно налягане
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Насочване на
@@ -7442,6 +7515,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Партиди
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,отбрана
 DocType: Item,Has Batch No,Има партида №
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Забавени дни
 DocType: Lead,Person Name,Име на човека
 DocType: Item Variant,Item Variant,Вариант на позицията
 DocType: Training Event Employee,Invited,Поканени
@@ -7463,7 +7537,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Началната и крайната дата, които не са в валиден период на заплащане, не могат да изчислят {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Показвайте само клиенти на тези групи клиенти
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,"Изберете елементи, за да запазите фактурата"
-DocType: Service Level,Resolution Time,Време на разделителна способност
+DocType: Service Level Priority,Resolution Time,Време на разделителна способност
 DocType: Grading Scale Interval,Grade Description,Описание на класа
 DocType: Homepage Section,Cards,карти
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Протокол за качество на срещата
@@ -7490,6 +7564,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Баланс по банкова сметка съгласно Главна книга
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Здравеопазване (бета)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,"По подразбиране, за да създадете поръчка за продажби и бележка за доставка"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Времето за отговор за {0} при индекс {1} не може да бъде по-голямо от Времето за разрешаване.
 DocType: Opportunity,Customer / Lead Name,Потребителско / водещо име
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Непоискана сума
@@ -7536,7 +7611,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Внасящи страни и адреси
 DocType: Item,List this Item in multiple groups on the website.,Избройте този елемент в няколко групи на уебсайта.
 DocType: Request for Quotation,Message for Supplier,Съобщение за доставчика
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"Не може да се промени {0}, тъй като съществува стокова транзакция за елемент {1}."
 DocType: Healthcare Practitioner,Phone (R),Телефон (R)
 DocType: Maintenance Team Member,Team Member,Член на екипа
 DocType: Asset Category Account,Asset Category Account,Акаунт за категория активи
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 8836a86..7213a04 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,নিয়োগ {0} এবং বিক্রয় চালান {1} বাতিল
 DocType: Purchase Receipt,Vehicle Number,যানবাহন নম্বর
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,আপনার ইমেইল ঠিকানা...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,ডিফল্ট বুক এন্ট্রি অন্তর্ভুক্ত করুন
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,ডিফল্ট বুক এন্ট্রি অন্তর্ভুক্ত করুন
 DocType: Activity Cost,Activity Type,কার্যকলাপ টাইপ
 DocType: Purchase Invoice,Get Advances Paid,অগ্রিম অর্থ প্রদান করুন
 DocType: Company,Gain/Loss Account on Asset Disposal,সম্পদ নিষ্পত্তি নিষ্পত্তি / লাভ অ্যাকাউন্ট
@@ -222,7 +222,9 @@
 DocType: Bank Reconciliation,Payment Entries,পেমেন্ট এন্ট্রি
 DocType: Employee Education,Class / Percentage,ক্লাস / শতাংশ
 ,Electronic Invoice Register,বৈদ্যুতিন চালান নিবন্ধন
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,ঘটনার সংখ্যা যার ফলে ফলাফল কার্যকর করা হয়।
 DocType: Sales Invoice,Is Return (Credit Note),রিটার্ন (ক্রেডিট নোট)
+DocType: Price List,Price Not UOM Dependent,দাম UOM নির্ভরশীল নয়
 DocType: Lab Test Sample,Lab Test Sample,ল্যাব টেস্ট নমুনা
 DocType: Shopify Settings,status html,অবস্থা এইচটিএমএল
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","উদাহরণস্বরূপ 2012, 2012-13"
@@ -324,6 +326,7 @@
 DocType: Salary Slip,Net Pay,নেট বেতন
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,মোট চালান এমটি
 DocType: Clinical Procedure,Consumables Invoice Separately,Consumables চালান পৃথকভাবে
+DocType: Shift Type,Working Hours Threshold for Absent,অনুপস্থিত জন্য কাজের ঘন্টা থ্রেশহোল্ড
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM।
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},গ্রুপ অ্যাকাউন্টের বিরুদ্ধে বাজেট বরাদ্দ করা যাবে না {0}
 DocType: Purchase Receipt Item,Rate and Amount,হার এবং পরিমাণ
@@ -379,7 +382,6 @@
 DocType: Healthcare Settings,Out Patient Settings,আউট রোগীর সেটিংস
 DocType: Asset,Insurance End Date,বীমা শেষ তারিখ
 DocType: Bank Account,Branch Code,শাখা কোড
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,প্রতিক্রিয়া সময়
 apps/erpnext/erpnext/public/js/conf.js,User Forum,ব্যবহারকারী ফোরাম
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ডেড খরচ আইটেম
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,বিক্রেতা এবং ক্রেতা একই হতে পারে না
@@ -596,6 +598,7 @@
 DocType: Share Transfer,Transfer,হস্তান্তর
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),আইটেম অনুসন্ধান করুন (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} ফলাফল জমা দেওয়া
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,তারিখ থেকে তারিখের চেয়ে বেশি হতে পারে না
 DocType: Supplier,Supplier of Goods or Services.,পণ্য বা সেবা সরবরাহকারী।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,নতুন অ্যাকাউন্টের নাম। নোট: গ্রাহক এবং সরবরাহকারীদের জন্য অ্যাকাউন্ট তৈরি করবেন না দয়া করে
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,ছাত্র গ্রুপ বা কোর্স সময়সূচী বাধ্যতামূলক
@@ -880,7 +883,6 @@
 DocType: Skill,Skill Name,দক্ষতা নাম
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,মুদ্রণ রিপোর্ট কার্ড
 DocType: Soil Texture,Ternary Plot,টার্নারি প্লট
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,সমর্থন টিকেট
 DocType: Asset Category Account,Fixed Asset Account,স্থায়ী সম্পদ অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,সর্বশেষ
@@ -893,6 +895,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,ব্যালেন্স শীট জন্য বাধ্যতামূলক
 DocType: Payment Entry,Total Allocated Amount,মোট বরাদ্দ পরিমাণ
 DocType: Sales Invoice,Get Advances Received,অগ্রিম প্রাপ্তি পান
+DocType: Shift Type,Last Sync of Checkin,চেকিন এর সর্বশেষ সিঙ্ক
 DocType: Student,B-,বি-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,আইটেম ট্যাক্স পরিমাণ মূল্য অন্তর্ভুক্ত
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -901,7 +904,9 @@
 DocType: Student,Blood Group,রক্তের গ্রুপ
 apps/erpnext/erpnext/config/healthcare.py,Masters,মাস্টার্স
 DocType: Crop,Crop Spacing UOM,ক্রপ স্পেসিং UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,শিফট শুরু হওয়ার সময় পরে চেক-ইন দেরী (মিনিটের মধ্যে) হিসাবে বিবেচিত হয়।
 apps/erpnext/erpnext/templates/pages/home.html,Explore,অন্বেষণ করা
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,কোন অসামান্য চালান পাওয়া যায় নি
 DocType: Promotional Scheme,Product Discount Slabs,পণ্য ডিসকাউন্ট স্ল্যাব
 DocType: Hotel Room Package,Amenities,সুযোগ-সুবিধা
 DocType: Lab Test Groups,Add Test,পরীক্ষা যোগ করুন
@@ -1000,6 +1005,7 @@
 DocType: Item,Moving Average,চলন্ত গড়
 DocType: Employee Attendance Tool,Unmarked Attendance,অচিহ্নিত উপস্থিতি
 DocType: Homepage Section,Number of Columns,কলামের সংখ্যা
+DocType: Issue Priority,Issue Priority,ইস্যু অগ্রাধিকার
 DocType: Holiday List,Add Weekly Holidays,সাপ্তাহিক ছুটির দিন যোগ করুন
 DocType: Shopify Log,Shopify Log,Shopify লগ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,বেতন স্লিপ তৈরি করুন
@@ -1008,6 +1014,7 @@
 DocType: Warranty Claim,Issue Date,প্রদানের তারিখ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,আইটেম {0} জন্য একটি ব্যাচ নির্বাচন করুন। এই প্রয়োজন পূরণ করে যে একটি একক ব্যাচ খুঁজে পেতে অক্ষম
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,বাম কর্মচারীদের জন্য retention বোনাস তৈরি করতে পারবেন না
+DocType: Employee Checkin,Location / Device ID,অবস্থান / ডিভাইস আইডি
 DocType: Purchase Order,To Receive,গ্রহণ করতে
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে আছেন। আপনি নেটওয়ার্ক আছে না হওয়া পর্যন্ত আপনি পুনরায় লোড করতে সক্ষম হবে না।
 DocType: Course Activity,Enrollment,নিয়োগ
@@ -1016,7 +1023,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},সর্বোচ্চ: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ই চালান তথ্য অনুপস্থিত
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,কোন উপাদান অনুরোধ তৈরি
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Loan,Total Amount Paid,প্রদত্ত মোট পরিমাণ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,এই সব আইটেম ইতিমধ্যে চালিত হয়েছে
 DocType: Training Event,Trainer Name,প্রশিক্ষক নাম
@@ -1127,6 +1133,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},লিড মধ্যে লিড নাম উল্লেখ করুন {0}
 DocType: Employee,You can enter any date manually,আপনি নিজে কোন তারিখ প্রবেশ করতে পারেন
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,স্টক পুনর্মিলন আইটেম
+DocType: Shift Type,Early Exit Consequence,প্রারম্ভিক প্রস্থান ফলাফল
 DocType: Item Group,General Settings,সাধারণ সেটিংস
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,দরুন তারিখ পোস্টিং / সরবরাহকারী চালান তারিখের আগে হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,জমা দেওয়ার আগে লাভবানকারীর নাম লিখুন।
@@ -1164,6 +1171,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,বিল প্রদানের সত্ততা
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},সি-ফর্ম {1} থেকে এই চালানটি {0} সরিয়ে দিন।
+DocType: Shift Type,Every Valid Check-in and Check-out,প্রতিটি বৈধ চেক ইন এবং চেক আউট
 DocType: Support Search Source,Query Route String,প্রশ্ন রুট স্ট্রিং
 DocType: Customer Feedback Template,Customer Feedback Template,গ্রাহক প্রতিক্রিয়া টেমপ্লেট
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Leads বা গ্রাহকদের কোট।
@@ -1198,6 +1206,7 @@
 DocType: Authorization Control,Authorization Control,অনুমোদন নিয়ন্ত্রণ
 ,Daily Work Summary Replies,দৈনিক কাজ সারাংশ উত্তর
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},আপনি প্রকল্পে সহযোগিতা করার জন্য আমন্ত্রিত হয়েছেন: {0}
+DocType: Issue,Response By Variance,বৈকল্পিক দ্বারা প্রতিক্রিয়া
 DocType: Item,Sales Details,বিক্রয় বিবরণ
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,মুদ্রণ টেমপ্লেট জন্য পত্র শিরোনাম।
 DocType: Salary Detail,Tax on additional salary,অতিরিক্ত বেতন ট্যাক্স
@@ -1321,6 +1330,7 @@
 DocType: Project,Task Progress,কাজ অগ্রগতি
 DocType: Journal Entry,Opening Entry,এন্ট্রি খোলা
 DocType: Bank Guarantee,Charges Incurred,চার্জ জড়িত
+DocType: Shift Type,Working Hours Calculation Based On,কাজ ঘন্টা গণনা উপর ভিত্তি করে
 DocType: Work Order,Material Transferred for Manufacturing,উপাদান উত্পাদন জন্য স্থানান্তর
 DocType: Products Settings,Hide Variants,ভেরিয়েন্ট লুকান
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ক্যাপাসিটি পরিকল্পনা এবং সময় ট্র্যাকিং নিষ্ক্রিয় করুন
@@ -1350,6 +1360,7 @@
 DocType: Guardian,Interests,রুচি
 DocType: Purchase Receipt Item Supplied,Consumed Qty,খাওয়া Qty
 DocType: Education Settings,Education Manager,শিক্ষা ব্যবস্থাপক মো
+DocType: Employee Checkin,Shift Actual Start,Shift প্রকৃত শুরু
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ওয়ার্কস্টেশন কাজের ঘন্টা বাইরে প্ল্যান সময় লগ।
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},আনুগত্য পয়েন্ট: {0}
 DocType: Healthcare Settings,Registration Message,নিবন্ধন বার্তা
@@ -1374,9 +1385,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,চালান সব বিলিং ঘন্টা জন্য ইতিমধ্যে তৈরি
 DocType: Sales Partner,Contact Desc,যোগাযোগ Desc
 DocType: Purchase Invoice,Pricing Rules,মূল্য নিয়ম
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",আইটেম {0} এর বিরুদ্ধে বিদ্যমান লেনদেন হিসাবে আপনি {1} মান পরিবর্তন করতে পারবেন না
 DocType: Hub Tracked Item,Image List,চিত্র তালিকা
 DocType: Item Variant Settings,Allow Rename Attribute Value,বৈশিষ্ট্য মূল্য পুনঃনামকরণ অনুমতি দিন
-DocType: Price List,Price Not UOM Dependant,দাম UOM নির্ভরশীল নয়
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),সময় (মিনিটের মধ্যে)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,মৌলিক
 DocType: Loan,Interest Income Account,সুদের আয় হিসাব
@@ -1386,6 +1397,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,পিওএস প্রোফাইল নির্বাচন করুন
 DocType: Support Settings,Get Latest Query,সর্বশেষ প্রশ্ন পান
 DocType: Employee Incentive,Employee Incentive,কর্মচারী উদ্দীপক
+DocType: Service Level,Priorities,অগ্রাধিকার
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,হোমপেজে কার্ড বা কাস্টম বিভাগ যোগ করুন
 DocType: Homepage,Hero Section Based On,উপর ভিত্তি করে হিরো বিভাগ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (চালান ক্রয় মাধ্যমে)
@@ -1446,7 +1458,7 @@
 DocType: Blanket Order Item,Ordered Quantity,আদেশ পরিমাণ
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: প্রত্যাখ্যাত ওয়্যারহাউস প্রত্যাখ্যাত আইটেমের বিরুদ্ধে বাধ্যতামূলক {1}
 ,Received Items To Be Billed,বিল পরিশোধ করা আইটেম পেয়েছি
-DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
+DocType: Attendance,Working Hours,কর্মঘন্টা
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,পরিশোধের মাধ্যম
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,ক্রয় আদেশ আইটেম সময় প্রাপ্ত না
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,দিন সময়কাল
@@ -1566,7 +1578,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারী সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
 DocType: Item Default,Default Selling Cost Center,ডিফল্ট বিক্রয় খরচ কেন্দ্র
 DocType: Sales Partner,Address & Contacts,ঠিকানা এবং পরিচিতি
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,সেটআপের মাধ্যমে উপস্থিতি জন্য সংখ্যায়ন সিরিজ সেটআপ করুন&gt; সংখ্যায়ন সিরিজ
 DocType: Subscriber,Subscriber,গ্রাহক
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ফর্ম / আইটেম / {0}) স্টক আউট হয়
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,প্রথমে পোস্টিং তারিখ নির্বাচন করুন
@@ -1577,7 +1588,7 @@
 DocType: Detected Disease,Tasks Created,কাজ তৈরি করা হয়েছে
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা এর টেমপ্লেটটির জন্য সক্রিয় থাকা আবশ্যক
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,কমিশন হার %
-DocType: Service Level,Response Time,প্রতিক্রিয়া সময়
+DocType: Service Level Priority,Response Time,প্রতিক্রিয়া সময়
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce সেটিংস
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,পরিমাণ ইতিবাচক হতে হবে
 DocType: Contract,CRM,সিআরএম
@@ -1594,7 +1605,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,লেনদেন ডেটা ম্যাপিং
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,লিডের জন্য একজন ব্যক্তির নাম বা সংস্থার নাম প্রয়োজন
 DocType: Student,Guardians,অভিভাবকরা
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষা সেটিংসে নির্দেশক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ব্র্যান্ড নির্বাচন করুন ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,মধ্য আয়
 DocType: Shipping Rule,Calculate Based On,উপর ভিত্তি করে গণনা
@@ -1631,6 +1641,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},ছাত্রের বিরুদ্ধে উপস্থিতি {0} বিদ্যমান {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,লেনদেন তারিখ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,সাবস্ক্রিপশন বাতিল করুন
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,পরিষেবা স্তর চুক্তি সেট করা যায়নি {0}।
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,নেট বেতন পরিমাণ
 DocType: Account,Liability,দায়
 DocType: Employee,Bank A/C No.,ব্যাংক এ / সি নং।
@@ -1696,7 +1707,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,কাঁচা মাল আইটেম কোড
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,ক্রয় চালান {0} ইতিমধ্যে জমা দেওয়া হয়েছে
 DocType: Fees,Student Email,ছাত্র ইমেইল
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM পুনর্বিবেচনা: {0} পিতামাতার বা সন্তানের হতে পারে না {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,স্বাস্থ্যসেবা সেবা থেকে আইটেম পান
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,স্টক এন্ট্রি {0} জমা দেওয়া হয় না
 DocType: Item Attribute Value,Item Attribute Value,আইটেম বৈশিষ্ট্য মূল্য
@@ -1721,7 +1731,6 @@
 DocType: Production Plan,Select Items to Manufacture,উত্পাদন আইটেম নির্বাচন করুন
 DocType: Leave Application,Leave Approver Name,Approver নাম ছেড়ে দিন
 DocType: Shareholder,Shareholder,ভাগীদার
-DocType: Issue,Agreement Status,চুক্তি স্থিতি
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,লেনদেন বিক্রি করার জন্য ডিফল্ট সেটিংস।
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,প্রদত্ত ছাত্র আবেদনকারীদের জন্য বাধ্যতামূলক যা ছাত্র ভর্তি নির্বাচন করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM নির্বাচন করুন
@@ -1984,6 +1993,7 @@
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,সব গুদাম
 DocType: Contract,Signee Details,সাইনি বিস্তারিত
+DocType: Shift Type,Allow check-out after shift end time (in minutes),শিফট শেষ সময় (মিনিটের মধ্যে) চেক-আউট করার অনুমতি দিন
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,আসাদন
 DocType: Item Group,Check this if you want to show in website,আপনি ওয়েবসাইট প্রদর্শন করতে চান তাহলে এই চেক করুন
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,রাজস্ব বছর {0} পাওয়া যায় নি
@@ -2050,6 +2060,7 @@
 DocType: Activity Cost,Billing Rate,বিলিং রেট
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},সতর্কতা: আরেকটি {0} # {1} স্টক এন্ট্রিয়ের বিরুদ্ধে বিদ্যমান {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,অনুমান করুন এবং রাস্তা অনুকূলিত করার জন্য Google মানচিত্র সেটিংস সক্ষম করুন
+DocType: Purchase Invoice Item,Page Break,পৃষ্ঠা বিরতি
 DocType: Supplier Scorecard Criteria,Max Score,সর্বোচ্চ স্কোর
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,পরিশোধের তারিখ শুরু হওয়ার তারিখের আগে হতে পারে না।
 DocType: Support Search Source,Support Search Source,সাপোর্ট অনুসন্ধান উত্স
@@ -2117,6 +2128,7 @@
 DocType: Employee Transfer,Employee Transfer,কর্মচারী স্থানান্তর
 ,Sales Funnel,বিক্রয় ফানেল
 DocType: Agriculture Analysis Criteria,Water Analysis,জল বিশ্লেষণ
+DocType: Shift Type,Begin check-in before shift start time (in minutes),শিফট শুরু সময় (মিনিটের মধ্যে) আগে চেক-ইন শুরু করুন
 DocType: Accounts Settings,Accounts Frozen Upto,অ্যাকাউন্ট জাগ্রত
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,সম্পাদনা করার কিছুই নেই।
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ওয়ার্কস্টেশন {1} এর যে কোনও কার্যকরী ঘন্টা অপেক্ষা অপারেশন {0}, অপারেশনটি একাধিক ক্রিয়াকলাপগুলিতে ভেঙ্গে ফেলে"
@@ -2130,7 +2142,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),পেমেন্ট বিলম্বিত (দিন)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,অবচয় বিবরণ লিখুন
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,গ্রাহক পিও
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,প্রত্যাশিত ডেলিভারির তারিখ সেলস অর্ডার তারিখের পরে হওয়া উচিত
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,আইটেম পরিমাণ শূন্য হতে পারে না
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,অবৈধ বৈশিষ্ট্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},আইটেমের বিরুদ্ধে BOM নির্বাচন করুন {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,চালান প্রকার
@@ -2140,6 +2154,7 @@
 DocType: Volunteer,Afternoon,বিকেল
 DocType: Vital Signs,Nutrition Values,পুষ্টি মূল্য
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),জ্বরের উপস্থিতি (তাপমাত্রা&gt; 38.5 ডিগ্রি সেলসিয়াস / 101.3 ডিগ্রি ফারেনহাইট বা স্থায়ী তাপমাত্রা&gt; 38 ডিগ্রি সেলসিয়াস / 100.4 ডিগ্রি ফারেনহাইট)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংস মধ্যে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,আইটিসি বিপরীত
 DocType: Project,Collect Progress,অগ্রগতি সংগ্রহ করুন
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,শক্তি
@@ -2190,6 +2205,7 @@
 ,Ordered Items To Be Billed,অর্ডার করা আইটেম বিল করা হবে
 DocType: Taxable Salary Slab,To Amount,মূল্যে
 DocType: Purchase Invoice,Is Return (Debit Note),রিটার্ন (ডেবিট নোট)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; অঞ্চল
 apps/erpnext/erpnext/config/desktop.py,Getting Started,শুরু হচ্ছে
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,মার্জ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ফিস্সাল ইয়ারের সংরক্ষণের পরে ফিসক্যাল ইয়ার স্টার্ট ডেট এবং ফিসক্যাল ইয়ার শেষ তারিখ পরিবর্তন করতে পারবেন না।
@@ -2208,8 +2224,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},রক্ষণাবেক্ষণ শুরু তারিখ সিরিয়াল নং {0} এর জন্য ডেলিভারি তারিখের আগে হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,সারি {0}: বিনিময় হার বাধ্যতামূলক
 DocType: Purchase Invoice,Select Supplier Address,সরবরাহকারী ঠিকানা নির্বাচন করুন
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","উপলব্ধ পরিমাণ {0}, আপনার {1} প্রয়োজন"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,এপিআই কনজিউমার গোপন প্রবেশ করুন
 DocType: Program Enrollment Fee,Program Enrollment Fee,প্রোগ্রাম তালিকাভুক্তি ফি
+DocType: Employee Checkin,Shift Actual End,Shift প্রকৃত শেষ
 DocType: Serial No,Warranty Expiry Date,পাটা মেয়াদ শেষ হওয়ার তারিখ
 DocType: Hotel Room Pricing,Hotel Room Pricing,হোটেল রুম মূল্য
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","বাহ্যিক করযোগ্য সরবরাহ (শূন্য রেটিং ছাড়া, নিল রেট এবং ছাড় দেওয়া হয়"
@@ -2269,6 +2287,7 @@
 DocType: Quality Inspection Reading,Reading 5,পড়া 5
 DocType: Shopping Cart Settings,Display Settings,প্রদর্শন সেটিং
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,বুকিং অবমূল্যায়ন সংখ্যা সেট করুন
+DocType: Shift Type,Consequence after,পরে ফলাফল
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,তোমার কোন ধরনের সাহায্য দরকার?
 DocType: Journal Entry,Printing Settings,মুদ্রণ সেটিংস
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ব্যাংকিং
@@ -2278,6 +2297,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,বিলিং ঠিকানা শিপিং ঠিকানা হিসাবে একই
 DocType: Account,Cash,নগদ
 DocType: Employee,Leave Policy,নীতি ছেড়ে দিন
+DocType: Shift Type,Consequence,ফল
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,ছাত্র ঠিকানা
 DocType: GST Account,CESS Account,সিইএস অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: &#39;লাভ এবং ক্ষতি&#39; অ্যাকাউন্টের জন্য খরচ কেন্দ্র প্রয়োজন {2}। কোম্পানির জন্য একটি ডিফল্ট খরচ কেন্দ্র সেট আপ করুন।
@@ -2342,6 +2362,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,সময়কাল বন্ধ ভাউচার
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,গার্ডিয়ান 2 নাম
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
+DocType: Issue,Resolution By Variance,ভেরিয়েন্স দ্বারা রেজল্যুশন
 DocType: Employee,Resignation Letter Date,পদত্যাগ চিঠি তারিখ
 DocType: Soil Texture,Sandy Clay,বালুকাময় ক্লে
 DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
@@ -2354,6 +2375,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,এখন দেখুন
 DocType: Item Price,Valid Upto,বৈধ পর্যন্ত
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},রেফারেন্স ডক্ট টাইপ এক হতে হবে {0}
+DocType: Employee Checkin,Skip Auto Attendance,অটো Attendance এড়িয়ে যান
 DocType: Payment Request,Transaction Currency,লেনদেন মুদ্রা
 DocType: Loan,Repayment Schedule,ঋণ পরিশোধের সময়সূচি
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,নমুনা ধারণ স্টক এন্ট্রি তৈরি করুন
@@ -2425,6 +2447,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS বন্ধ ভাউচার ট্যাক্স
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,কর্ম শুরু
 DocType: POS Profile,Applicable for Users,ব্যবহারকারীদের জন্য প্রযোজ্য
+,Delayed Order Report,বিলম্বিত আদেশ রিপোর্ট
 DocType: Training Event,Exam,পরীক্ষা
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,জেনারেল লেজার এন্ট্রি ভুল নম্বর পাওয়া গেছে। আপনি লেনদেনে একটি ভুল অ্যাকাউন্ট নির্বাচন হতে পারে।
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,বিক্রয় পাইপলাইন
@@ -2439,10 +2462,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,শর্ত যৌথভাবে নির্বাচিত সমস্ত আইটেম প্রয়োগ করা হবে।
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,কনফিগার করুন
 DocType: Hotel Room,Capacity,ধারণক্ষমতা
+DocType: Employee Checkin,Shift End,Shift শেষ
 DocType: Installation Note Item,Installed Qty,ইনস্টল করা Qty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,আইটেম {1} এর ব্যাচ {0} নিষ্ক্রিয় করা হয়েছে।
 DocType: Hotel Room Reservation,Hotel Reservation User,হোটেল রিজার্ভেশন ব্যবহারকারী
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,কর্মদিবস দুবার পুনরাবৃত্তি করা হয়েছে
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,সংস্থার ধরন {0} এবং সংস্থার {1} সাথে পরিষেবা স্তর চুক্তি ইতিমধ্যে বিদ্যমান।
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},আইটেমের আইটেমটি আইটেম আইটেমের জন্য উল্লিখিত নয় {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},নাম ত্রুটি: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,অঞ্চল পিওএস প্রফাইল প্রয়োজন বোধ করা হয়
@@ -2490,6 +2514,7 @@
 DocType: Depreciation Schedule,Schedule Date,সময়সূচী তারিখ
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিবরণ
 DocType: Job Applicant,Job Opening,কাজের খোলা
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,কর্মচারী চেকিন শেষ পরিচিত সফল সিঙ্ক। যদি আপনি নিশ্চিত হন যে সমস্ত লগ সমস্ত অবস্থান থেকে সিঙ্ক করা হয় তবেই এটি পুনরায় সেট করুন। আপনি অনিশ্চিত যদি এই পরিবর্তন না দয়া করে।
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,প্রকৃত দাম
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),আদেশের বিরুদ্ধে মোট আগাম ({0}) {1} গ্র্যান্ড মোট ({2}) এর থেকে বেশি হতে পারে না
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,আইটেম বৈকল্পিক আপডেট
@@ -2533,6 +2558,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Invocies পান
 DocType: Tally Migration,Is Day Book Data Imported,দিন বুক তথ্য আমদানি করা হয়
 ,Sales Partners Commission,বিক্রয় অংশীদার কমিশন
+DocType: Shift Type,Enable Different Consequence for Early Exit,প্রারম্ভিক প্রস্থান করার জন্য বিভিন্ন ফলাফল সক্রিয় করুন
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,আইনগত
 DocType: Loan Application,Required by Date,তারিখ দ্বারা প্রয়োজন
 DocType: Quiz Result,Quiz Result,ক্যুইজ ফলাফল
@@ -2592,7 +2618,6 @@
 DocType: Pricing Rule,Pricing Rule,মূল্য নিয়ম
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},ঐচ্ছিক হলিডে তালিকা ছুটির সময়ের জন্য সেট না {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,কর্মচারী ভূমিকা সেট করার জন্য একটি কর্মচারী রেকর্ড ব্যবহারকারীর আইডি ক্ষেত্র সেট করুন
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,সমাধান করার সময়
 DocType: Training Event,Training Event,প্রশিক্ষণ ইভেন্ট
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","প্রাপ্তবয়স্কদের মধ্যে স্বাভাবিক বিশ্রামের রক্ত চাপ প্রায় 120 মিমিগ্রাহী সিস্টোলিক এবং 80 মিমিগ্রাহী ডায়াস্টিকিক, সংক্ষিপ্তভাবে &quot;120/80 মিমিগ্রাহ&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,সীমা মান শূন্য যদি সিস্টেম সব এন্ট্রি আনতে হবে।
@@ -2636,6 +2661,7 @@
 DocType: Student Applicant,Approved,অনুমোদিত
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},তারিখ থেকে রাজস্ব বছরের মধ্যে হওয়া উচিত। তারিখ থেকে অনুমান = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,সেটিংস কেনা সরবরাহকারী গ্রুপ সেট করুন।
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} একটি অবৈধ উপস্থিতি অবস্থা।
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,অস্থায়ী খোলার অ্যাকাউন্ট
 DocType: Purchase Invoice,Cash/Bank Account,নগদ / ব্যাংক অ্যাকাউন্ট
 DocType: Quality Meeting Table,Quality Meeting Table,মানের সভা সারণী
@@ -2671,6 +2697,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাক"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,কোর্স সুচী
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম বুদ্ধিমান ট্যাক্স বিস্তারিত
+DocType: Shift Type,Attendance will be marked automatically only after this date.,উপস্থিতি এই তারিখের পরে স্বয়ংক্রিয়ভাবে চিহ্নিত করা হবে।
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,ইউআইএন ধারকদের তৈরি সরবরাহ
 apps/erpnext/erpnext/hooks.py,Request for Quotations,উদ্ধৃতি জন্য অনুরোধ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,কারেন্সি কিছু অন্যান্য মুদ্রা ব্যবহার করে এন্ট্রি করার পরে পরিবর্তন করা যাবে না
@@ -2719,7 +2746,6 @@
 DocType: Item,Is Item from Hub,হাব থেকে আইটেম
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,মানের প্রক্রিয়া।
 DocType: Share Balance,No of Shares,শেয়ারের কোন
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),সারি {0}: ভ্যারিয়েশে {4} জন্য {0} Qty টি উপলব্ধ নেই প্রবেশের সময় পোস্ট করার সময় ({2} {3})
 DocType: Quality Action,Preventive,প্রতিষেধক
 DocType: Support Settings,Forum URL,ফোরাম ইউআরএল
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,কর্মচারী এবং উপস্থিতি
@@ -2941,7 +2967,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,ডিফল্ট ট্যাক্স এবং চার্জ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,এটি এই সরবরাহকারীর বিরুদ্ধে লেনদেনের উপর ভিত্তি করে। বিস্তারিত জানার জন্য নিচের সময়রেখা দেখুন
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,চুক্তির জন্য শুরু এবং শেষ তারিখ লিখুন।
 DocType: Delivery Note Item,Against Sales Invoice,বিক্রয় চালান বিরুদ্ধে
 DocType: Loyalty Point Entry,Purchase Amount,ক্রয় মূল
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ হিসাবে লস্ট হিসাবে সেট করা যাবে না।
@@ -2965,7 +2990,7 @@
 DocType: Lead,Organization Name,প্রতিষ্ঠানের নাম
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,থেকে বৈধ এবং ক্ষেত্র পর্যন্ত বৈধ ক্রমবর্ধমান জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ নং অবশ্যই {1} {2}
-DocType: Employee,Leave Details,বিস্তারিত ত্যাগ
+DocType: Employee Checkin,Shift Start,Shift শুরু করুন
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0} আগে স্টক লেনদেন হিমায়িত হয়
 DocType: Driver,Issuing Date,বরাদ্দের তারিখ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Requestor
@@ -3010,9 +3035,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ক্যাশ ফ্লো ম্যাপিং টেমপ্লেট বিবরণ
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,নিয়োগ এবং প্রশিক্ষণ
 DocType: Drug Prescription,Interval UOM,ব্যবধান UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,অটো উপস্থিতি জন্য গ্রেস সময়কাল সেটিংস
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,মুদ্রা থেকে মুদ্রা থেকে একই হতে পারে না
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,ফার্মাসিউটিক্যালস
 DocType: Employee,HR-EMP-,এইচআর-EMP-
+DocType: Service Level,Support Hours,সমর্থন ঘন্টা
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা হয়
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,সারি {0}: গ্রাহকের বিরুদ্ধে অগ্রগতি অবশ্যই ক্রেডিট হতে হবে
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),ভাউচার গ্রুপ (সংহত)
@@ -3122,6 +3149,7 @@
 DocType: Territory,Territory Manager,আঞ্চলিক ব্যবস্থাপক
 DocType: Lab Test,Sample ID,নমুনা আইডি
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,কার্ট খালি
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,উপস্থিতি কর্মচারী চেক-ইন অনুযায়ী চিহ্নিত করা হয়েছে
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,সম্পদ {0} জমা দিতে হবে
 ,Absent Student Report,অনুপস্থিত ছাত্র রিপোর্ট
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,গ্রস লাভ অন্তর্ভুক্ত
@@ -3129,7 +3157,9 @@
 DocType: Travel Request Costing,Funded Amount,তহবিল পরিমাণ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} জমা দেওয়া হয়নি তাই কর্মটি সম্পন্ন করা যাবে না
 DocType: Subscription,Trial Period End Date,ট্রায়াল সময়কাল শেষ তারিখ
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,একই শিফট সময় এবং আউট হিসাবে বিকল্প এন্ট্রি
 DocType: BOM Update Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,আইটেম 5
 DocType: Employee,Passport Number,পাসপোর্ট নম্বর
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,অস্থায়ী খোলার
@@ -3244,6 +3274,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,সম্ভাব্য সরবরাহকারী
 ,Issued Items Against Work Order,কাজের আদেশ বিরুদ্ধে ইস্যু আইটেম
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} চালান তৈরি হচ্ছে
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,শিক্ষা&gt; শিক্ষা সেটিংসে নির্দেশক নামকরণ সিস্টেম সেটআপ করুন
 DocType: Student,Joining Date,যোগদান তারিখ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,সাইট অনুরোধ
 DocType: Purchase Invoice,Against Expense Account,ব্যয় অ্যাকাউন্ট বিরুদ্ধে
@@ -3282,6 +3313,7 @@
 DocType: Landed Cost Item,Applicable Charges,প্রযোজ্য চার্জ
 ,Point of Sale,বিক্রয় বিন্দু
 DocType: Authorization Rule,Approving User  (above authorized value),ব্যবহারকারী অনুমোদন (অনুমোদিত মান উপরে)
+DocType: Service Level Agreement,Entity,সত্তা
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} পরিমাণ {2} থেকে {3} স্থানান্তরিত
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},গ্রাহক {0} প্রকল্পের অন্তর্গত নয় {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,পার্টি নাম থেকে
@@ -3328,6 +3360,7 @@
 DocType: Soil Texture,Sand Composition (%),বালি গঠন (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-পিপি-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,আমদানি দিন বুক তথ্য
+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} জন্য নামকরণ সিরিজ সেট করুন
 DocType: Asset,Asset Owner Company,সম্পদ মালিক কোম্পানি
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বই প্রয়োজন
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} আইটেমের জন্য বৈধ সিরিয়াল সংখ্যা {1}
@@ -3388,7 +3421,6 @@
 DocType: Asset,Asset Owner,সম্পদ মালিক
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},গুদাম স্টক আইটেম {0} জন্য বাধ্যতামূলক হয় {1}
 DocType: Stock Entry,Total Additional Costs,মোট অতিরিক্ত খরচ
-DocType: Marketplace Settings,Last Sync On,শেষ সিঙ্ক অন
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,কর এবং চার্জ টেবিলে অন্তত একটি সারি সেট করুন
 DocType: Asset Maintenance Team,Maintenance Team Name,রক্ষণাবেক্ষণ টিম নাম
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,মূল্য কেন্দ্র চার্ট
@@ -3404,12 +3436,12 @@
 DocType: Job Card,WIP Warehouse,WIP গুদাম
 DocType: Payment Request,ACC-PRQ-.YYYY.-,দুদক-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},কর্মচারী জন্য ব্যবহারকারী আইডি সেট না {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","উপলব্ধ qty {0}, আপনার {1} প্রয়োজন"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,ব্যবহারকারী {0} তৈরি
 DocType: Stock Settings,Item Naming By,আইটেম নামকরণ দ্বারা
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,অর্ডার দেওয়া
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,এটি একটি রুট গ্রাহক গোষ্ঠী এবং সম্পাদনা করা যাবে না।
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,উপাদান অনুরোধ {0} বাতিল বা বন্ধ করা হয়
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,কঠোরভাবে কর্মচারী চেকইন লগ টাইপ উপর ভিত্তি করে
 DocType: Purchase Order Item Supplied,Supplied Qty,সরবরাহকৃত Qty
 DocType: Cash Flow Mapper,Cash Flow Mapper,ক্যাশ ফ্লো ম্যাপার
 DocType: Soil Texture,Sand,বালি
@@ -3468,6 +3500,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,আইটেম গ্রুপ টেবিলের মধ্যে ডুপ্লিকেট আইটেম গ্রুপ পাওয়া যায়
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,বার্ষিক বেতন
 DocType: Supplier Scorecard,Weighting Function,ওজন ফাংশন
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,মানদণ্ড সূত্র মূল্যায়ন ত্রুটি
 ,Lab Test Report,ল্যাব টেস্ট রিপোর্ট
 DocType: BOM,With Operations,অপারেশন সঙ্গে
@@ -3481,6 +3514,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,জার্নাল এন্ট্রি জন্য উপলব্ধ কোন repayments
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্র
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,স্টক এন্ট্রি করুন
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM পুনর্মিলন: {0} পিতামাতা বা শিশু হতে পারে না {1}
 DocType: Employee Onboarding,Activities,ক্রিয়াকলাপ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,অন্তত একটি গুদাম বাধ্যতামূলক
 ,Customer Credit Balance,গ্রাহক ক্রেডিট ব্যালেন্স
@@ -3493,9 +3527,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,গ্রাহক জন্য পাওয়া একাধিক আনুগত্য প্রোগ্রাম। নিজে নির্বাচন করুন।
 DocType: Patient,Medication,চিকিত্সা
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,আনুগত্য প্রোগ্রাম নির্বাচন করুন
+DocType: Employee Checkin,Attendance Marked,উপস্থিতি চিহ্নিত
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,কাচামাল
 DocType: Sales Order,Fully Billed,সম্পূর্ণ বিল
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},দয়া করে হোটেলের রুম রেটটি {}} সেট করুন
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,ডিফল্ট হিসাবে শুধুমাত্র একটি অগ্রাধিকার নির্বাচন করুন।
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},দয়া করে টাইপের জন্য অ্যাকাউন্ট / লেজার তৈরি করুন - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,মোট ক্রেডিট / ডেবিট পরিমাণ সংযুক্ত জার্নাল এন্ট্রি হিসাবে একই হওয়া উচিত
 DocType: Purchase Invoice Item,Is Fixed Asset,স্থায়ী সম্পদ
@@ -3516,6 +3552,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,চাকুরি নির্দিষ্টকরন
 DocType: Shopping Cart Settings,Orders,অর্ডার
 DocType: HR Settings,Retirement Age,কর্ম - ত্যাগ বয়ম
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,প্রজেক্টেড Qty
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},দেশের জন্য {0} মুছে ফেলা অনুমোদিত নয়
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},সারি # {0}: সম্পদ {1} ইতিমধ্যে {2}
@@ -3599,11 +3636,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,হিসাবরক্ষক
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},পিওএস ক্লোজিং ভাউচার অ্যাল্রেডে {0} তারিখ {1} এবং {2} এর মধ্যে বিদ্যমান।
 apps/erpnext/erpnext/config/help.py,Navigating,নেভিগেট
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,কোন অসামান্য চালান বিনিময় হার পুনর্মূল্যায়ন প্রয়োজন
 DocType: Authorization Rule,Customer / Item Name,গ্রাহক / আইটেম নাম
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল নেই গুদাম থাকতে পারে না। গুদাম স্টক এন্ট্রি বা ক্রয় প্রাপ্তি দ্বারা সেট করা আবশ্যক
 DocType: Issue,Via Customer Portal,গ্রাহক পোর্টালের মাধ্যমে
 DocType: Work Order Operation,Planned Start Time,পরিকল্পিত শুরু সময়
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2}
+DocType: Service Level Priority,Service Level Priority,সেবা স্তর অগ্রাধিকার
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক অবমাননা সংখ্যা সংখ্যা অবমূল্যায়ন মোট সংখ্যা বেশী হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,শেয়ার লেজার
 DocType: Journal Entry,Accounts Payable,পরিশোধযোগ্য হিসাব
@@ -3714,7 +3753,6 @@
 DocType: Delivery Note,Delivery To,বিতরণ
 DocType: Bank Statement Transaction Settings Item,Bank Data,ব্যাংক তথ্য
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,নির্ধারিত পর্যন্ত
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,টাইমশীট একই সময়ে বিলিং ঘন্টা এবং কাজের ঘন্টা বজায় রাখা
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,ট্র্যাক লিড উত্স দ্বারা লিডস।
 DocType: Clinical Procedure,Nursing User,নার্সিং ব্যবহারকারী
 DocType: Support Settings,Response Key List,প্রতিক্রিয়া কী তালিকা
@@ -3882,6 +3920,7 @@
 DocType: Work Order Operation,Actual Start Time,প্রকৃত স্টার্ট সময়
 DocType: Antibiotic,Laboratory User,ল্যাবরেটরি ব্যবহারকারী
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,অনলাইন নিলাম
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,অগ্রাধিকার {0} পুনরাবৃত্তি করা হয়েছে।
 DocType: Fee Schedule,Fee Creation Status,ফি সৃষ্টি অবস্থা
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,সফটওয়্যার
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,বিক্রয় অর্ডার পেমেন্ট
@@ -3948,6 +3987,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} এর জন্য তথ্য পুনরুদ্ধার করা যায়নি।
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,বিলিং মুদ্রা ডিফল্ট কোম্পানির মুদ্রা বা পার্টি অ্যাকাউন্ট মুদ্রা সমান হতে হবে
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মচারী আইডি লিখুন দয়া করে
+DocType: Shift Type,Early Exit Consequence after,পরে প্রারম্ভিক প্রস্থান ফলাফল
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,খোলা বিক্রয় এবং ক্রয় চালান তৈরি করুন
 DocType: Disease,Treatment Period,চিকিত্সা সময়কাল
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ইমেইল সেট আপ করা হচ্ছে
@@ -3965,7 +4005,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,শিক্ষার্থীর নাম:
 DocType: SMS Log,Sent On,পাঠানো
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,বিক্রয় চালান
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,প্রতিক্রিয়া সময় রেজল্যুশন সময় চেয়ে বড় হতে পারে না
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","কোর্স ভিত্তিক শিক্ষার্থী গ্রুপের জন্য, কোর্সটি প্রোগ্রামের তালিকাভুক্তিতে নথিভুক্ত কোর্সের প্রত্যেক শিক্ষার্থীকে যাচাই করা হবে।"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,অভ্যন্তরীণ রাজ্য সরবরাহ
 DocType: Employee,Create User Permission,ব্যবহারকারী অনুমতি তৈরি করুন
@@ -4004,6 +4043,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,বিক্রয় বা ক্রয় জন্য স্ট্যান্ডার্ড চুক্তি পদ।
 DocType: Sales Invoice,Customer PO Details,গ্রাহক পিও বিস্তারিত
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,রোগীর পাওয়া যায় না
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,একটি ডিফল্ট অগ্রাধিকার নির্বাচন করুন।
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,আইটেমটি চার্জ প্রযোজ্য না হলে আইটেমটি সরান
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"একটি গ্রাহক গ্রুপ একই নামের সাথে বিদ্যমান, দয়া করে গ্রাহক নাম পরিবর্তন করুন অথবা গ্রাহক গোষ্ঠীর নামকরণ করুন"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4041,6 +4081,7 @@
 DocType: Quality Goal,Quality Goal,মানের লক্ষ্য
 DocType: Support Settings,Support Portal,সমর্থন পোর্টাল
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},কর্মচারী {0} ছেড়ে চলে যাচ্ছে {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},এই পরিষেবা স্তর চুক্তি গ্রাহকের কাছে নির্দিষ্ট {0}
 DocType: Employee,Held On,অনুষ্ঠিত
 DocType: Healthcare Practitioner,Practitioner Schedules,অনুশীলনকারী সূচি
 DocType: Project Template Task,Begin On (Days),শুরু (দিন)
@@ -4048,6 +4089,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},কাজ আদেশ হয়েছে {0}
 DocType: Inpatient Record,Admission Schedule Date,ভর্তির সময়সূচি তারিখ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,সম্পদ মূল্য সমন্বয়
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,এই শিফটে নিয়োগকৃত কর্মচারীদের জন্য &#39;কর্মচারী চেকইন&#39; ভিত্তিক মার্ক উপস্থিতি।
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,অনিবন্ধিত ব্যক্তিদের সরবরাহ করা
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,সব কাজ
 DocType: Appointment Type,Appointment Type,নিয়োগের ধরন
@@ -4160,7 +4202,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের মোট ওজন। সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন। (মুদ্রণের জন্য)
 DocType: Plant Analysis,Laboratory Testing Datetime,ল্যাবরেটরি টেস্টিং সময়কাল
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,পর্যায় দ্বারা বিক্রয় পাইপলাইন
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,ছাত্র গ্রুপ শক্তি
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,ব্যাংক বিবৃতি লেনদেন এন্ট্রি
 DocType: Purchase Order,Get Items from Open Material Requests,ওপেন উপাদান অনুরোধ থেকে আইটেম পান
@@ -4242,7 +4283,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Aging Warehouse- অনুযায়ী দেখান
 DocType: Sales Invoice,Write Off Outstanding Amount,অসামান্য পরিমাণে লিখুন
 DocType: Payroll Entry,Employee Details,কর্মচারী বিবরণ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,আরম্ভের সময় {0} এর জন্য শেষ সময়ের চেয়ে বড় হতে পারে না।
 DocType: Pricing Rule,Discount Amount,হ্রাসকৃত মুল্য
 DocType: Healthcare Service Unit Type,Item Details,আইটেম বিবরণ
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},সময়ের জন্য {0} নকল কর ঘোষণা {1}
@@ -4295,7 +4335,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,নেট বেতন নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,ইন্টারেকশন না
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},সারি {0} # আইটেম {1} ক্রয় আদেশের বিরুদ্ধে {2} এর চেয়ে বেশি স্থানান্তর করা যাবে না {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,পরিবর্তন
+DocType: Attendance,Shift,পরিবর্তন
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,অ্যাকাউন্ট এবং দলগুলোর প্রসেসিং চার্ট
 DocType: Stock Settings,Convert Item Description to Clean HTML,এইচটিএমএল পরিষ্কার করতে আইটেম বর্ণনা রূপান্তর করুন
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,সমস্ত সরবরাহকারী গ্রুপ
@@ -4366,6 +4406,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,অভিভাবক সেবা ইউনিট
 DocType: Sales Invoice,Include Payment (POS),পেমেন্ট অন্তর্ভুক্ত করুন (পিওএস)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,ব্যক্তিগত মালিকানা
+DocType: Shift Type,First Check-in and Last Check-out,প্রথম চেক ইন এবং শেষ চেক আউট
 DocType: Landed Cost Item,Receipt Document,রসিদ ডকুমেন্ট
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,সরবরাহকারী স্কোরকার্ড সময়কাল
 DocType: Employee Grade,Default Salary Structure,ডিফল্ট বেতন গঠন
@@ -4448,6 +4489,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,ক্রয় আদেশ তৈরি করুন
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,একটি আর্থিক বছরের জন্য বাজেট নির্ধারণ করুন।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল ফাঁকা হতে পারে না।
+DocType: Employee Checkin,Entry Grace Period Consequence,প্রবেশ গ্রেস সময়কাল ফলাফল
 ,Payment Period Based On Invoice Date,চালান তারিখ উপর ভিত্তি করে পেমেন্ট সময়কাল
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},ইনস্টলেশন তারিখ আইটেম {0} জন্য প্রসবের তারিখ হতে পারে না
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,উপাদান অনুরোধ লিংক
@@ -4456,6 +4498,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: এই গুদামের জন্য একটি পুনর্বিন্যাস এন্ট্রি ইতিমধ্যে বিদ্যমান {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ডক তারিখ
 DocType: Monthly Distribution,Distribution Name,বিতরণ নাম
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,কর্মদিবস {0} পুনরাবৃত্তি করা হয়েছে।
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,অ গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,অগ্রগতি আপডেট. এটি একটি সময় নিতে পারে।
 DocType: Item,"Example: ABCD.#####
@@ -4468,6 +4511,7 @@
 DocType: Vehicle Log,Fuel Qty,জ্বালানি Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,গার্ডিয়ান 1 মোবাইল নং
 DocType: Invoice Discounting,Disbursed,বিতরণ
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,শিফট শেষে সময় যা উপস্থিতি জন্য উপস্থিতি বিবেচনা করা হয়।
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,অ্যাকাউন্টে নেট পরিবর্তন Payable
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,পাওয়া যায় না
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,খন্ডকালীন
@@ -4481,7 +4525,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,প্রিন্ট পিডিসি দেখান
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify সরবরাহকারী
 DocType: POS Profile User,POS Profile User,পিওএস প্রোফাইল ব্যবহারকারী
-DocType: Student,Middle Name,মধ্য নাম
 DocType: Sales Person,Sales Person Name,বিক্রয় ব্যক্তির নাম
 DocType: Packing Slip,Gross Weight,মোট ওজন
 DocType: Journal Entry,Bill No,বিল নং
@@ -4490,7 +4533,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,এইচআর-vlog-.YYYY.-
 DocType: Student,A+,প্রথম সারির
 DocType: Issue,Service Level Agreement,পরিসেবা স্তরের চুক্তি
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,কর্মচারী এবং প্রথম তারিখ নির্বাচন করুন
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,ভূমি মূল্য ভাউচার পরিমাণ বিবেচনা করে আইটেম মূল্যায়ন হার পুনর্নির্মিত করা হয়
 DocType: Timesheet,Employee Detail,কর্মচারী বিস্তারিত
 DocType: Tally Migration,Vouchers,ভাউচার
@@ -4525,7 +4567,7 @@
 DocType: Additional Salary,Date on which this component is applied,এই উপাদানটি প্রয়োগ করা হয় তারিখ
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,ফোলিও সংখ্যা সহ উপলব্ধ শেয়ারহোল্ডারদের তালিকা
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,সেটআপ গেটওয়ে অ্যাকাউন্ট।
-DocType: Service Level,Response Time Period,প্রতিক্রিয়া সময়কাল
+DocType: Service Level Priority,Response Time Period,প্রতিক্রিয়া সময়কাল
 DocType: Purchase Invoice,Purchase Taxes and Charges,ক্রয় এবং চার্জ
 DocType: Course Activity,Activity Date,কার্যকলাপ তারিখ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,নির্বাচন করুন অথবা নতুন গ্রাহক যোগ করুন
@@ -4550,6 +4592,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,আর্থিক বছর
 DocType: Sales Invoice Item,Deferred Revenue,বিলম্বিত রাজস্ব
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,অন্তত একটি বিক্রয় বা কেনা নির্বাচন করা আবশ্যক
+DocType: Shift Type,Working Hours Threshold for Half Day,অর্ধ দিবসের জন্য কাজের ঘন্টা থ্রেশহোল্ড
 ,Item-wise Purchase History,আইটেম ভিত্তিক ক্রয় ইতিহাস
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},সারিতে আইটেমের জন্য পরিষেবা বন্ধের তারিখ পরিবর্তন করতে পারে না {0}
 DocType: Production Plan,Include Subcontracted Items,Subcontracted আইটেম অন্তর্ভুক্ত করুন
@@ -4582,6 +4625,7 @@
 DocType: BOM,Allow Same Item Multiple Times,একই আইটেম একাধিক টাইম অনুমতি দিন
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,বোম তৈরি করুন
 DocType: Healthcare Practitioner,Charges,চার্জ
+DocType: Employee,Attendance and Leave Details,উপস্থিতি এবং ছেড়ে দিন
 DocType: Student,Personal Details,ব্যক্তিগত বিবরণ
 DocType: Sales Order,Billing and Delivery Status,বিলিং এবং ডেলিভারি অবস্থা
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,সারি {0}: সরবরাহকারীর জন্য {0} ইমেল ঠিকানা ইমেল পাঠানোর প্রয়োজন
@@ -4633,7 +4677,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},মূল্য betweeen {0} এবং {1} লিখুন
 DocType: Purchase Order,Order Confirmation Date,অর্ডার নিশ্চিতকরণ তারিখ
 DocType: Delivery Trip,Calculate Estimated Arrival Times,আনুমানিক আগমনের সময় গণনা
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংস মধ্যে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,consumable
 DocType: Instructor,EDU-INS-.YYYY.-,EDU তে-ইনগুলি-.YYYY.-
 DocType: Subscription,Subscription Start Date,সাবস্ক্রিপশন শুরু তারিখ
@@ -4656,7 +4699,7 @@
 DocType: Journal Entry Account,Journal Entry Account,জার্নাল এন্ট্রি অ্যাকাউন্ট
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,বৈকল্পিক
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,ফোরাম কার্যকলাপ
-DocType: Service Level,Resolution Time Period,রেজোলিউশন সময়কাল
+DocType: Service Level Priority,Resolution Time Period,রেজোলিউশন সময়কাল
 DocType: Request for Quotation,Supplier Detail,সরবরাহকারী বিস্তারিত
 DocType: Project Task,View Task,কার্য দেখুন
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / উত্পাদন বিবরণ
@@ -4723,6 +4766,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,গুদাম শুধুমাত্র স্টক এন্ট্রি / ডেলিভারি নোট / ক্রয় প্রাপ্তির মাধ্যমে পরিবর্তন করা যেতে পারে
 DocType: Support Settings,Close Issue After Days,দিন পর সমস্যা বন্ধ করুন
 DocType: Payment Schedule,Payment Schedule,পেমেন্ট সময়সূচী
+DocType: Shift Type,Enable Entry Grace Period,এন্ট্রি গ্রেস সময়কাল সক্রিয় করুন
 DocType: Patient Relation,Spouse,পত্নী
 DocType: Purchase Invoice,Reason For Putting On Hold,হোল্ড উপর রাখা জন্য কারণ
 DocType: Item Attribute,Increment,বৃদ্ধি
@@ -4862,6 +4906,7 @@
 DocType: Vehicle Log,Invoice Ref,চালান রেফারেন্স
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},চালান জন্য সি-ফর্ম প্রযোজ্য নয়: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,চালান তৈরি
+DocType: Shift Type,Early Exit Grace Period,প্রারম্ভিক প্রস্থান গ্রেস সময়কাল
 DocType: Patient Encounter,Review Details,পর্যালোচনা বিবরণ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্যের চেয়ে বড় হওয়া আবশ্যক।
 DocType: Account,Account Number,হিসাব নাম্বার
@@ -4873,7 +4918,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","কোম্পানী স্পা, SAPA বা SRL প্রযোজ্য"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,ওভারল্যাপিং অবস্থার মধ্যে পাওয়া যায়:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,প্রদত্ত এবং বিতরণ করা হয় না
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,আইটেম কোড স্বয়ংক্রিয়ভাবে গণনা করা হয় না কারণ বাধ্যতামূলক
 DocType: GST HSN Code,HSN Code,এইচএসএন কোড
 DocType: GSTR 3B Report,September,সেপ্টেম্বর
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,প্রশাসনিক ব্যয়
@@ -4909,6 +4953,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP অ্যাকাউন্ট
 DocType: SMS Log,Sender Name,প্রেরক নাম
 DocType: Pricing Rule,Supplier Group,সরবরাহকারী গ্রুপ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",সূচী {1} এ \ সহায়তা দিবসের {0} জন্য স্টার্ট টাইম এবং শেষ সময় সেট করুন।
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
 ,Requested Items To Be Transferred,স্থানান্তর করা অনুরোধ আইটেম
 DocType: Employee,Contract End Date,চুক্তি শেষ তারিখ
@@ -4919,6 +4965,7 @@
 DocType: Opportunity,Sales Stage,বিক্রয় পর্যায়
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,আপনি বিক্রয় আদেশ সংরক্ষণ একবার শব্দ প্রদর্শিত হবে।
 DocType: Item Reorder,Re-order Level,পুনর্বিন্যাস স্তর
+DocType: Shift Type,Enable Auto Attendance,অটো উপস্থিতি সক্ষম করুন
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,পক্ষপাত
 ,Department Analytics,বিভাগ বিশ্লেষণ
 DocType: Crop,Scientific Name,বৈজ্ঞানিক নাম
@@ -4931,6 +4978,7 @@
 DocType: Quiz Activity,Quiz Activity,ক্যুইজ কার্যকলাপ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} একটি বৈধ Payroll সময়সীমার মধ্যে নয়
 DocType: Timesheet,Billed,বিল
+apps/erpnext/erpnext/config/support.py,Issue Type.,ইস্যু প্রকার।
 DocType: Restaurant Order Entry,Last Sales Invoice,শেষ বিক্রয় চালান
 DocType: Payment Terms Template,Payment Terms,পরিশোধের শর্ত
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","সংরক্ষিত Qty: পরিমাণ বিক্রয়ের জন্য আদেশ, কিন্তু বিতরণ না।"
@@ -5026,6 +5074,7 @@
 DocType: Account,Asset,অ্যাসেট
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} একটি স্বাস্থ্যসেবা অনুশীলনকারী সময়সূচী নেই। স্বাস্থ্যসেবা অনুশীলনকারী মাস্টার এটি যোগ করুন
 DocType: Vehicle,Chassis No,চেসিস নং
+DocType: Employee,Default Shift,ডিফল্ট Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,কোম্পানী সংক্ষেপে
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,উপকরণ বিল গাছ
 DocType: Article,LMS User,এলএমএস ব্যবহারকারী
@@ -5074,6 +5123,7 @@
 DocType: Sales Person,Parent Sales Person,মূল বিক্রয় ব্যক্তি
 DocType: Student Group Creation Tool,Get Courses,কোর্স পান
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি {{0}: Qty অবশ্যই 1 হতে হবে, কারণ আইটেমটি একটি স্থির সম্পদ। একাধিক qty জন্য পৃথক সারি ব্যবহার করুন।"
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),অনুপস্থিত চিহ্নিত করা হয় নিচের কাজ ঘন্টা। (জিরো নিষ্ক্রিয়)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,শুধুমাত্র লিংক নোড লেনদেনের অনুমতি দেওয়া হয়
 DocType: Grant Application,Organization,সংগঠন
 DocType: Fee Category,Fee Category,ফি বিভাগ
@@ -5086,6 +5136,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,এই প্রশিক্ষণ ইভেন্টের জন্য আপনার অবস্থা আপডেট করুন
 DocType: Volunteer,Morning,সকাল
 DocType: Quotation Item,Quotation Item,উদ্ধৃতি আইটেম
+apps/erpnext/erpnext/config/support.py,Issue Priority.,ইস্যু অগ্রাধিকার।
 DocType: Journal Entry,Credit Card Entry,ক্রেডিট কার্ড এন্ট্রি
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","টাইম স্লট এড়িয়ে যাওয়া, {0} থেকে {1} স্লট {1} থেকে {3}"
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয়
@@ -5136,11 +5187,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,তথ্য আমদানি এবং সেটিংস
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","যদি অটো অপট ইন চেক করা হয়, তাহলে গ্রাহকরা স্বয়ংক্রিয়ভাবে সংশ্লিষ্ট আনুগত্য প্রোগ্রামের সাথে সংযুক্ত হবে (সংরক্ষণে)"
 DocType: Account,Expense Account,দামী হিসাব
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,স্থানান্তরের আগে সময়টি শুরু হওয়ার সময় কর্মচারী চেক-ইন উপস্থিতি জন্য বিবেচিত হয়।
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Guardian1 সঙ্গে সম্পর্ক
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,চালান তৈরি করুন
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যে বিদ্যমান {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',কর্মচারীটি {0} থেকে মুক্ত হওয়া আবশ্যক &#39;বামে&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},পে {0} {1}
+DocType: Company,Sales Settings,বিক্রয় সেটিংস
 DocType: Sales Order Item,Produced Quantity,উত্পাদিত পরিমাণ
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,উদ্ধৃতির জন্য অনুরোধটি নিম্নলিখিত লিঙ্কে ক্লিক করে অ্যাক্সেস করা যেতে পারে
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বিতরণ নাম
@@ -5219,6 +5272,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,বিক্রয় এবং ক্রয় জন্য ডিফল্ট ট্যাক্স টেমপ্লেট তৈরি করা হয়।
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,প্রকার {0} বহন করা যাবে না
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,অ্যাকাউন্টে ডেবিট একটি গ্রহণযোগ্য অ্যাকাউন্ট হতে হবে
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,চুক্তির শেষ তারিখ আজকের চেয়ে কম হতে পারে না।
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},দয়া করে গুদামে অ্যাকাউন্ট সেট করুন {0} অথবা কোম্পানির ডিফল্ট জায় অ্যাকাউন্ট {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,ডিফল্ট হিসাবে সেট করুন
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),এই প্যাকেজের নেট ওজন। (আইটেমের মোট ওজন সমষ্টি হিসাবে স্বয়ংক্রিয়ভাবে গণনা)
@@ -5245,8 +5299,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,মেয়াদ শেষ হয়ে গেছে
 DocType: Shipping Rule,Shipping Rule Type,শিপিং নিয়ম প্রকার
 DocType: Job Offer,Accepted,গৃহীত
-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> \ Employee মুছে দিন"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,আপনি ইতিমধ্যে মূল্যায়ন মানদণ্ডের জন্য মূল্যায়ন করেছেন {}।
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,ব্যাচ নাম্বার নির্বাচন করুন
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),বয়স (দিন)
@@ -5273,6 +5325,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,আপনার ডোমেইন নির্বাচন করুন
 DocType: Agriculture Task,Task Name,কাজের নাম
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,স্টক এন্ট্রি ইতিমধ্যে কাজের অর্ডার জন্য তৈরি
+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> \ Employee মুছে দিন"
 ,Amount to Deliver,প্রদানের পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,কোম্পানী {0} বিদ্যমান নেই
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,দেওয়া আইটেমের জন্য লিঙ্ক পাওয়া কোন মুলতুবি উপাদান অনুরোধ।
@@ -5322,6 +5376,7 @@
 DocType: Lab Prescription,Test Code,টেস্ট কোড
 DocType: Purchase Taxes and Charges,On Previous Row Total,পূর্ববর্তী সারি মোট
 DocType: Student,Student Email Address,ছাত্র ইমেইল ঠিকানা
+,Delayed Item Report,বিলম্বিত আইটেম রিপোর্ট
 DocType: Academic Term,Education,শিক্ষা
 DocType: Supplier Quotation,Supplier Address,সরবরাহকারী ঠিকানা
 DocType: Salary Detail,Do not include in total,মোট অন্তর্ভুক্ত করবেন না
@@ -5329,7 +5384,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} বিদ্যমান নেই
 DocType: Purchase Receipt Item,Rejected Quantity,প্রত্যাখ্যাত পরিমাণ
 DocType: Cashier Closing,To TIme,সময়
-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: Daily Work Summary Group User,Daily Work Summary Group User,দৈনিক কাজ সারসংক্ষেপ গ্রুপ ব্যবহারকারী
 DocType: Fiscal Year Company,Fiscal Year Company,রাজস্ব বছর কোম্পানি
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,বিকল্প আইটেম আইটেম কোড হিসাবে একই হতে হবে না
@@ -5381,6 +5435,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,ডেলিভারি স্টপ মধ্যে বিলম্ব
 DocType: Stock Settings,Freeze Stocks Older Than [Days],বন্ধ স্টক পুরানো চেয়ে [দিন]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,প্রোমোশনাল স্কিম পণ্য ডিসকাউন্ট
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,ইস্যু অগ্রাধিকার ইতিমধ্যে বিদ্যমান
 DocType: Account,Asset Received But Not Billed,সম্পদ প্রাপ্ত কিন্তু বিল না
 DocType: POS Closing Voucher,Total Collected Amount,মোট সংগৃহীত পরিমাণ
 DocType: Course,Default Grading Scale,ডিফল্ট গ্রেডিং স্কেল
@@ -5422,6 +5477,7 @@
 DocType: Contract,Fulfilment Terms,পরিপূরক শর্তাবলী
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,গ্রুপ থেকে অ গ্রুপ
 DocType: Student Guardian,Mother,মা
+DocType: Issue,Service Level Agreement Fulfilled,সেবা স্তর চুক্তি সম্পন্ন
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,দাবি না করা কর্মচারী বেনিফিট জন্য কর আদায়
 DocType: Travel Request,Travel Funding,ভ্রমণ তহবিল
 DocType: Shipping Rule,Fixed,স্থায়ী
@@ -5451,10 +5507,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,কোন আইটেম খুঁজে পাওয়া যায় নি।
 DocType: Item Attribute,From Range,রেঞ্জ থেকে
 DocType: Clinical Procedure,Consumables,consumables
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; এবং &#39;টাইমস্ট্যাম্প&#39; প্রয়োজন।
 DocType: Purchase Taxes and Charges,Reference Row #,রেফারেন্স সারি #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},অনুগ্রহ করে কোম্পানিতে &#39;অ্যাসেট ডেবিরিয়াস কস্ট সেন্টার&#39; সেট করুন {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,সারি # {0}: পেমেন্ট নথিটি ট্র্যাজ্যাকশন সম্পূর্ণ করার প্রয়োজন
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,অ্যামাজন MWS থেকে আপনার বিক্রয় আদেশ তথ্য টানতে এই বাটনে ক্লিক করুন।
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),কাজের ঘন্টা যা নীচে অর্ধ দিবস চিহ্নিত করা হয়। (জিরো নিষ্ক্রিয়)
 ,Assessment Plan Status,মূল্যায়ন পরিকল্পনা স্থিতি
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,প্রথমে {0} নির্বাচন করুন
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,কর্মচারী রেকর্ড তৈরি করতে এই জমা দিন
@@ -5525,6 +5583,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,সেট খুলুন
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,ফিল্টার টগল করুন
 DocType: Production Plan,Material Request Detail,উপাদান অনুরোধ বিস্তারিত
+DocType: Shift Type,Process Attendance After,প্রক্রিয়া উপস্থিতি পরে
 DocType: Material Request Item,Quantity and Warehouse,পরিমাণ এবং গুদাম
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,প্রোগ্রাম যান
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},সারি # {0}: রেফারেন্সে ডুপ্লিকেট এন্ট্রি {1} {2}
@@ -5582,6 +5641,7 @@
 DocType: Pricing Rule,Party Information,পার্টি তথ্য
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),ঋণদাতাদের ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,তারিখ থেকে কর্মচারীর relieving তারিখ বেশী হতে পারে না
+DocType: Shift Type,Enable Exit Grace Period,প্রস্থান অনুগ্রহ করে প্রস্থান সক্রিয় করুন
 DocType: Expense Claim,Employees Email Id,কর্মচারী ইমেইল আইডি
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Shopify থেকে ERPNext মূল্য তালিকা থেকে মূল্য আপডেট করুন
 DocType: Healthcare Settings,Default Medical Code Standard,ডিফল্ট মেডিকেল কোড স্ট্যান্ডার্ড
@@ -5612,7 +5672,6 @@
 DocType: Budget,Applicable on Material Request,উপাদান অনুরোধ উপর প্রযোজ্য
 DocType: Support Settings,Search APIs,অনুসন্ধান APIs
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,বিক্রয় আদেশ জন্য overproduction শতকরা
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,বিশেষ উল্লেখ
 DocType: Purchase Invoice,Supplied Items,সরবরাহকৃত আইটেম
 DocType: Leave Control Panel,Select Employees,কর্মচারী নির্বাচন করুন
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},ঋণে সুদ আয় অ্যাকাউন্ট নির্বাচন করুন {0}
@@ -5638,7 +5697,7 @@
 ,Supplier-Wise Sales Analytics,সরবরাহকারী-বুদ্ধিমান বিক্রয় বিশ্লেষণ
 DocType: GSTR 3B Report,February,ফেব্রুয়ারি
 DocType: Appraisal,For Employee,কর্মচারী জন্য
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,প্রকৃত ডেলিভারি তারিখ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,প্রকৃত ডেলিভারি তারিখ
 DocType: Sales Partner,Sales Partner Name,বিক্রয় অংশীদার নাম
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,অবচয় সারি {0}: অবমূল্যায়ন শুরু তারিখটি আগের তারিখ হিসাবে প্রবেশ করা হয়
 DocType: GST HSN Code,Regional,আঞ্চলিক
@@ -5677,6 +5736,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,সরবরাহকারী স্কোরকার্ড
 DocType: Travel Itinerary,Travel To,ভ্রমন করা
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,সাক্ষাত্কার চিহ্নিত করুন
+DocType: Shift Type,Determine Check-in and Check-out,চেক ইন এবং চেক আউট নির্ধারণ করুন
 DocType: POS Closing Voucher,Difference,পার্থক্য
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,ছোট
 DocType: Work Order Item,Work Order Item,কাজ আদেশ আইটেম
@@ -5710,6 +5770,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ঔষধ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} বন্ধ
 DocType: Patient,Medical History,চিকিৎসা ইতিহাস
+DocType: Expense Claim,Expense Taxes and Charges,ব্যয় কর এবং চার্জ
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,সাবস্ক্রিপশন বাতিল বা সাবস্ক্রাইব হিসাবে অদ্যাবধি চিহ্নিত করার আগে চালান তারিখের দিন পেরিয়ে গেছে
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ইনস্টলেশন নোট {0} ইতিমধ্যে জমা দেওয়া হয়েছে
 DocType: Patient Relation,Family,পরিবার
@@ -5742,7 +5803,6 @@
 DocType: Dosage Strength,Strength,শক্তি
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} এই লেনদেন সম্পন্ন করতে {1} {1} এর ইউনিটগুলির প্রয়োজন।
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,উপর ভিত্তি করে subcontract এর ব্যাকফ্লাস কাঁচামাল
-DocType: Bank Guarantee,Customer,ক্রেতা
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",যদি সক্রিয় থাকে তবে ক্ষেত্রের অ্যাকাডেমিক মেয়াদ প্রোগ্রাম এনট্রোলমেন্ট সরঞ্জামে বাধ্যতামূলক হবে।
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ব্যাচ ভিত্তিক স্টুডেন্ট গ্রুপের জন্য, শিক্ষার্থী ব্যাচ প্রোগ্রামের তালিকা থেকে প্রতিটি ছাত্রের জন্য বৈধ হবে।"
 DocType: Course,Topics,টপিক
@@ -5901,6 +5961,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),বন্ধ হচ্ছে (খোলা + মোট)
 DocType: Supplier Scorecard Criteria,Criteria Formula,মাপদণ্ড সূত্র
 apps/erpnext/erpnext/config/support.py,Support Analytics,সমর্থন অ্যানালিটিক্স
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),উপস্থিতি ডিভাইস আইডি (বায়োমেট্রিক / আরএফ ট্যাগ আইডি)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,পর্যালোচনা এবং কর্ম
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","অ্যাকাউন্টটি হিমায়িত হলে, এন্ট্রিগুলি সীমাবদ্ধ ব্যবহারকারীদের জন্য অনুমোদিত।"
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,অবমূল্যায়ন পরে পরিমাণ
@@ -5922,6 +5983,7 @@
 DocType: Salary Slip,Loan Repayment,ঋণ পরিশোধ
 DocType: Employee Education,Major/Optional Subjects,মেজর / ঐচ্ছিক বিষয়
 DocType: Soil Texture,Silt,পলি
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,সরবরাহকারী ঠিকানা এবং পরিচিতি
 DocType: Bank Guarantee,Bank Guarantee Type,ব্যাংক গ্যারান্টি টাইপ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","নিষ্ক্রিয় করা হলে, &#39;গোলাকৃত মোট&#39; ক্ষেত্রটি কোনও লেনদেনে দৃশ্যমান হবে না"
 DocType: Pricing Rule,Min Amt,মিনি এমটি
@@ -5960,6 +6022,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,চালান সৃষ্টি টুল আইটেম খোলা
 DocType: Soil Analysis,(Ca+Mg)/K,(CA ম্যাগনেসিয়াম + +) / কে
 DocType: Bank Reconciliation,Include POS Transactions,POS লেনদেন অন্তর্ভুক্ত করুন
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},কোন কর্মচারী দেওয়া কর্মচারী ক্ষেত্র মান জন্য পাওয়া যায় নি। &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),পরিমাণ প্রাপ্তি (কোম্পানি মুদ্রা)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage পূর্ণ, সংরক্ষণ না"
 DocType: Chapter Member,Chapter Member,অধ্যায় সদস্য
@@ -5992,6 +6055,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,কোন ছাত্র গ্রুপ তৈরি।
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},অনুরূপ সারি {0} একই {1}
 DocType: Employee,Salary Details,বেতন বিবরণ
+DocType: Employee Checkin,Exit Grace Period Consequence,গ্রেস সময়কাল প্রস্থান করুন
 DocType: Bank Statement Transaction Invoice Item,Invoice,চালান
 DocType: Special Test Items,Particulars,বিবরণ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,আইটেম বা গুদাম উপর ভিত্তি করে ফিল্টার সেট করুন
@@ -6092,6 +6156,7 @@
 DocType: Serial No,Out of AMC,এএমসি আউট
 DocType: Job Opening,"Job profile, qualifications required etc.","চাকরির প্রোফাইল, যোগ্যতা ইত্যাদি।"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,রাজ্য জাহাজ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,আপনি উপাদান অনুরোধ জমা দিতে চান
 DocType: Opportunity Item,Basic Rate,বেসিক হার
 DocType: Compensatory Leave Request,Work End Date,কাজ শেষ তারিখ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,কাঁচামাল জন্য অনুরোধ
@@ -6277,6 +6342,7 @@
 DocType: Sales Order Item,Gross Profit,পুরো লাভ
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল নং
 DocType: Asset,Insurer,বিমা
+DocType: Employee Checkin,OUT,আউট
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,পরিমাণ কেনা
 DocType: Asset Maintenance Task,Certificate Required,শংসাপত্র প্রয়োজন
 DocType: Retention Bonus,Retention Bonus,রিটেনশন বোনাস
@@ -6392,6 +6458,8 @@
 DocType: Invoice Discounting,Sanctioned,অনুমোদিত
 DocType: Course Enrollment,Course Enrollment,কোর্স তালিকাভুক্তি
 DocType: Item,Supplier Items,সরবরাহকারী আইটেম
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",{0} এর জন্য আরম্ভের সময় শেষ বারের চেয়ে বেশি বা সমান হতে পারে না।
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 DocType: Support Search Source,Response Options,প্রতিক্রিয়া বিকল্প
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} 0 এবং 100 এর মধ্যে একটি মান হওয়া উচিত
@@ -6478,7 +6546,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,স্থায়ী সম্পদ
 DocType: Purchase Order,Ref SQ,রেফারেন্স এসকিউ
 DocType: Salary Structure,Total Earning,মোট উপার্জন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপ&gt; অঞ্চল
 DocType: Share Balance,From No,না থেকে
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,পেমেন্ট পুনর্মিলন চালান
 DocType: Purchase Invoice,Taxes and Charges Added,কর এবং চার্জ যোগ করা হয়েছে
@@ -6586,6 +6653,7 @@
 DocType: POS Profile,Ignore Pricing Rule,মূল্য নিয়ম উপেক্ষা করুন
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,খাদ্য
 DocType: Lost Reason Detail,Lost Reason Detail,হারানো কারণ বিস্তারিত
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},নিম্নলিখিত ক্রমিক সংখ্যা তৈরি করা হয়েছে: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,গ্রাহকের প্রতিক্রিয়া
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
 DocType: Issue,Opening Time,খোলার সময়
@@ -6635,6 +6703,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,কোম্পানির নাম একই না
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,কর্মচারী প্রচার প্রচারের তারিখ আগে জমা দেওয়া যাবে না
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} এর চেয়ে পুরোনো স্টক লেনদেন আপডেট করার অনুমতি নেই
+DocType: Employee Checkin,Employee Checkin,কর্মচারী চেকইন
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},আইটেমটির জন্য শেষ তারিখের চেয়ে কম হওয়া উচিত তারিখ {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,গ্রাহক কোট তৈরি করুন
 DocType: Buying Settings,Buying Settings,সেটিংস কেনা
@@ -6655,6 +6724,7 @@
 DocType: Patient,Patient Demographics,রোগীর ডেমোগ্রাফিক্স
 DocType: Share Transfer,To Folio No,Folio নং
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,অপারেশন থেকে ক্যাশ ফ্লো
+DocType: Employee Checkin,Log Type,লগ টাইপ
 DocType: Stock Settings,Allow Negative Stock,ঋণাত্মক স্টক অনুমতি দিন
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,আইটেমের পরিমাণ বা মান কোন পরিবর্তন আছে।
 DocType: Asset,Purchase Date,ক্রয় তারিখ
@@ -6699,6 +6769,7 @@
 DocType: Vital Signs,Very Hyper,খুব হাইপার
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,আপনার ব্যবসার প্রকৃতি নির্বাচন করুন।
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,মাস এবং বছর নির্বাচন করুন
+DocType: Service Level,Default Priority,ডিফল্ট অগ্রাধিকার
 DocType: Student Log,Student Log,ছাত্র লগ
 DocType: Shopping Cart Settings,Enable Checkout,চেকআউট সক্রিয় করুন
 apps/erpnext/erpnext/config/settings.py,Human Resources,মানব সম্পদ
@@ -6727,7 +6798,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ERPNext সঙ্গে Shopify সংযুক্ত করুন
 DocType: Homepage Section Card,Subtitle,বাড়তি নাম
 DocType: Soil Texture,Loam,দোআঁশ মাটি
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: BOM,Scrap Material Cost(Company Currency),স্ক্র্যাপ উপাদান খরচ (কোম্পানি মুদ্রা)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,ডেলিভারি নোট {0} জমা দিতে হবে না
 DocType: Task,Actual Start Date (via Time Sheet),প্রকৃত সূচনা তারিখ (টাইম শীটের মাধ্যমে)
@@ -6783,6 +6853,7 @@
 DocType: Drug Prescription,Dosage,ডোজ
 DocType: Cheque Print Template,Starting position from top edge,শীর্ষ প্রান্ত থেকে শুরু অবস্থান
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),নিয়োগ সময়কাল (মিনিট)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},এই কর্মচারীর ইতিমধ্যে একই টাইমস্ট্যাম্পের সাথে একটি লগ আছে। {0}
 DocType: Accounting Dimension,Disable,অক্ষম
 DocType: Email Digest,Purchase Orders to Receive,অর্ডার অর্ডার ক্রয়
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,প্রোডাকশন অর্ডারের জন্য উত্থাপিত করা যাবে না:
@@ -6798,7 +6869,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,উপাদান subcontract জন্য স্থানান্তরিত
 DocType: Job Card,Timing Detail,সময় বিস্তারিত
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,প্রয়োজন
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{1} এর {0} আমদানি হচ্ছে
 DocType: Job Offer Term,Job Offer Term,কাজের অফার টার্ম
 DocType: SMS Center,All Contact,সব যোগাযোগ
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
@@ -6849,7 +6919,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,আইটেম {0} সিরিয়াল নম্বর জন্য সেটআপ করা হয় না। আইটেম আইটেম চেক করুন
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,রাষ্ট্র থেকে
 DocType: Leave Type,Maximum Continuous Days Applicable,সর্বাধিক ক্রমাগত দিন প্রযোজ্য
-apps/erpnext/erpnext/config/support.py,Support Team.,সহায়তা দল.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,প্রথম কোম্পানী নাম লিখুন দয়া করে
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,আমদানি সফল
 DocType: Guardian,Alternate Number,বিকল্প সংখ্যা
@@ -6941,6 +7010,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,সারি # {0}: আইটেম যোগ করা হয়েছে
 DocType: Student Admission,Eligibility and Details,যোগ্যতা এবং বিবরণ
 DocType: Staffing Plan,Staffing Plan Detail,স্টাফিং পরিকল্পনা বিস্তারিত
+DocType: Shift Type,Late Entry Grace Period,দেরী এন্ট্রি গ্রেস সময়কাল
 DocType: Email Digest,Annual Income,বার্ষিক আয়
 DocType: Journal Entry,Subscription Section,সাবস্ক্রিপশন বিভাগ
 DocType: Salary Slip,Payment Days,পেমেন্ট দিন
@@ -6990,6 +7060,7 @@
 DocType: Journal Entry Account,Account Balance,হিসাবের পরিমান
 DocType: Asset Maintenance Log,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,মেডিকেল সংরক্ষণ
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,চেক-ইনগুলি শিফটে পতনের জন্য লগ প্রকার প্রয়োজন: {0}।
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,ফাঁসি
 DocType: Item,Valuation Method,মূল্যায়ন পদ্ধতি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} বিক্রয় চালানের বিরুদ্ধে {1}
@@ -7074,6 +7145,7 @@
 DocType: Loan Type,Loan Name,ঋণের নাম
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,পেমেন্ট ডিফল্ট মোড সেট করুন
 DocType: Quality Goal,Revision,সংস্করণ
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,শিফট শেষ সময় আগে চেকআউট যত তাড়াতাড়ি (মিনিট) বিবেচনা করা হয়।
 DocType: Healthcare Service Unit,Service Unit Type,সেবা ইউনিট প্রকার
 DocType: Purchase Invoice,Return Against Purchase Invoice,ক্রয় চালান বিরুদ্ধে ফেরত
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,সচেতন জেনারেট করুন
@@ -7229,12 +7301,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,অঙ্গরাগ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,আপনি সংরক্ষণ করার আগে ব্যবহারকারীকে সিরিজ নির্বাচন করতে বাধ্য করতে চাইলে এটি পরীক্ষা করুন। আপনি এই চেক যদি কোন ডিফল্ট থাকবে।
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ভূমিকার ব্যবহারকারীদের হিমায়িত অ্যাকাউন্ট সেট করতে এবং হিমায়িত অ্যাকাউন্টগুলির বিরুদ্ধে অ্যাকাউন্টিং এন্ট্রি তৈরি / সংশোধন করার অনুমতি দেওয়া হয়
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Expense Claim,Total Claimed Amount,মোট দাবি পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশনের জন্য {0} দিনের মধ্যে টাইম স্লট খুঁজে পেতে অক্ষম। {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,মোড়ক উম্মচন
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,আপনার সদস্যতা 30 দিনের মধ্যে মেয়াদ শেষ হয়ে গেলে আপনি কেবল নবায়ন করতে পারেন
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},মান {0} এবং {1} এর মধ্যে হতে হবে
 DocType: Quality Feedback,Parameters,পরামিতি
+DocType: Shift Type,Auto Attendance Settings,অটো উপস্থিতি সেটিংস
 ,Sales Partner Transaction Summary,বিক্রয় অংশীদার লেনদেন সারসংক্ষেপ
 DocType: Asset Maintenance,Maintenance Manager Name,রক্ষণাবেক্ষণ ম্যানেজার নাম
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,আইটেম বিবরণ আনতে এটি প্রয়োজন।
@@ -7326,10 +7400,10 @@
 DocType: Pricing Rule,Validate Applied Rule,প্রয়োগযোগ্য নিয়ম যাচাই করুন
 DocType: Job Card Item,Job Card Item,কাজের কার্ড আইটেম
 DocType: Homepage,Company Tagline for website homepage,ওয়েবসাইট হোমপেজে জন্য কোম্পানি ট্যাগলাইন
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,সূচক {0} এ অগ্রাধিকার {0} জন্য প্রতিক্রিয়া সময় এবং রেজোলিউশন সেট করুন।
 DocType: Company,Round Off Cost Center,রাউন্ড বন্ধ খরচ কেন্দ্র
 DocType: Supplier Scorecard Criteria,Criteria Weight,মানদণ্ড ওজন
 DocType: Asset,Depreciation Schedules,ঘাটতি সূচি
-DocType: Expense Claim Detail,Claim Amount,দাবির পরিমান
 DocType: Subscription,Discounts,ডিসকাউন্ট
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং নিয়ম শর্তাবলী
 DocType: Subscription,Cancelation Date,বাতিল তারিখ
@@ -7357,7 +7431,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,শূন্য মান দেখান
 DocType: Employee Onboarding,Employee Onboarding,কর্মচারী অনবোর্ডিং
 DocType: POS Closing Voucher,Period End Date,মেয়াদ শেষ তারিখ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,উত্স দ্বারা বিক্রয় সুযোগ
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,তালিকায় প্রথম অবকাশ অভিভাবক ডিফল্ট ছুটির অভিপ্রায় হিসাবে সেট করা হবে।
 DocType: POS Settings,POS Settings,পিওএস সেটিংস
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,সমস্ত অ্যাকাউন্ট
@@ -7378,7 +7451,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,সারি # {0}: হার অবশ্যই {1}: {2} ({3} / {4}) হিসাবে একই হতে হবে
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-সি পি আর-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,স্বাস্থ্যসেবা সেবা আইটেম
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,কোন রেকর্ড খুঁজে পাওয়া যায় নি
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,বয়স 3
 DocType: Vital Signs,Blood Pressure,রক্তচাপ
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,টার্গেট
@@ -7422,6 +7494,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,ব্যাচ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,প্রতিরক্ষা
 DocType: Item,Has Batch No,ব্যাচ নেই
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,বিলম্বিত দিন
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Item Variant,Item Variant,আইটেম বৈকল্পিক
 DocType: Training Event Employee,Invited,আমন্ত্রিত
@@ -7443,7 +7516,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","একটি বৈধ Payroll সময়ের মধ্যে শুরু এবং শেষ তারিখগুলি, {0} গণনা করতে পারে না।"
 DocType: POS Profile,Only show Customer of these Customer Groups,শুধুমাত্র এই গ্রাহক গোষ্ঠীর গ্রাহক দেখান
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
-DocType: Service Level,Resolution Time,রেজোলিউশন সময়
+DocType: Service Level Priority,Resolution Time,রেজোলিউশন সময়
 DocType: Grading Scale Interval,Grade Description,গ্রেড বর্ণনা
 DocType: Homepage Section,Cards,তাস
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,মানের সভা মিনিট
@@ -7470,6 +7543,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,সাধারণ লেজারের মত ব্যাংক স্টেটমেন্ট ভারসাম্য
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),স্বাস্থ্যসেবা (বিটা)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,বিক্রয় আদেশ এবং ডেলিভারি নোট তৈরি করতে ডিফল্ট গুদাম
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,সূচক {0} এ প্রতিক্রিয়া সময় {1} রেজোলিউশন সময় থেকে বড় হতে পারে না।
 DocType: Opportunity,Customer / Lead Name,গ্রাহক / লিড নাম
 DocType: Student,EDU-STU-.YYYY.-,Edu-Stu-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,দাবিহীন পরিমাণ
@@ -7516,7 +7590,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,দল এবং ঠিকানা আমদানি
 DocType: Item,List this Item in multiple groups on the website.,ওয়েবসাইটে একাধিক গ্রুপে এই আইটেমটি তালিকাভুক্ত করুন।
 DocType: Request for Quotation,Message for Supplier,সরবরাহকারী জন্য বার্তা
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,{0} আইটেমের জন্য স্টক লেনদেন হিসাবে {0} পরিবর্তন করতে পারা যায় না।
 DocType: Healthcare Practitioner,Phone (R),ফোন (আর)
 DocType: Maintenance Team Member,Team Member,দলের সদস্য
 DocType: Asset Category Account,Asset Category Account,সম্পদ বিভাগ অ্যাকাউন্ট
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 4e010bf..1e2ca86 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Sastanak {0} i faktura prodaje {1} otkazana
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Tvoja e-mail adresa...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Uključi zadane unose u knjigu
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Uključi zadane unose u knjigu
 DocType: Activity Cost,Activity Type,Vrsta aktivnosti
 DocType: Purchase Invoice,Get Advances Paid,Get Advances Paid
 DocType: Company,Gain/Loss Account on Asset Disposal,Račun dobiti / gubitka na raspolaganju
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Platni unosi
 DocType: Employee Education,Class / Percentage,Class / Percentage
 ,Electronic Invoice Register,Elektronski registar faktura
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Broj događaja nakon kojeg se izvršava posljedica.
 DocType: Sales Invoice,Is Return (Credit Note),Da li je povratak (kreditna napomena)
+DocType: Price List,Price Not UOM Dependent,Price Not UOM Dependent
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Net Pay
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Ukupno fakturirano Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Potrošni materijal Faktura odvojeno
+DocType: Shift Type,Working Hours Threshold for Absent,Prag radnog vremena za odsustvo
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Budžet ne može biti dodijeljen grupi računa {0}
 DocType: Purchase Receipt Item,Rate and Amount,Stopa i iznos
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Asset,Insurance End Date,Datum završetka osiguranja
 DocType: Bank Account,Branch Code,Branch Code
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Vreme za odgovor
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Forum korisnika
 DocType: Landed Cost Item,Landed Cost Item,Stavka selene cijene
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Prodavac i kupac ne mogu biti isti
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Stavka pretraživanja (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Rezultat je poslan
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od datuma ne može biti veći od datuma Do
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Ime novog računa. Napomena: Molimo vas da ne stvarate račune za kupce i dobavljače
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentska grupa ili raspored kursa je obavezan
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Ime veštine
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Print Report Card
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Podesite Naming Series za {0} preko Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Support Tickets
 DocType: Asset Category Account,Fixed Asset Account,Račun fiksnih sredstava
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Najnoviji
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obavezno za bilans stanja
 DocType: Payment Entry,Total Allocated Amount,Ukupni dodijeljeni iznos
 DocType: Sales Invoice,Get Advances Received,Dobili napredak
+DocType: Shift Type,Last Sync of Checkin,Last Sync of Checkin
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Stavka Iznos poreza uključen u vrijednost
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Krvna grupa
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Izrezivanje razmaka UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Vrijeme nakon početka smjene, kada se check-in smatra zakašnjenjem (u minutama)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Istražiti
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Nisu pronađene nepodmirene fakture
 DocType: Promotional Scheme,Product Discount Slabs,Ploče s popustima za proizvode
 DocType: Hotel Room Package,Amenities,Amenities
 DocType: Lab Test Groups,Add Test,Dodaj test
@@ -1004,6 +1009,7 @@
 DocType: Item,Moving Average,Moving Average
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačeno prisustvo
 DocType: Homepage Section,Number of Columns,Broj stupaca
+DocType: Issue Priority,Issue Priority,Prioritet problema
 DocType: Holiday List,Add Weekly Holidays,Add Weekly Holidays
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Napravite ispis plata
@@ -1012,6 +1018,7 @@
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći niti jedan paket koji ispunjava ovaj zahtjev
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Ne može se stvoriti bonus za zadržavanje za lijeve zaposlenike
+DocType: Employee Checkin,Location / Device ID,Lokacija / ID uređaja
 DocType: Purchase Order,To Receive,Primiti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Nalazite se u izvanmrežnom načinu rada. Nećete moći ponovo učitati sve dok ne dobijete mrežu.
 DocType: Course Activity,Enrollment,Upis
@@ -1020,7 +1027,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informacije o elektronskom fakturiranju nedostaju
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nije napravljen nikakav zahtjev za materijal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Šifra artikla&gt; Item Group&gt; Brand
 DocType: Loan,Total Amount Paid,Ukupno plaćeni iznos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Sve ove stavke su već fakturirane
 DocType: Training Event,Trainer Name,Ime trenera
@@ -1131,6 +1137,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Navedite ime olova u olovu {0}
 DocType: Employee,You can enter any date manually,Možete uneti bilo koji datum ručno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stavka pomirenja zaliha
+DocType: Shift Type,Early Exit Consequence,Ranija izlazna posljedica
 DocType: Item Group,General Settings,General Settings
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Datum dospijeća ne može biti prije knjiženja / datuma fakture dobavljača
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Unesite ime Korisnika prije podnošenja.
@@ -1169,6 +1176,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Potvrda plaćanja
 ,Available Stock for Packing Items,Raspoloživa zaliha za pakovanje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Uklonite ovaj račun {0} iz C-obrasca {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Svaka validna prijava i odjava
 DocType: Support Search Source,Query Route String,Niz upita za rutu
 DocType: Customer Feedback Template,Customer Feedback Template,Obrazac za povratne informacije o klijentima
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citati za vode ili klijente.
@@ -1203,6 +1211,7 @@
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 ,Daily Work Summary Replies,Dnevni rad Sažetak odgovora
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Pozvani ste da sarađujete na projektu: {0}
+DocType: Issue,Response By Variance,Response By Variance
 DocType: Item,Sales Details,Sales Details
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Letter Heads za predloške za ispis.
 DocType: Salary Detail,Tax on additional salary,Porez na dodatnu platu
@@ -1326,6 +1335,7 @@
 DocType: Project,Task Progress,Task Progress
 DocType: Journal Entry,Opening Entry,Otvaranje unosa
 DocType: Bank Guarantee,Charges Incurred,Naplata troškova
+DocType: Shift Type,Working Hours Calculation Based On,Kalkulacija radnih sati na osnovu
 DocType: Work Order,Material Transferred for Manufacturing,Preneseni materijal za proizvodnju
 DocType: Products Settings,Hide Variants,Sakrij varijante
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Onemogućite planiranje kapaciteta i praćenje vremena
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,Interesi
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošena količina
 DocType: Education Settings,Education Manager,Education Manager
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planirajte dnevnike vremena izvan radnog vremena radne stanice.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Bodovi lojalnosti: {0}
 DocType: Healthcare Settings,Registration Message,Registration Message
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Faktura je već kreirana za sve obračunske sate
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Purchase Invoice,Pricing Rules,Pravila o cijenama
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Budući da postoje postojeće transakcije protiv stavke {0}, ne možete promijeniti vrijednost {1}"
 DocType: Hub Tracked Item,Image List,Lista slika
 DocType: Item Variant Settings,Allow Rename Attribute Value,Dopusti promjenu vrijednosti atributa
-DocType: Price List,Price Not UOM Dependant,Price Not UOM Dependent
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Vrijeme (u min)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Basic
 DocType: Loan,Interest Income Account,Račun prihoda od kamata
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Izaberite POS profil
 DocType: Support Settings,Get Latest Query,Nabavite najnoviji upit
 DocType: Employee Incentive,Employee Incentive,Podsticaj za zaposlene
+DocType: Service Level,Priorities,Prioriteti
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Dodajte kartice ili prilagođene sekcije na početnu stranicu
 DocType: Homepage,Hero Section Based On,Hero Section Based On
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupni troškovi nabavke (putem fakture kupovine)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijena skladišta je obavezna za odbijenu stavku {1}
 ,Received Items To Be Billed,Primljene stavke za naplatu
-DocType: Salary Slip Timesheet,Working Hours,Radni sati
+DocType: Attendance,Working Hours,Radni sati
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Stavke narudžbenice nisu primljene na vrijeme
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Trajanje u danima
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonske informacije i ostale opšte informacije o Vašem dobavljaču
 DocType: Item Default,Default Selling Cost Center,Default Selling Cost Center
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite nizove brojeva za Prisustvo putem Podešavanja&gt; Brojčane serije
 DocType: Subscriber,Subscriber,Pretplatnik
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) nema na skladištu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Prvo odaberite Datum knjiženja
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,Tasks Created
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivna za ovu stavku ili njen predložak
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Stopa provizije%
-DocType: Service Level,Response Time,Vrijeme odziva
+DocType: Service Level Priority,Response Time,Vrijeme odziva
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Količina mora biti pozitivna
 DocType: Contract,CRM,CRM
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Mapiranje podataka o transakcijama
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Olovo zahtijeva ili ime osobe ili ime organizacije
 DocType: Student,Guardians,Čuvari
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Molimo vas da podesite Sistem za imenovanje instruktora u obrazovanju&gt; Postavke obrazovanja
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Izaberite brend ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Middle Income
 DocType: Shipping Rule,Calculate Based On,Izračunajte na osnovu
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Zapisnik o prisustvu {0} postoji protiv studenta {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Datum transakcije
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Otkaži pretplatu
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Nije moguće postaviti sporazum o razini usluge {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Iznos neto zarade
 DocType: Account,Liability,Odgovornost
 DocType: Employee,Bank A/C No.,Bank A / C No.
@@ -1701,7 +1712,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Šifra artikla sirovine
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Faktura kupovine {0} je već poslana
 DocType: Fees,Student Email,Student Email
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BUR rekurzija: {0} ne može biti roditelj ili dijete {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Nabavite artikle iz zdravstvenih usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Unos dionica {0} nije dostavljen
 DocType: Item Attribute Value,Item Attribute Value,Vrijednost atributa stavke
@@ -1726,7 +1736,6 @@
 DocType: Production Plan,Select Items to Manufacture,Izaberite stavke za proizvodnju
 DocType: Leave Application,Leave Approver Name,Ostavite ime odobrenja
 DocType: Shareholder,Shareholder,Akcionar
-DocType: Issue,Agreement Status,Status sporazuma
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Podrazumevane postavke za transakcije prodaje.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Molimo odaberite Prijem studenata koji je obavezan za plaćenog studenta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Izaberite BOM
@@ -1989,6 +1998,7 @@
 DocType: Account,Income Account,Račun prihoda
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,All Warehouses
 DocType: Contract,Signee Details,Signee Details
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Omogući odjavu nakon završetka smjene (u minutima)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Nabavka
 DocType: Item Group,Check this if you want to show in website,Označite ovo ako želite prikazati na web stranici
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
@@ -2055,6 +2065,7 @@
 DocType: Activity Cost,Billing Rate,Stopa naplate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: Još jedna {0} # {1} postoji protiv stavke zaliha {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Omogućite Google Maps Settings za procjenu i optimizaciju ruta
+DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Supplier Scorecard Criteria,Max Score,Max Score
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Datum početka otplate ne može biti prije datuma isplate.
 DocType: Support Search Source,Support Search Source,Support Search Source
@@ -2123,6 +2134,7 @@
 DocType: Employee Transfer,Employee Transfer,Transfer zaposlenih
 ,Sales Funnel,Prodajni tok
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Započnite prijavu prije početka smjene (u minutama)
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Nema ništa za uređivanje.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Rad {0} duži od bilo kojeg raspoloživog radnog vremena na radnoj stanici {1}, razbiti operaciju u više operacija"
@@ -2136,7 +2148,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Prodajni nalog {0} je {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Odlaganje plaćanja (Dani)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Unesite detalje amortizacije
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Korisnička PO
 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 prodajnog naloga
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Količina artikla ne može biti nula
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Nevažeći atribut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Odaberite BOM protiv stavke {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tip fakture
@@ -2146,6 +2160,7 @@
 DocType: Volunteer,Afternoon,Popodne
 DocType: Vital Signs,Nutrition Values,Nutrition Values
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prisustvo groznice (temp&gt; 38,5 ° C / 101,3 ° F ili produžena temp&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sistem za imenovanje zaposlenika u ljudskim resursima&gt; Postavke ljudskih resursa
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Reversed
 DocType: Project,Collect Progress,Collect Progress
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energija
@@ -2196,6 +2211,7 @@
 ,Ordered Items To Be Billed,Naređene stavke za naplatu
 DocType: Taxable Salary Slab,To Amount,To Amount
 DocType: Purchase Invoice,Is Return (Debit Note),Da li je povratak (zaduženje)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička grupa&gt; Teritorija
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Počinjemo
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Spoji
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nije moguće promijeniti datum početka fiskalne godine i datum završetka fiskalne godine nakon spremanja fiskalne godine.
@@ -2214,8 +2230,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Datum početka održavanja ne može biti prije datuma isporuke za serijski broj {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Red {0}: Tečaj je obavezan
 DocType: Purchase Invoice,Select Supplier Address,Izaberite adresu dobavljača
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Dostupna količina je {0}, trebate {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Unesite tajnu API potrošača
 DocType: Program Enrollment Fee,Program Enrollment Fee,Naknada za upis programa
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,Datum isteka garancije
 DocType: Hotel Room Pricing,Hotel Room Pricing,Cijene hotelskih soba
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Spoljne oporezive isporuke (osim nultih, nultih i oslobođenih)"
@@ -2275,6 +2293,7 @@
 DocType: Quality Inspection Reading,Reading 5,Čitanje 5
 DocType: Shopping Cart Settings,Display Settings,Display Settings
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Postavite broj knjiženih amortizacija
+DocType: Shift Type,Consequence after,Posledica posle
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Za šta ti treba pomoć?
 DocType: Journal Entry,Printing Settings,Printing Settings
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bankarstvo
@@ -2284,6 +2303,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Adresa za naplatu je ista kao i adresa za dostavu
 DocType: Account,Cash,Gotovina
 DocType: Employee,Leave Policy,Leave Policy
+DocType: Shift Type,Consequence,Posljedica
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Student Address
 DocType: GST Account,CESS Account,CESS nalog
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centar troška je potreban za račun &#39;Profit i gubitak&#39; {2}. Postavite podrazumevani centar troškova za kompaniju.
@@ -2348,6 +2368,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Period za zatvaranje vaučera
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Ime Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Unesite račun troška
+DocType: Issue,Resolution By Variance,Rezolucija po varijansi
 DocType: Employee,Resignation Letter Date,Datum ostavke
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Prisustvo na datum
@@ -2360,6 +2381,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Prikaži sada
 DocType: Item Price,Valid Upto,Valid Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Reference Doctype mora biti jedna od {0}
+DocType: Employee Checkin,Skip Auto Attendance,Preskoči Auto Attendance
 DocType: Payment Request,Transaction Currency,Valuta transakcije
 DocType: Loan,Repayment Schedule,Raspored otplate
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Napravite unos zaliha uzorka
@@ -2431,6 +2453,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Porez na vaučer za zatvaranje POS-a
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Postupak inicijalizovan
 DocType: POS Profile,Applicable for Users,Primjenjivo za korisnike
+,Delayed Order Report,Izveštaj o odloženoj narudžbi
 DocType: Training Event,Exam,Ispit
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Neispravan broj pronađenih unosa glavne knjige. Možda ste u transakciji izabrali pogrešan račun.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Prodaja naftovoda
@@ -2445,10 +2468,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Uslovi će se primjenjivati na sve odabrane stavke zajedno.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configure
 DocType: Hotel Room,Capacity,Kapacitet
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Installed Qty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Paket {0} stavke {1} je onemogućen.
 DocType: Hotel Room Reservation,Hotel Reservation User,Korisnik rezervacije hotela
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Radni dan je ponovljen dva puta
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ugovor o nivou usluge sa tipom entiteta {0} i entitetom {1} već postoji.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Grupa stavki koja nije navedena u glavnom stavku za stavku {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Greška imena: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Teritorija je obavezna u POS profilu
@@ -2496,6 +2520,7 @@
 DocType: Depreciation Schedule,Schedule Date,Datum rasporeda
 DocType: Packing Slip,Package Weight Details,Detalji o težini paketa
 DocType: Job Applicant,Job Opening,Otvaranje posla
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Poslednja poznata uspješna sinkronizacija zaposlenika Checkin. Poništite ovo samo ako ste sigurni da su svi zapisi sinkronizirani sa svih lokacija. Molimo vas da ne menjate ovo ako niste sigurni.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Stvarna cijena
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupni napredak ({0}) protiv narudžbe {1} ne može biti veći od ukupnog iznosa ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Stavka Varijante su ažurirane
@@ -2540,6 +2565,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Get Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Da li su podaci o dnevnoj knjizi uvezeni
 ,Sales Partners Commission,Sales Partners Commission
+DocType: Shift Type,Enable Different Consequence for Early Exit,Omogući različite posledice za rani izlazak
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Legal
 DocType: Loan Application,Required by Date,Potrebno po datumu
 DocType: Quiz Result,Quiz Result,Rezultat kviza
@@ -2599,7 +2625,6 @@
 DocType: Pricing Rule,Pricing Rule,Pravilo o cenama
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Neobavezna lista praznika nije postavljena za period odlaska {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Postavite polje ID korisnika u zapis zaposlenika da biste postavili ulogu zaposlenika
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Vrijeme je za rješavanje
 DocType: Training Event,Training Event,Training Event
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normalan krvni pritisak kod odrastanja je oko 120 mmHg sistolički i 80 mmHg dijastolički, skraćeno &quot;120/80 mmHg&quot;."
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Sistem će dohvatiti sve unose ako je granična vrijednost nula.
@@ -2643,6 +2668,7 @@
 DocType: Student Applicant,Approved,Odobreno
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma treba da bude u okviru fiskalne godine. Pretpostavljajući od datuma = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Podesite grupu dobavljača u postavkama kupovine.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} je nevažeći status prisutnosti.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Privremeni otvarajući račun
 DocType: Purchase Invoice,Cash/Bank Account,Novčani / bankovni račun
 DocType: Quality Meeting Table,Quality Meeting Table,Tabela kvaliteta sastanka
@@ -2678,6 +2704,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Hrana, piće i duhan"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Raspored kursa
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Prisustvo će biti automatski označeno tek nakon tog datuma.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Potrošnja za UIN nosioce
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Zahtev za ponudu
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon unosa neke druge valute
@@ -2726,7 +2753,6 @@
 DocType: Item,Is Item from Hub,Je stavka iz čvorišta
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Procedura kvaliteta.
 DocType: Share Balance,No of Shares,Broj dionica
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Količina nije dostupna za {4} u skladištu {1} u vrijeme objavljivanja unosa ({2} {3})
 DocType: Quality Action,Preventive,Preventivno
 DocType: Support Settings,Forum URL,URL foruma
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Zaposleni i prisutni
@@ -2948,7 +2974,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Podrazumevani porezi i naknade
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Ovo se zasniva na transakcijama protiv ovog dobavljača. Za detalje pogledajte vremensku liniju ispod
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimalni iznos naknade zaposlenika {0} premašuje {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Unesite datum početka i završetka ugovora.
 DocType: Delivery Note Item,Against Sales Invoice,Protiv fakture prodaje
 DocType: Loyalty Point Entry,Purchase Amount,Iznos kupovine
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Nije moguće postaviti kao Izgubljeno kao prodajni nalog.
@@ -2972,7 +2997,7 @@
 DocType: Lead,Organization Name,Ime organizacije
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Važeća i valjana polja upto su obavezna za kumulativ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Serijski broj mora biti isti kao i {1} {2}
-DocType: Employee,Leave Details,Ostavite detalje
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Stock transakcije prije {0} su zamrznute
 DocType: Driver,Issuing Date,Datum izdavanja
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Requestor
@@ -3017,9 +3042,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalji šablona mapiranja novčanog toka
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Zapošljavanje i obuka
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Podešavanja Grace perioda za automatsko pozivanje
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Iz valute i valute ne može biti isto
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Pharmaceuticals
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Sati podrške
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Red {0}: avans protiv klijenta mora biti kredit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grupisanje po vaučeru (Konsolidovano)
@@ -3129,6 +3156,7 @@
 DocType: Territory,Territory Manager,Upravnik teritorija
 DocType: Lab Test,Sample ID,Sample ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Košarica je prazna
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Pohađanje je označeno po prijavama za zaposlene
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Imovina {0} mora biti poslata
 ,Absent Student Report,Odsutni studentski izvještaj
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Uključeno u bruto profit
@@ -3136,7 +3164,9 @@
 DocType: Travel Request Costing,Funded Amount,Finansirani iznos
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nije poslata tako da se akcija ne može dovršiti
 DocType: Subscription,Trial Period End Date,Datum završetka probnog perioda
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Naizmjenični unosi kao IN i OUT tijekom iste smjene
 DocType: BOM Update Tool,The new BOM after replacement,Nova BOM nakon zamjene
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Tačka 5
 DocType: Employee,Passport Number,Broj pasoša
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Privremeno otvaranje
@@ -3252,6 +3282,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Mogući dobavljač
 ,Issued Items Against Work Order,Izdate stavke protiv radnog naloga
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Kreiranje {0} fakture
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Molimo vas da podesite Sistem za imenovanje instruktora u obrazovanju&gt; Postavke obrazovanja
 DocType: Student,Joining Date,Datum pridruživanja
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Requesting Site
 DocType: Purchase Invoice,Against Expense Account,Protiv računa troškova
@@ -3291,6 +3322,7 @@
 DocType: Landed Cost Item,Applicable Charges,Primjenjive naknade
 ,Point of Sale,Mjestu prodaje
 DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnika (iznad ovlaštene vrijednosti)
+DocType: Service Level Agreement,Entity,Entitet
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projektu {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Od imena stranke
@@ -3337,6 +3369,7 @@
 DocType: Soil Texture,Sand Composition (%),Sastav pijeska (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Uvoz podataka o knjizi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Podesite Naming Series za {0} preko Setup&gt; Settings&gt; Naming Series
 DocType: Asset,Asset Owner Company,Društvo vlasnika imovine
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Mjesto troška je potrebno za knjiženje troškova potraživanja
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} važeći serijski broj za stavku {1}
@@ -3397,7 +3430,6 @@
 DocType: Asset,Asset Owner,Vlasnik imovine
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obavezno za zalihu Stavka {0} u redu {1}
 DocType: Stock Entry,Total Additional Costs,Ukupni dodatni troškovi
-DocType: Marketplace Settings,Last Sync On,Poslednja sinhronizacija uključena
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Postavite najmanje jedan red u tabeli Porezi i naknade
 DocType: Asset Maintenance Team,Maintenance Team Name,Ime tima za održavanje
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Grafikon centara troškova
@@ -3413,12 +3445,12 @@
 DocType: Job Card,WIP Warehouse,WIP skladište
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID korisnika nije postavljen za zaposlenika {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Dostupan broj je {0}, potrebno je {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Korisnik {0} je kreiran
 DocType: Stock Settings,Item Naming By,Item Naming By
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Naručeno
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ovo je glavna korisnička grupa i ne može se uređivati.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Zahtjev za materijal {0} je otkazan ili zaustavljen
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Strogo se zasniva na Log Type u Checking zaposlenika
 DocType: Purchase Order Item Supplied,Supplied Qty,Priložena količina
 DocType: Cash Flow Mapper,Cash Flow Mapper,Kartiranje novčanog toka
 DocType: Soil Texture,Sand,Sand
@@ -3477,6 +3509,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Udvostručena grupa stavki pronađena u tablici grupe stavki
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Godišnja plata
 DocType: Supplier Scorecard,Weighting Function,Funkcija utega
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzijski faktor ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Pogreška pri ocjeni formule kriterija
 ,Lab Test Report,Lab Test Report
 DocType: BOM,With Operations,Sa operacijama
@@ -3490,6 +3523,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Nema otplate za unos dnevnika
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} je neaktivan student
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Napravite unos zaliha
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BUR rekurzija: {0} ne može biti roditelj ili dijete {1}
 DocType: Employee Onboarding,Activities,Aktivnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Najmanje jedno skladište je obavezno
 ,Customer Credit Balance,Kreditni saldo kupca
@@ -3502,9 +3536,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Pronašli smo više programa lojalnosti za klijenta. Odaberite ručno.
 DocType: Patient,Medication,Lijekovi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Izaberite Program lojalnosti
+DocType: Employee Checkin,Attendance Marked,Obilježeno prisustvo
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Sirovine
 DocType: Sales Order,Fully Billed,Fully Billed
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Molimo vas da postavite cijenu za hotelsku sobu na {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Izaberite samo jedan prioritet kao podrazumevani.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Molimo identifikujte / kreirajte račun (knjiga) za tip - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Ukupni iznos kredita / zaduženja treba biti isti kao i unos u dnevnik
 DocType: Purchase Invoice Item,Is Fixed Asset,Is Fixed Asset
@@ -3525,6 +3561,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Potvrda o sastanku
 DocType: Shopping Cart Settings,Orders,Orders
 DocType: HR Settings,Retirement Age,Dob umirovljenja
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite nizove brojeva za Prisustvo putem Podešavanja&gt; Brojčane serije
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Projected Qty
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Brisanje nije dopušteno za zemlju {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} je već {2}
@@ -3608,11 +3645,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovođa
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Naknada za kupovinu POS-a postoji za {0} između datuma {1} i {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navigacija
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Nijedna otvorena faktura ne zahtijeva revalorizaciju tečaja
 DocType: Authorization Rule,Customer / Item Name,Naziv kupca / predmeta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljeno putem unosa zaliha ili kupovine
 DocType: Issue,Via Customer Portal,Preko korisničkog portala
 DocType: Work Order Operation,Planned Start Time,Planirano vrijeme početka
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
+DocType: Service Level Priority,Service Level Priority,Prioritet nivoa usluge
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj knjiženih amortizacija ne može biti veći od ukupnog broja amortizacije
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Podijeli Ledger
 DocType: Journal Entry,Accounts Payable,Dugovanja
@@ -3723,7 +3762,6 @@
 DocType: Delivery Note,Delivery To,Dostava Za
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bank Data
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Scheduled Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Održavajte sate za naplatu i radno vrijeme na listi
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Vodeći tragovi vodećeg izvora.
 DocType: Clinical Procedure,Nursing User,Nursing User
 DocType: Support Settings,Response Key List,Lista ključnih odgovora
@@ -3891,6 +3929,7 @@
 DocType: Work Order Operation,Actual Start Time,Stvarno vrijeme početka
 DocType: Antibiotic,Laboratory User,Korisnik laboratorija
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online Auctions
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Ponovljen je prioritet {0}.
 DocType: Fee Schedule,Fee Creation Status,Status stvaranja naknade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Softwares
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Prodajni nalog do plaćanja
@@ -3957,6 +3996,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Nije moguće dohvatiti informacije za {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Valuta za naplatu mora biti jednaka ili zadanoj valuti kompanije ili valuti stranaka računa
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Molimo vas da unesete ID zaposlenika ovog prodavača
+DocType: Shift Type,Early Exit Consequence after,Rane izlaze nakon
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Napravite otvaranje faktura prodaje i kupovine
 DocType: Disease,Treatment Period,Period liječenja
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Podešavanje e-pošte
@@ -3974,7 +4014,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Ime studenta:
 DocType: SMS Log,Sent On,Sent On
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Faktura prodaje
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Vreme reakcije ne može biti veće od vremena rezolucije
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za studentsku grupu zasnovanu na kursu, kurs će biti validiran za svakog studenta sa upisanih kurseva u upis u program."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Unutrašnja oprema
 DocType: Employee,Create User Permission,Kreiranje korisničke dozvole
@@ -4013,6 +4052,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standardni uslovi ugovora za prodaju ili kupovinu.
 DocType: Sales Invoice,Customer PO Details,Detalji o korisničkom PO-u
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacijent nije pronađen
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Izaberite podrazumevani prioritet.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Uklonite stavku ako naplata nije primjenjiva na tu stavku
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Postoji korisnička grupa sa istim imenom, promijenite ime klijenta ili preimenujte korisničku grupu"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4052,6 +4092,7 @@
 DocType: Support Settings,Support Portal,Portal za podršku
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Datum završetka zadatka <b>{0}</b> ne može biti manji od <b>{1}</b> očekivanog datuma početka <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Zaposleni {0} je na ostavi na {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Ovaj ugovor o nivou usluge je specifičan za klijenta {0}
 DocType: Employee,Held On,Održanoj
 DocType: Healthcare Practitioner,Practitioner Schedules,Raspored praktičara
 DocType: Project Template Task,Begin On (Days),Počni (dana)
@@ -4059,6 +4100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Radni nalog je bio {0}
 DocType: Inpatient Record,Admission Schedule Date,Datum upisa
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Podešavanje vrednosti imovine
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Označite prisustvo na osnovu &#39;Check-inja zaposlenika&#39; za zaposlene koji su dodijeljeni ovoj smjeni.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Potrošni materijal za neregistrovana lica
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,All Jobs
 DocType: Appointment Type,Appointment Type,Tip sastanka
@@ -4172,7 +4214,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + težina ambalaže. (za štampu)
 DocType: Plant Analysis,Laboratory Testing Datetime,Datetime test laboratorijskog testiranja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Stavka {0} ne može imati paket
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Prodaja naftovoda po stadijima
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Snaga studentske grupe
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Unos transakcije bankovnog izvoda
 DocType: Purchase Order,Get Items from Open Material Requests,Nabavite stavke iz zahtjeva otvorenog materijala
@@ -4254,7 +4295,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Show Aging Warehouse-wise
 DocType: Sales Invoice,Write Off Outstanding Amount,Ispisivanje izvanrednog iznosa
 DocType: Payroll Entry,Employee Details,Detalji o zaposlenima
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Vrijeme početka ne može biti veće od završnog vremena za {0}.
 DocType: Pricing Rule,Discount Amount,Iznos popusta
 DocType: Healthcare Service Unit Type,Item Details,Detalji detalja
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Duplicirana porezna deklaracija {0} za period {1}
@@ -4307,7 +4347,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Neto plata ne može biti negativna
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Broj interakcija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Red {0} # Stavka {1} ne može se prenijeti više od {2} na narudžbenicu narudžbe {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Obrada kontnog plana i strana
 DocType: Stock Settings,Convert Item Description to Clean HTML,Pretvori opis stavke u Clean HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Sve grupe dobavljača
@@ -4378,6 +4418,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Jedinica za podršku roditelja
 DocType: Sales Invoice,Include Payment (POS),Uključi plaćanje (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Private Equity
+DocType: Shift Type,First Check-in and Last Check-out,Prva prijava i posljednja odjava
 DocType: Landed Cost Item,Receipt Document,Dokument o prijemu
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Period Scorecard dobavljača
 DocType: Employee Grade,Default Salary Structure,Default Salary Structure
@@ -4460,6 +4501,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Napravite narudžbenicu
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definišite budžet za finansijsku godinu.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Tabela računa ne može biti prazna.
+DocType: Employee Checkin,Entry Grace Period Consequence,Posledica ulaska u Grace period
 ,Payment Period Based On Invoice Date,Period plaćanja na osnovu datuma fakture
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Datum instalacije ne može biti prije datuma isporuke za stavku {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Veza na Zahtjev materijala
@@ -4468,6 +4510,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: stavka za promjenu redoslijeda već postoji za ovo skladište {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Datum
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Radni dan {0} je ponovljen.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Grupa u grupi koja nije grupa
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Ažuriranje je u toku. Može potrajati.
 DocType: Item,"Example: ABCD.#####
@@ -4480,6 +4523,7 @@
 DocType: Vehicle Log,Fuel Qty,Količina goriva
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Isplaceno
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Vrijeme nakon završetka smjene tijekom kojeg se smatra da je check-out prisutan.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Neto promjena na računima
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nije dostupno
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Pola radnog vremena
@@ -4493,7 +4537,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Prikaži PDC u ispisu
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Supplier
 DocType: POS Profile User,POS Profile User,Korisnik POS profila
-DocType: Student,Middle Name,Srednje ime
 DocType: Sales Person,Sales Person Name,Ime prodavača
 DocType: Packing Slip,Gross Weight,Bruto težina
 DocType: Journal Entry,Bill No,Bill No
@@ -4502,7 +4545,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.- \ t
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Ugovor o nivou usluge
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Prvo odaberite zaposlenika i datum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Stopa vrednovanja pozicije se preračunava uzimajući u obzir iznos vaučera za zemljišne troškove
 DocType: Timesheet,Employee Detail,Detalji o zaposlenima
 DocType: Tally Migration,Vouchers,Vaučeri
@@ -4537,7 +4579,7 @@
 DocType: Additional Salary,Date on which this component is applied,Datum na koji se primjenjuje ova komponenta
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Spisak dostupnih akcionara sa brojevima brojeva
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Podešavanje Gateway naloga.
-DocType: Service Level,Response Time Period,Period odgovora
+DocType: Service Level Priority,Response Time Period,Period odgovora
 DocType: Purchase Invoice,Purchase Taxes and Charges,Porezi i naknade za kupovinu
 DocType: Course Activity,Activity Date,Datum aktivnosti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Izaberite ili dodajte novog kupca
@@ -4562,6 +4604,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Finansijska godina
 DocType: Sales Invoice Item,Deferred Revenue,Odloženi prihod
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,"U svakom slučaju, mora se odabrati jedna od prodaja ili kupovina"
+DocType: Shift Type,Working Hours Threshold for Half Day,Prag rada za pola dana
 ,Item-wise Purchase History,Povijest nabavke
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Nije moguće promijeniti Service Stop Date za stavku u retku {0}
 DocType: Production Plan,Include Subcontracted Items,Uključite stavke podugovora
@@ -4594,6 +4637,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Dozvoli istu stavku više puta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Napravite BOM
 DocType: Healthcare Practitioner,Charges,Charges
+DocType: Employee,Attendance and Leave Details,Pohađanje i ostavljanje detalja
 DocType: Student,Personal Details,Lični podaci
 DocType: Sales Order,Billing and Delivery Status,Status naplate i isporuke
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljača {0} Email adresa je potrebna za slanje e-pošte
@@ -4645,7 +4689,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Unesite vrijednost između {0} i {1}
 DocType: Purchase Order,Order Confirmation Date,Datum potvrde narudžbe
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Izračunajte procijenjeno vrijeme dolaska
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite Sistem za imenovanje zaposlenika u ljudskim resursima&gt; Postavke ljudskih resursa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Potrošni
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Datum početka pretplate
@@ -4668,7 +4711,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Account Entry Account
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forum Activity
-DocType: Service Level,Resolution Time Period,Vremenski period rezolucije
+DocType: Service Level Priority,Resolution Time Period,Vremenski period rezolucije
 DocType: Request for Quotation,Supplier Detail,Detalje dobavljača
 DocType: Project Task,View Task,Prikaži zadatak
 DocType: Serial No,Purchase / Manufacture Details,Detalji kupovine / proizvodnje
@@ -4735,6 +4778,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo putem ulaska / isporuke dionica / potvrde o kupnji
 DocType: Support Settings,Close Issue After Days,Zatvori pitanje posle dana
 DocType: Payment Schedule,Payment Schedule,Raspored plaćanja
+DocType: Shift Type,Enable Entry Grace Period,Omogući početni period ulaska
 DocType: Patient Relation,Spouse,Supružnik
 DocType: Purchase Invoice,Reason For Putting On Hold,Razlog za stavljanje na čekanje
 DocType: Item Attribute,Increment,Povećanje
@@ -4874,6 +4918,7 @@
 DocType: Vehicle Log,Invoice Ref,Račun Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-obrazac nije primjenjiv za fakturu: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Račun je izrađen
+DocType: Shift Type,Early Exit Grace Period,Rani izlazak Grace Period
 DocType: Patient Encounter,Review Details,Detalji pregleda
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Red {0}: Vrijednost sata mora biti veća od nule.
 DocType: Account,Account Number,Broj računa
@@ -4885,7 +4930,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Primjenjivo ako je tvrtka SpA, SApA ili SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Uslovi preklapanja pronađeni između:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Plaćeno i nije isporučeno
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Šifra artikla je obavezna jer stavka nije automatski numerisana
 DocType: GST HSN Code,HSN Code,HSN kod
 DocType: GSTR 3B Report,September,Septembar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administrativni troškovi
@@ -4921,6 +4965,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP račun
 DocType: SMS Log,Sender Name,Ime pošiljatelja
 DocType: Pricing Rule,Supplier Group,Group dobavljača
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Postavite Početno vrijeme i Vrijeme završetka za Dan podrške {0} u indeksu {1}.
 DocType: Employee,Date of Issue,Datum izdavanja
 ,Requested Items To Be Transferred,Tražene stavke koje treba prenijeti
 DocType: Employee,Contract End Date,Datum završetka ugovora
@@ -4931,6 +4977,7 @@
 DocType: Opportunity,Sales Stage,Sales Stage
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Words će biti vidljive kada sačuvate prodajni nalog.
 DocType: Item Reorder,Re-order Level,Nivo re-reda
+DocType: Shift Type,Enable Auto Attendance,Omogući automatsko pozivanje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Preference
 ,Department Analytics,Department Analytics
 DocType: Crop,Scientific Name,Naučno ime
@@ -4943,6 +4990,7 @@
 DocType: Quiz Activity,Quiz Activity,Quiz Activity
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} nije u važećem periodu isplate
 DocType: Timesheet,Billed,Naplaćeno
+apps/erpnext/erpnext/config/support.py,Issue Type.,Type Type.
 DocType: Restaurant Order Entry,Last Sales Invoice,Posljednja faktura prodaje
 DocType: Payment Terms Template,Payment Terms,Uslovi plaćanja
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervirano Količina: Količina naručena za prodaju, ali ne isporučena."
@@ -5038,6 +5086,7 @@
 DocType: Account,Asset,Asset
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} nema raspored zdravstvenih radnika. Dodajte ga u majstora zdravstvene prakse
 DocType: Vehicle,Chassis No,Chassis No
+DocType: Employee,Default Shift,Default Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Skraćenica kompanije
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Drvo materijala
 DocType: Article,LMS User,LMS User
@@ -5086,6 +5135,7 @@
 DocType: Sales Person,Parent Sales Person,Matična prodajna osoba
 DocType: Student Group Creation Tool,Get Courses,Get Courses
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti 1, jer je stavka fiksno sredstvo. Molimo koristite poseban red za višestruke količine."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Radno vrijeme ispod kojeg je Absent označen. (Nula do onemogućavanja)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo su čvorovi listova dozvoljeni u transakciji
 DocType: Grant Application,Organization,Organizacija
 DocType: Fee Category,Fee Category,Kategorija naknade
@@ -5098,6 +5148,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Ažurirajte svoj status za ovaj trening događaj
 DocType: Volunteer,Morning,Jutro
 DocType: Quotation Item,Quotation Item,Stavka ponude
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Prioritet problema.
 DocType: Journal Entry,Credit Card Entry,Unos kreditne kartice
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Vremenski razmak je preskočen, slot {0} do {1} preklapa postojeći slot {2} do {3}"
 DocType: Journal Entry Account,If Income or Expense,Ako je prihod ili trošak
@@ -5148,11 +5199,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Uvoz podataka i postavke
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Ako je označena opcija Auto Opt In, klijenti će se automatski povezati sa dotičnim programom lojalnosti (ušteda)"
 DocType: Account,Expense Account,Račun troškova
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Vreme pre početka smene, tokom kojeg se smatra da je zaposlenje Check-in za prisustvo."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Odnos sa Guardian-om1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Napravite fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Zaposleni oslobođen od {0} mora biti postavljen kao &quot;Lijevo&quot;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Plati {0} {1}
+DocType: Company,Sales Settings,Postavke prodaje
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Zahtevu za ponudu možete pristupiti klikom na sledeći link
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
@@ -5231,6 +5284,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Kreirani su predlošci poreza za prodaju i kupnju.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Tip ostavljanja {0} se ne može prenositi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Zaduženje Račun mora biti račun potraživanja
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Datum završetka ugovora ne može biti manji nego danas.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Postavite račun na skladištu {0} ili zadani račun inventara u tvrtki {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Podesi kao podrazumevano
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina ovog paketa. (izračunava se automatski kao zbir neto težine artikala)
@@ -5257,8 +5311,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Istekle serije
 DocType: Shipping Rule,Shipping Rule Type,Vrsta pravila o isporuci
 DocType: Job Offer,Accepted,Prihvaćeno
-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 otkažete ovaj dokument"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Već ste procijenili kriterije procjene {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Izaberite Serijski brojevi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Dob (Dani)
@@ -5285,6 +5337,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Izaberite svoje domene
 DocType: Agriculture Task,Task Name,Naziv zadatka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Stock Unosi već kreirani za radni nalog
+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 otkažete ovaj dokument"
 ,Amount to Deliver,Iznos za isporuku
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Kompanija {0} ne postoji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nije pronađen nijedan zahtjev za materijalom za povezivanje za date stavke.
@@ -5334,6 +5388,7 @@
 DocType: Lab Prescription,Test Code,Test Code
 DocType: Purchase Taxes and Charges,On Previous Row Total,On Previous Row Total
 DocType: Student,Student Email Address,Adresa e-pošte studenta
+,Delayed Item Report,Odloženi izvještaj o stavkama
 DocType: Academic Term,Education,Obrazovanje
 DocType: Supplier Quotation,Supplier Address,Adresa dobavljača
 DocType: Salary Detail,Do not include in total,Ne uključujte ukupno
@@ -5341,7 +5396,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ne postoji
 DocType: Purchase Receipt Item,Rejected Quantity,Odbijena količina
 DocType: Cashier Closing,To TIme,To TIme
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzijski faktor ({0} -&gt; {1}) nije pronađen za stavku: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Dnevni radni pregled grupe korisnika
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskalna godina Kompanija
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternativna stavka ne smije biti ista kao kod stavke
@@ -5393,6 +5447,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Kašnjenje između zaustavljanja isporuke
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamrzavanje zaliha starije od [dana]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Promotivni proizvodni popust na proizvode
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Već postoji prioritet problema
 DocType: Account,Asset Received But Not Billed,"Primljeno sredstvo, ali nije naplaćeno"
 DocType: POS Closing Voucher,Total Collected Amount,Ukupan prikupljeni iznos
 DocType: Course,Default Grading Scale,Default Grading Scale
@@ -5435,6 +5490,7 @@
 DocType: Contract,Fulfilment Terms,Uslovi ispunjenja
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ne-grupa u grupu
 DocType: Student Guardian,Mother,Majko
+DocType: Issue,Service Level Agreement Fulfilled,Ispunjen ugovor o nivou usluge
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Porez na odbitak za neplaćene naknade zaposlenima
 DocType: Travel Request,Travel Funding,Putno finansiranje
 DocType: Shipping Rule,Fixed,Fiksno
@@ -5464,10 +5520,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nema pronađenih stavki.
 DocType: Item Attribute,From Range,From Range
 DocType: Clinical Procedure,Consumables,Potrošni materijal
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; i &#39;timestamp&#39; su obavezni.
 DocType: Purchase Taxes and Charges,Reference Row #,Referentni redak #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Postavite &#39;Središte troškova amortizacije imovine&#39; u kompaniji {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Red # {0}: Dokument za plaćanje je potreban da bi se dovršila transakcija
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Kliknite na ovo dugme da biste povukli podatke o prodajnom nalogu od Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Radno vrijeme ispod kojeg se obilježava pola dana. (Nula do onemogućavanja)
 ,Assessment Plan Status,Status plana procjene
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Prvo odaberite {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Podnesite ovo da biste kreirali zapis zaposlenika
@@ -5538,6 +5596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Postavi Otvori
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Toggle Filters
 DocType: Production Plan,Material Request Detail,Detail Material Request
+DocType: Shift Type,Process Attendance After,Prisustvo procesa nakon
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladište
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Idite na Programi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Red # {0}: Dvostruki unos u Reference {1} {2}
@@ -5595,6 +5654,7 @@
 DocType: Pricing Rule,Party Information,Informacije o zabavi
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Dužnici ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Do danas ne može biti veći od datuma otpuštanja zaposlenog
+DocType: Shift Type,Enable Exit Grace Period,Omogući Exit Grace Period
 DocType: Expense Claim,Employees Email Id,Id zaposlenika e-pošte
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Ažuriraj cenu iz Shopify u ERPNext cenovnik
 DocType: Healthcare Settings,Default Medical Code Standard,Default Medical Code Standard
@@ -5625,7 +5685,6 @@
 DocType: Budget,Applicable on Material Request,Primjenjivo na zahtjev za materijal
 DocType: Support Settings,Search APIs,API-ji za pretraživanje
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Postotak prekomjerne proizvodnje za prodajni nalog
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Specifikacije
 DocType: Purchase Invoice,Supplied Items,Priložene stavke
 DocType: Leave Control Panel,Select Employees,Izaberite Zaposleni
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Odaberite račun prihoda od kamata u zajmu {0}
@@ -5651,7 +5710,7 @@
 ,Supplier-Wise Sales Analytics,Analitika prodaje dobavljača
 DocType: GSTR 3B Report,February,februar
 DocType: Appraisal,For Employee,Za zaposlenika
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Stvarni datum isporuke
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Stvarni datum isporuke
 DocType: Sales Partner,Sales Partner Name,Ime partnera za prodaju
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Redosled amortizacije {0}: Početni datum amortizacije se unosi kao datum prethodnog datuma
 DocType: GST HSN Code,Regional,Regional
@@ -5690,6 +5749,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Supplier Scorecard
 DocType: Travel Itinerary,Travel To,Putovati u
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,Odredite prijavu i odjavu
 DocType: POS Closing Voucher,Difference,Razlika
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Mala
 DocType: Work Order Item,Work Order Item,Stavka radne narudžbe
@@ -5723,6 +5783,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Lijek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} je zatvoren
 DocType: Patient,Medical History,Medicinska istorija
+DocType: Expense Claim,Expense Taxes and Charges,Troškovi poreza i naknada
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Broj dana nakon isteka datuma fakture prije otkazivanja pretplate ili označavanja pretplate kao neplaćene
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Napomena za instalaciju {0} je već poslana
 DocType: Patient Relation,Family,Porodica
@@ -5755,7 +5816,6 @@
 DocType: Dosage Strength,Strength,Snaga
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinica {1} potrebne u {2} za dovršetak ove transakcije.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush sirovine na temelju podugovora
-DocType: Bank Guarantee,Customer,Kupac
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ako je omogućeno, polje Academic Term će biti obavezno u alatu za upis programa."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Za studentsku grupu zasnovanu na šaržama, studentska grupa će biti validirana za svakog učenika iz programa za upis u program."
 DocType: Course,Topics,Teme
@@ -5835,6 +5895,7 @@
 DocType: Chapter,Chapter Members,Članovi poglavlja
 DocType: Warranty Claim,Service Address,Adresa servisa
 DocType: Journal Entry,Remark,Napomena
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: količina nije dostupna za {4} u skladištu {1} u vrijeme objavljivanja unosa ({2} {3})
 DocType: Patient Encounter,Encounter Time,Encounter Time
 DocType: Serial No,Invoice Details,Detalji fakture
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dodatni računi mogu se vršiti u grupi, ali unosi se mogu vršiti protiv ne-grupa"
@@ -5915,6 +5976,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formula kriterija
 apps/erpnext/erpnext/config/support.py,Support Analytics,Support Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID uređaja za prisustvo (Biometric / RF tag ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pregled i akcija
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut, unosi su dozvoljeni ograničenim korisnicima."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Iznos nakon amortizacije
@@ -5936,6 +5998,7 @@
 DocType: Salary Slip,Loan Repayment,Otplata kredita
 DocType: Employee Education,Major/Optional Subjects,Glavni / opcioni predmeti
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Adrese i kontakti dobavljača
 DocType: Bank Guarantee,Bank Guarantee Type,Vrsta bankarske garancije
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako je onemogućeno, polje &#39;Zaokruženo ukupno&#39; neće biti vidljivo u bilo kojoj transakciji"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5974,6 +6037,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Otvaranje stavke alata za kreiranje fakture
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Uključi POS transakcije
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Nema zaposlenika za datu vrijednost polja zaposlenika. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni iznos (valuta kompanije)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage je pun, nije spasio"
 DocType: Chapter Member,Chapter Member,Član ogranka
@@ -6006,6 +6070,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nije formirana nijedna studentska grupa.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Dvostruki red {0} sa istim {1}
 DocType: Employee,Salary Details,Detalji plata
+DocType: Employee Checkin,Exit Grace Period Consequence,Izlazak iz posledice grejs perioda
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Special Test Items,Particulars,Posebni podaci
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Postavite filter na osnovu stavke ili skladišta
@@ -6107,6 +6172,7 @@
 DocType: Serial No,Out of AMC,Izvan AMC-a
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, potrebne kvalifikacije itd."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Ship to State
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Želite li podnijeti zahtjev za materijal
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: Compensatory Leave Request,Work End Date,Datum završetka posla
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Zahtjev za sirovine
@@ -6292,6 +6358,7 @@
 DocType: Sales Order Item,Gross Profit,Bruto dobit
 DocType: Quality Inspection,Item Serial No,Serijska br
 DocType: Asset,Insurer,Osiguravatelj
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Kupovni iznos
 DocType: Asset Maintenance Task,Certificate Required,Potreban certifikat
 DocType: Retention Bonus,Retention Bonus,Bonus za zadržavanje
@@ -6406,6 +6473,8 @@
 DocType: Invoice Discounting,Sanctioned,Sankcionirano
 DocType: Course Enrollment,Course Enrollment,Upis predmeta
 DocType: Item,Supplier Items,Artikli dobavljača
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Vrijeme početka ne može biti veće ili jednako vremenu završetka za {0}.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 DocType: Support Search Source,Response Options,Opcije odgovora
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} treba da bude vrednost između 0 i 100
@@ -6492,7 +6561,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Fiksna sredstva
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Totalna zarada
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička grupa&gt; Teritorija
 DocType: Share Balance,From No,From No
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Račun poravnanja plaćanja
 DocType: Purchase Invoice,Taxes and Charges Added,Dodati porezi i naknade
@@ -6600,6 +6668,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Zanemari pravilo o cenama
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Hrana
 DocType: Lost Reason Detail,Lost Reason Detail,Izgubljeni razlog Detalj
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Kreirani su sljedeći serijski brojevi: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Povratne informacije klijenta
 DocType: Serial No,Warranty / AMC Details,Detalji garancije / AMC-a
 DocType: Issue,Opening Time,Vreme otvaranja
@@ -6649,6 +6718,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Ime kompanije nije isto
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Promocija zaposlenika ne može se podnijeti prije datuma promocije
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nije dozvoljeno ažurirati transakcije zalihama starije od {0}
+DocType: Employee Checkin,Employee Checkin,Zaposleni Checkin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Datum početka treba biti manji od datuma završetka za stavku {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Kreirajte ponude za kupce
 DocType: Buying Settings,Buying Settings,Buying Settings
@@ -6670,6 +6740,7 @@
 DocType: Patient,Patient Demographics,Patient Demographics
 DocType: Share Transfer,To Folio No,Za Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Novčani tok iz poslovanja
+DocType: Employee Checkin,Log Type,Log Type
 DocType: Stock Settings,Allow Negative Stock,Dopusti negativnu zalihu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Nijedna stavka nema nikakvu promjenu u količini ili vrijednosti.
 DocType: Asset,Purchase Date,Datum kupovine
@@ -6714,6 +6785,7 @@
 DocType: Vital Signs,Very Hyper,Very Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Odaberite prirodu vašeg poslovanja.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Odaberite mjesec i godinu
+DocType: Service Level,Default Priority,Default Priority
 DocType: Student Log,Student Log,Studentski dnevnik
 DocType: Shopping Cart Settings,Enable Checkout,Omogući Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Ljudski resursi
@@ -6742,7 +6814,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Povežite Shopify sa ERPNext
 DocType: Homepage Section Card,Subtitle,Subtitle
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; Tip dobavljača
 DocType: BOM,Scrap Material Cost(Company Currency),Trošak materijala za otpad (valuta kompanije)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Napomena za isporuku {0} ne smije biti poslana
 DocType: Task,Actual Start Date (via Time Sheet),Stvarni datum početka (putem vremenskog lista)
@@ -6798,6 +6869,7 @@
 DocType: Drug Prescription,Dosage,Doziranje
 DocType: Cheque Print Template,Starting position from top edge,Početna pozicija od gornje ivice
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Trajanje sastanka (min)
+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 istog datuma. {0}
 DocType: Accounting Dimension,Disable,Onemogući
 DocType: Email Digest,Purchase Orders to Receive,Nalozi za kupovinu za primanje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Porudžbine za proizvodnju se ne mogu podići za:
@@ -6813,7 +6885,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Preneseni materijal za podugovor
 DocType: Job Card,Timing Detail,Timing Detail
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Obavezno Uključeno
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Uvoz {0} od {1}
 DocType: Job Offer Term,Job Offer Term,Trajanje ponude za posao
 DocType: SMS Center,All Contact,Svi kontakti
 DocType: Project Task,Project Task,Zadatak projekta
@@ -6864,7 +6935,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Stavka {0} nije podešena za serijske brojeve
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,From State
 DocType: Leave Type,Maximum Continuous Days Applicable,Maksimalni broj neprekidnih dana koji se primjenjuje
-apps/erpnext/erpnext/config/support.py,Support Team.,Tim za podršku.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Prvo unesite ime kompanije
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Import Successful
 DocType: Guardian,Alternate Number,Alternativni broj
@@ -6956,6 +7026,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Red # {0}: stavka je dodata
 DocType: Student Admission,Eligibility and Details,Podobnost i detalji
 DocType: Staffing Plan,Staffing Plan Detail,Detalj plana osoblja
+DocType: Shift Type,Late Entry Grace Period,Grejs period za kasni ulazak
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Journal Entry,Subscription Section,Sekcija za pretplatu
 DocType: Salary Slip,Payment Days,Dani plaćanja
@@ -7006,6 +7077,7 @@
 DocType: Journal Entry Account,Account Balance,Stanje računa
 DocType: Asset Maintenance Log,Periodicity,Periodicity
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Medical Record
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Log-tip je potreban za check-inove koji padaju u smjeni: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Izvršenje
 DocType: Item,Valuation Method,Metoda vrednovanja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} protiv fakture prodaje {1}
@@ -7090,6 +7162,7 @@
 DocType: Loan Type,Loan Name,Naziv zajma
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Postavite zadani način plaćanja
 DocType: Quality Goal,Revision,Revizija
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Vrijeme prije završetka smjene kada se check-out smatra ranim (u minutama).
 DocType: Healthcare Service Unit,Service Unit Type,Tip uslužne jedinice
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povratak protiv fakture kupovine
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Generate Secret
@@ -7245,12 +7318,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kozmetika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite ovo ako želite prisiliti korisnika da odabere seriju prije spremanja. Ako to označite, neće biti zadane postavke."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom mogu postaviti zamrznute račune i kreirati / modificirati računovodstvene unose za zamrznute račune
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Šifra artikla&gt; Item Group&gt; Brand
 DocType: Expense Claim,Total Claimed Amount,Ukupni traženi iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći vremenski termin u sljedećih {0} dana za rad {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Umotavanje
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Možete obnoviti samo ako vaše članstvo ističe u roku od 30 dana
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Vrijednost mora biti između {0} i {1}
 DocType: Quality Feedback,Parameters,Parametri
+DocType: Shift Type,Auto Attendance Settings,Auto Attendance Settings
 ,Sales Partner Transaction Summary,Sažetak transakcija prodajnog partnera
 DocType: Asset Maintenance,Maintenance Manager Name,Ime menadžera održavanja
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Potrebno je dohvatiti detalje stavke.
@@ -7342,10 +7417,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Validate Applied Rule
 DocType: Job Card Item,Job Card Item,Stavka radne kartice
 DocType: Homepage,Company Tagline for website homepage,Kompanija Tagline za početnu stranicu web lokacije
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Postavite vrijeme odziva i razlučivost za prioritet {0} na indeksu {1}.
 DocType: Company,Round Off Cost Center,Okrugli centar troškova
 DocType: Supplier Scorecard Criteria,Criteria Weight,Težina kriterija
 DocType: Asset,Depreciation Schedules,Raspored amortizacije
-DocType: Expense Claim Detail,Claim Amount,Iznos potraživanja
 DocType: Subscription,Discounts,Popusti
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi Pravila o otpremi
 DocType: Subscription,Cancelation Date,Datum otkazivanja
@@ -7373,7 +7448,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Prikaži nultu vrijednost
 DocType: Employee Onboarding,Employee Onboarding,Zaposleni Onboarding
 DocType: POS Closing Voucher,Period End Date,Datum završetka perioda
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Mogućnosti prodaje po izvorima
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvi odobreni dopust u listi će biti postavljen kao podrazumevani Leave Approver.
 DocType: POS Settings,POS Settings,POS Settings
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Svi računi
@@ -7394,7 +7468,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Red # {0}: Stopa mora biti ista kao {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,FHP-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Stavke zdravstvene službe
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Nema pronađenih zapisa
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Raspon starenja 3
 DocType: Vital Signs,Blood Pressure,Krvni pritisak
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Target On
@@ -7441,6 +7514,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Serije
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Odbrana
 DocType: Item,Has Batch No,Batch No
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Delayed Days
 DocType: Lead,Person Name,Ime osobe
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Training Event Employee,Invited,Pozvan
@@ -7462,7 +7536,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Početni i završni datumi koji nisu u važećem obračunskom periodu, ne mogu izračunati {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Prikaži samo klijente ovih korisničkih grupa
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Izaberite stavke za čuvanje fakture
-DocType: Service Level,Resolution Time,Resolution Time
+DocType: Service Level Priority,Resolution Time,Resolution Time
 DocType: Grading Scale Interval,Grade Description,Opis razreda
 DocType: Homepage Section,Cards,Kartice
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Zapisnici o kvalitetu sastanka
@@ -7489,6 +7563,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bilans bankovnog izvoda prema glavnoj knjizi
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Zdravstvena zaštita (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Default Warehouse za kreiranje prodajnog naloga i isporuke
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Vreme odgovora za {0} kod indeksa {1} ne može biti veće od vremena rezolucije.
 DocType: Opportunity,Customer / Lead Name,Ime klijenta / vode
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.- \ t
 DocType: Expense Claim Advance,Unclaimed amount,Neuplaćeni iznos
@@ -7535,7 +7610,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Uvozne strane i adrese
 DocType: Item,List this Item in multiple groups on the website.,Navedite ovu stavku u više grupa na web stranici.
 DocType: Request for Quotation,Message for Supplier,Poruka za dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Nije moguće promijeniti {0} jer postoji transakcija dionica za stavku {1}.
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Član tima
 DocType: Asset Category Account,Asset Category Account,Account Asset Category Account
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index a24e61b..a1cc871 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -76,7 +76,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Cita {0} i factura de vendes {1} cancel·lades
 DocType: Purchase Receipt,Vehicle Number,Número de vehicle
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,La teva adreça de correu electrònic...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Inclou entrades de llibre predeterminades
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Inclou entrades de llibre predeterminades
 DocType: Activity Cost,Activity Type,Tipus d&#39;activitat
 DocType: Purchase Invoice,Get Advances Paid,Obtén avanços pagats
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte de guanys / pèrdues en l’eliminació d’actius
@@ -222,7 +222,9 @@
 DocType: Bank Reconciliation,Payment Entries,Entrades de pagament
 DocType: Employee Education,Class / Percentage,Classe / Percentatge
 ,Electronic Invoice Register,Registre de factures electròniques
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,El nombre d’ocurrència després del qual s’executa la conseqüència.
 DocType: Sales Invoice,Is Return (Credit Note),Torna (nota de crèdit)
+DocType: Price List,Price Not UOM Dependent,Preu no depenent de la UOM
 DocType: Lab Test Sample,Lab Test Sample,Mostra de prova de laboratori
 DocType: Shopify Settings,status html,estat html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Per exemple, 2012, 2012-13"
@@ -324,6 +326,7 @@
 DocType: Salary Slip,Net Pay,Pagament net
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Total de quantitats facturades
 DocType: Clinical Procedure,Consumables Invoice Separately,Factura consumible per separat
+DocType: Shift Type,Working Hours Threshold for Absent,Horari llindar horari absent
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},No es pot assignar el pressupost al compte del grup {0}
 DocType: Purchase Receipt Item,Rate and Amount,Taxa i import
@@ -379,7 +382,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Sortir de la configuració del pacient
 DocType: Asset,Insurance End Date,Data de finalització de l’assegurança
 DocType: Bank Account,Branch Code,Codi de sucursal
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Temps per respondre
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Fòrum d&#39;usuaris
 DocType: Landed Cost Item,Landed Cost Item,Article sobre cost desembarcat
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,El venedor i el comprador no poden ser els mateixos
@@ -597,6 +599,7 @@
 DocType: Share Transfer,Transfer,Transferència
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Element de cerca (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Resultat enviat
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,A partir de la data no pot ser superior a la data
 DocType: Supplier,Supplier of Goods or Services.,Proveïdor de béns o serveis.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom del compte nou. Nota: no creeu comptes per a clients i proveïdors
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,El grup d’estudiants o l’hora del curs són obligatoris
@@ -882,7 +885,6 @@
 DocType: Skill,Skill Name,Nom d’habilitat
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Imprimeix el reportatge
 DocType: Soil Texture,Ternary Plot,Trama ternària
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu les sèries de noms per a {0} mitjançant la configuració&gt; Configuració&gt; Sèries de noms
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Entrades de suport
 DocType: Asset Category Account,Fixed Asset Account,Compte d&#39;actius fix
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Últim
@@ -895,6 +897,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obligatori per al balanç
 DocType: Payment Entry,Total Allocated Amount,Import total assignat
 DocType: Sales Invoice,Get Advances Received,Obteniu avenços rebuts
+DocType: Shift Type,Last Sync of Checkin,Última sincronització del registre
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Import de l’impost sobre l’element inclòs en el valor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -903,7 +906,9 @@
 DocType: Student,Blood Group,Grup sanguini
 apps/erpnext/erpnext/config/healthcare.py,Masters,Màsters
 DocType: Crop,Crop Spacing UOM,Espai de cultiu UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,El temps transcorregut el torn de l’hora d’inici de l’hora d’inici del registre d’entrada es considera que és tard (en minuts)
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Explora
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,No s’han trobat factures pendents
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} places vacants i {1} pressupost per a {2} ja planificades per a empreses filials de {3}. Només es poden planificar fins a {4} places vacants i pressupost {5} segons el pla de personal {6} per a la societat matriu {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Lloses de descompte de productes
@@ -1005,6 +1010,7 @@
 DocType: Item,Moving Average,Mitjana mòbil
 DocType: Employee Attendance Tool,Unmarked Attendance,Assistència sense marcar
 DocType: Homepage Section,Number of Columns,Nombre de columnes
+DocType: Issue Priority,Issue Priority,Prioritat de l&#39;emissió
 DocType: Holiday List,Add Weekly Holidays,Afegiu vacances setmanals
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Crea un desemborsament salarial
@@ -1013,6 +1019,7 @@
 DocType: Warranty Claim,Issue Date,Data d&#39;emissió
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot per a l&#39;element {0}. No es pot trobar un sol lot que compleixi aquest requisit
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,No es pot crear el bo de retenció per a empleats abandonats
+DocType: Employee Checkin,Location / Device ID,Ubicació / ID del dispositiu
 DocType: Purchase Order,To Receive,Rebre
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Esteu en mode fora de línia. No podreu tornar a carregar fins que no tingueu xarxa.
 DocType: Course Activity,Enrollment,Inscripció
@@ -1021,7 +1028,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Màxim: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Falta informació sobre la facturació electrònica
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,No s’ha creat cap sol·licitud de material
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi d&#39;ítem&gt; Grup d&#39;articles&gt; Marca
 DocType: Loan,Total Amount Paid,Import total pagat
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Tots aquests articles ja s’han facturat
 DocType: Training Event,Trainer Name,Nom d&#39;entrenador
@@ -1132,6 +1138,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Si us plau, mencioneu el nom principal del plom {0}"
 DocType: Employee,You can enter any date manually,Podeu introduir qualsevol data manualment
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Article de reconciliació de valors
+DocType: Shift Type,Early Exit Consequence,Conseqüència de la sortida anticipada
 DocType: Item Group,General Settings,Configuració general
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,La data de venciment no pot ser abans d’enviar / Data de la factura del proveïdor
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Introduïu el nom del beneficiari abans de presentar-vos.
@@ -1170,6 +1177,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Confirmació de pagament
 ,Available Stock for Packing Items,Estoc disponible per a articles d&#39;embalatge
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Elimineu aquesta factura {0} de C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Cada registre d’entrada i sortida vàlid
 DocType: Support Search Source,Query Route String,Consulta la cadena de rutes
 DocType: Customer Feedback Template,Customer Feedback Template,Plantilla de comentaris del client
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Cotitzacions a clients o clients potencials.
@@ -1204,6 +1212,7 @@
 DocType: Authorization Control,Authorization Control,Control d&#39;autorització
 ,Daily Work Summary Replies,Respostes diàries del treball de resum
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Has estat convidat a col·laborar en el projecte: {0}
+DocType: Issue,Response By Variance,Resposta per variació
 DocType: Item,Sales Details,Detalls de vendes
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Capçals de lletres per a plantilles d&#39;impressió.
 DocType: Salary Detail,Tax on additional salary,Impost sobre el salari addicional
@@ -1327,6 +1336,7 @@
 DocType: Project,Task Progress,Progrés de la tasca
 DocType: Journal Entry,Opening Entry,Entrada d’obertura
 DocType: Bank Guarantee,Charges Incurred,Càrrecs incorreguts
+DocType: Shift Type,Working Hours Calculation Based On,Càlcul d’hora de treball basat en
 DocType: Work Order,Material Transferred for Manufacturing,Material transferit per a fabricació
 DocType: Products Settings,Hide Variants,Amaga les variants
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Desactiva la planificació de la capacitat i el seguiment del temps
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,Interessos
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantitat consumida
 DocType: Education Settings,Education Manager,Responsable d&#39;Educació
+DocType: Employee Checkin,Shift Actual Start,Canvia l&#39;inici actual
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifiqueu els registres de temps fora de les hores de treball de les estacions de treball.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Punts de fidelitat: {0}
 DocType: Healthcare Settings,Registration Message,Missatge de registre
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Factura ja creada per a totes les hores de facturació
 DocType: Sales Partner,Contact Desc,Contacte Desc
 DocType: Purchase Invoice,Pricing Rules,Normes de preus
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Com hi ha transaccions existents amb l’ítem {0}, no podeu canviar el valor de {1}"
 DocType: Hub Tracked Item,Image List,Llista d’imatges
 DocType: Item Variant Settings,Allow Rename Attribute Value,Permet canviar el nom del valor d’atribut
-DocType: Price List,Price Not UOM Dependant,Preu no depenent de la UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Temps (en minuts)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Bàsic
 DocType: Loan,Interest Income Account,Compte de renda d’interessos
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Seleccioneu el perfil de punt de venda
 DocType: Support Settings,Get Latest Query,Obtingui les últimes consultes
 DocType: Employee Incentive,Employee Incentive,Incentius per a empleats
+DocType: Service Level,Priorities,Prioritats
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Afegiu targetes o seccions personalitzades a la pàgina d&#39;inici
 DocType: Homepage,Hero Section Based On,Secció d’heroi basada en
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant factura de compra)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Quantitat ordenada
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},La fila # {0}: el magatzem rebutjat és obligatori per a l’element rebutjat {1}
 ,Received Items To Be Billed,Articles rebuts per facturar
-DocType: Salary Slip Timesheet,Working Hours,Hores laborals
+DocType: Attendance,Working Hours,Hores laborals
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Mode de pagament
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Ordre de compra articles no rebuts a temps
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Durada en dies
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Informació legal i altra informació general sobre el vostre proveïdor
 DocType: Item Default,Default Selling Cost Center,Centre de costos de venda predeterminat
 DocType: Sales Partner,Address & Contacts,Adreça i contactes
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Si us plau, configureu les sèries de numeració per assistència mitjançant la configuració&gt; Sèries de numeració"
 DocType: Subscriber,Subscriber,Subscriptor
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) està fora de stock
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Seleccioneu la data de publicació primer
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,Tasques creades
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,La llista de materials per defecte ({0}) ha d&#39;estar activa per a aquest ítem o la seva plantilla
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Taxa de comissió%
-DocType: Service Level,Response Time,Temps de resposta
+DocType: Service Level Priority,Response Time,Temps de resposta
 DocType: Woocommerce Settings,Woocommerce Settings,Configuració de Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,La quantitat ha de ser positiva
 DocType: Contract,CRM,CRM
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Mapatge de dades de transaccions
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Un plom requereix el nom d&#39;una persona o el nom d&#39;una organització
 DocType: Student,Guardians,Guardians
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu el sistema de nomenament d’instructor a l’educació&gt; Configuració de l’educació
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Selecciona marca ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Ingressos mitjans
 DocType: Shipping Rule,Calculate Based On,Calcular la funció basada
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Hi ha un registre d’assistència {0} contra l’estudiant {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Data de transacció
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Cancel·la la subscripció
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,No s’ha pogut establir l’acord de nivell de servei {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Import net d’equipament
 DocType: Account,Liability,Responsabilitat
 DocType: Employee,Bank A/C No.,Banc A / C No.
@@ -1701,7 +1712,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codi del producte de matèria primera
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Ja s&#39;ha enviat la factura de compra {0}
 DocType: Fees,Student Email,Correu electrònic d&#39;estudiant
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Recursió BOM: {0} no pot ser pare o fill de {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Obteniu articles de serveis sanitaris
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,No s’envia l’ingrés de valors {0}
 DocType: Item Attribute Value,Item Attribute Value,Valor de l’atribut de l’article
@@ -1726,7 +1736,6 @@
 DocType: Production Plan,Select Items to Manufacture,Seleccioneu els elements a fabricar
 DocType: Leave Application,Leave Approver Name,Deixa el nom de l’aprovador
 DocType: Shareholder,Shareholder,Accionista
-DocType: Issue,Agreement Status,Estat de l’acord
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Configuració predeterminada per a la venda d’operacions.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Seleccioneu l’admissió dels estudiants que és obligatòria per al sol·licitant estudiant pagat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Seleccioneu la llista de materials
@@ -1989,6 +1998,7 @@
 DocType: Account,Income Account,Compte d’ingressos
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Tots els magatzems
 DocType: Contract,Signee Details,Detalls dels signants
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Permetre el registre de sortida després de l’hora de finalització del torn (en minuts)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Contractació
 DocType: Item Group,Check this if you want to show in website,Comproveu-ho si voleu mostrar-lo al lloc web
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,No s’ha trobat l’any fiscal {0}
@@ -2055,6 +2065,7 @@
 DocType: Activity Cost,Billing Rate,Tarifa de facturació
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Avís: hi ha un altre {0} # {1} contra l&#39;entrada de material {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Activeu la configuració de Google Maps per estimar i optimitzar les rutes
+DocType: Purchase Invoice Item,Page Break,Salt de pàgina
 DocType: Supplier Scorecard Criteria,Max Score,Puntuació màxima
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,La data d&#39;inici del reemborsament no pot ser abans de la data del desemborsament.
 DocType: Support Search Source,Support Search Source,Suport a la font de cerca
@@ -2123,6 +2134,7 @@
 DocType: Employee Transfer,Employee Transfer,Transferència d&#39;empleats
 ,Sales Funnel,Embut de vendes
 DocType: Agriculture Analysis Criteria,Water Analysis,Anàlisi de l’aigua
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Comenceu el registre d’entrada abans de l’hora d’inici del torn (en minuts)
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes Frozen Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,No hi ha res a editar.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","L’operació {0} és més llarga que les hores de treball disponibles a l’estació de treball {1}, desglossa l’operació en diverses operacions"
@@ -2136,7 +2148,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Ordre de venda {0} és {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Retard en el pagament (dies)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Introduïu els detalls de la depreciació
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO client
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La data de lliurament esperada ha de ser posterior a la data de comanda de vendes
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,La quantitat d’article no pot ser zero
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Atribut no vàlid
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Seleccioneu BOM contra l’element {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipus de factura
@@ -2146,6 +2160,7 @@
 DocType: Volunteer,Afternoon,Tarda
 DocType: Vital Signs,Nutrition Values,Valors de nutrició
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presència de febre (temperatura&gt; 38,5 ° C / 101,3 ° F o temperatura sostinguda&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenament d&#39;empleats en Recursos humans&gt; Configuració de recursos humans
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,CIT invertit
 DocType: Project,Collect Progress,Recull el progrés
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energia
@@ -2196,6 +2211,7 @@
 ,Ordered Items To Be Billed,Articles ordenats per ser facturats
 DocType: Taxable Salary Slab,To Amount,A Quantitat
 DocType: Purchase Invoice,Is Return (Debit Note),Torna (nota de dèbit)
+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/config/desktop.py,Getting Started,Començant
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Combinar
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No es pot canviar la data de començament de l’any fiscal i la data d’acabament de l’exercici fiscal un cop s’ha desat l’exercici fiscal.
@@ -2214,8 +2230,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},La data d&#39;inici del manteniment no pot ser abans de la data de lliurament del número de sèrie {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,La fila {0}: el tipus de canvi és obligatori
 DocType: Purchase Invoice,Select Supplier Address,Seleccioneu l&#39;adreça del proveïdor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","La quantitat disponible és {0}, necessiteu {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Introduïu API Secret Consumer
 DocType: Program Enrollment Fee,Program Enrollment Fee,Quota d&#39;inscripció al programa
+DocType: Employee Checkin,Shift Actual End,Canviar finalització actual
 DocType: Serial No,Warranty Expiry Date,Data de caducitat de la garantia
 DocType: Hotel Room Pricing,Hotel Room Pricing,Preu de les habitacions d’hotel
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Subministraments imposables a l&#39;exterior (diferents de zero, qualificats i exempts de zero"
@@ -2275,6 +2293,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 DocType: Shopping Cart Settings,Display Settings,Configuració de la pantalla
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Configureu el nombre d’amortitzacions reservades
+DocType: Shift Type,Consequence after,Conseqüència després
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,En què necessites ajuda?
 DocType: Journal Entry,Printing Settings,Configuració d&#39;impressió
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banca
@@ -2284,6 +2303,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,L’adreça de facturació és la mateixa que l’adreça d’enviament
 DocType: Account,Cash,Efectiu
 DocType: Employee,Leave Policy,Deixa la política
+DocType: Shift Type,Consequence,Conseqüència
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Adreça de l&#39;estudiant
 DocType: GST Account,CESS Account,Compte CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: es requereix un centre de costos per al compte &quot;Benefici i pèrdua&quot; {2}. Configureu un centre de cost per defecte per a l&#39;empresa.
@@ -2348,6 +2368,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Val de tancament de període
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Nom del Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Introduïu el compte de despeses
+DocType: Issue,Resolution By Variance,Resolució per variació
 DocType: Employee,Resignation Letter Date,Data de carta de renúncia
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la data
@@ -2360,6 +2381,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Veure ara
 DocType: Item Price,Valid Upto,Actualització vàlida
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},El tipus de document de referència ha de ser un de {0}
+DocType: Employee Checkin,Skip Auto Attendance,Saltar assistència automàtica
 DocType: Payment Request,Transaction Currency,Moneda de transacció
 DocType: Loan,Repayment Schedule,Calendari d’amortització
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Crea una entrada de reserva de mostra de mostra
@@ -2431,6 +2453,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,TPV Tancant impostos sobre vals
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Acció inicialitzada
 DocType: POS Profile,Applicable for Users,Aplicable als usuaris
+,Delayed Order Report,Informe de comanda retardada
 DocType: Training Event,Exam,Examen
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,S&#39;ha trobat un nombre incorrecte d’entrades del llibre major. És possible que hagueu seleccionat un compte incorrecte a la transacció.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Canals de vendes
@@ -2445,10 +2468,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Les condicions s’aplicaran a tots els elements seleccionats combinats.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configura
 DocType: Hotel Room,Capacity,Capacitat
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,El lot {0} de l’article {1} està desactivat.
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuari de la reserva d’hotels
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,La jornada laboral s&#39;ha repetit dues vegades
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ja existeix un acord de nivell de servei amb el tipus d’entitat {0} i l’entitat {1}.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},El grup d’elements no esmentat al document principal de l’element {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Error de nom: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,El territori és necessari en el perfil del punt de venda
@@ -2496,6 +2520,7 @@
 DocType: Depreciation Schedule,Schedule Date,Data del calendari
 DocType: Packing Slip,Package Weight Details,Detalls del pes del paquet
 DocType: Job Applicant,Job Opening,Oferta de treball
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Última sincronització amb èxit coneguda de la facturació dels empleats. Restableix-ho només si esteu segur que tots els registres es sincronitzen des de totes les ubicacions. No modifiqueu això si no esteu segurs.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Cost real
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L’avanç total ({0}) contra l’Ordre {1} no pot ser superior al Gran Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,S&#39;han actualitzat les variants dels elements
@@ -2540,6 +2565,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Obteniu Invocies
 DocType: Tally Migration,Is Day Book Data Imported,És importada les dades del llibre de dia
 ,Sales Partners Commission,Comissió de socis comercials
+DocType: Shift Type,Enable Different Consequence for Early Exit,Habiliteu la conseqüència diferent per a la sortida anticipada
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Legal
 DocType: Loan Application,Required by Date,Requerit per data
 DocType: Quiz Result,Quiz Result,Resultat del qüestionari
@@ -2599,7 +2625,6 @@
 DocType: Pricing Rule,Pricing Rule,Regla de preus
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Llista de vacances opcional no establerta per període de baixa {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Configureu el camp ID d’usuari en un registre de l’empleat per establir el paper de l’empleat
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Temps per resoldre
 DocType: Training Event,Training Event,Esdeveniment de formació
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La pressió arterial normal en repòs en un adult és d&#39;aproximadament 120 mmHg sistòlica i 80 mmHg diastòlica, abreujada &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,El sistema obtindrà totes les entrades si el valor límit és zero.
@@ -2643,6 +2668,7 @@
 DocType: Student Applicant,Approved,Aprovat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la data ha d’estar dins de l’exercici fiscal. Assumint la data = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Establiu el grup de proveïdors a la configuració de compra.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} és un estat d&#39;assistència no vàlid.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Compte d&#39;obertura temporal
 DocType: Purchase Invoice,Cash/Bank Account,Efectiu / compte bancari
 DocType: Quality Meeting Table,Quality Meeting Table,Taula de reunions de qualitat
@@ -2678,6 +2704,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Aliments, begudes i tabac"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Horari de cursos
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Article Detall d’impostos savis
+DocType: Shift Type,Attendance will be marked automatically only after this date.,L&#39;assistència només es marcarà automàticament després d&#39;aquesta data.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Subministraments realitzats als titulars de la UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Sol·licitud de pressupostos
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,La moneda no es pot canviar després de fer entrades amb una altra moneda
@@ -2726,7 +2753,6 @@
 DocType: Item,Is Item from Hub,És un element del concentrador
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Procediment de qualitat.
 DocType: Share Balance,No of Shares,Nombre d&#39;accions
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: no hi ha cap quantitat disponible per a {4} al magatzem {1} en el moment de publicar l’entrada ({2} {3})
 DocType: Quality Action,Preventive,Preventiu
 DocType: Support Settings,Forum URL,URL del fòrum
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Empleat i assistència
@@ -2948,7 +2974,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Impostos i càrrecs per defecte
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,"Es basa en transaccions amb aquest proveïdor. Per a més detalls, vegeu la línia de temps a continuació"
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},La quantitat màxima de beneficis de l’empleat {0} supera {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Introduïu la data d&#39;inici i finalització del contracte.
 DocType: Delivery Note Item,Against Sales Invoice,Contra factura de vendes
 DocType: Loyalty Point Entry,Purchase Amount,Import de la compra
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,No es pot establir com a Perduda com a Ordre de venda.
@@ -2972,7 +2997,7 @@
 DocType: Lead,Organization Name,Nom de l&#39;organització
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Els camps vàlids de fins i tot vàlids són obligatoris per al valor acumulat
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Línia # {0}: Lots no ha de ser el mateix que {1} {2}
-DocType: Employee,Leave Details,Deixa els detalls
+DocType: Employee Checkin,Shift Start,Majúscula
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Les transaccions de valors abans de {0} estan congelades
 DocType: Driver,Issuing Date,Data de publicació
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Sol·licitant
@@ -3017,9 +3042,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalls de plantilla de mapeig de flux de caixa
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Contractació i formació
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Configuració del període de gràcia per assistència automàtica
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,De divisa i moneda no pot ser el mateix
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Farmàcia
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Horari de suport
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} es cancel·la o es tanca
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,La fila {0}: l’avanç contra el client ha de ser crèdit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Agrupa per bo (consolidat)
@@ -3129,6 +3156,7 @@
 DocType: Territory,Territory Manager,Gestor de territoris
 DocType: Lab Test,Sample ID,Identificació de la mostra
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,La cistella està buida
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,L&#39;assistència s&#39;ha marcat segons els registres d&#39;entrada dels empleats
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,L’actiu {0} s’ha de presentar
 ,Absent Student Report,Informe absent de l’estudiant
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Inclòs en el benefici brut
@@ -3136,7 +3164,9 @@
 DocType: Travel Request Costing,Funded Amount,Import finançat
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} no s’ha enviat de manera que l’acció no s’hagi pogut completar
 DocType: Subscription,Trial Period End Date,Data de finalització del període de prova
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Alternar entrades com IN i OUT durant el mateix canvi
 DocType: BOM Update Tool,The new BOM after replacement,El nou BOM després de la seva substitució
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Tema 5
 DocType: Employee,Passport Number,Número de passaport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Obertura temporal
@@ -3252,6 +3282,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Possible proveïdor
 ,Issued Items Against Work Order,Articles emesos contra ordre de treball
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creació de {0} factura
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu el sistema de nomenament d’instructor a l’educació&gt; Configuració de l’educació
 DocType: Student,Joining Date,Data d&#39;adhesió
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Lloc de sol·licitud
 DocType: Purchase Invoice,Against Expense Account,Contingut de despeses
@@ -3291,6 +3322,7 @@
 DocType: Landed Cost Item,Applicable Charges,Tarifes aplicables
 ,Point of Sale,Punt de venda
 DocType: Authorization Rule,Approving User  (above authorized value),Usuari aprovat (per sobre del valor autoritzat)
+DocType: Service Level Agreement,Entity,Entitat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Import {0} {1} transferit de {2} a {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},El client {0} no pertany al projecte {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Del nom de la festa
@@ -3337,6 +3369,7 @@
 DocType: Soil Texture,Sand Composition (%),Composició de sorra (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Dades del llibre d’importació
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu les sèries de noms per a {0} a través de la configuració&gt; Configuració&gt; Sèries de noms
 DocType: Asset,Asset Owner Company,Empresa propietària d’actius
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,El centre de costos és necessari per reservar una reclamació de despesa
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} números de sèrie vàlids per a l’element {1}
@@ -3397,7 +3430,6 @@
 DocType: Asset,Asset Owner,Propietari d’actius
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},El magatzem és obligatori per a la partida d’estoc {0} de la fila {1}
 DocType: Stock Entry,Total Additional Costs,Costos addicionals totals
-DocType: Marketplace Settings,Last Sync On,Última sincronització activada
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,"Si us plau, establiu com a mínim una fila a la taula Impostos i càrrecs"
 DocType: Asset Maintenance Team,Maintenance Team Name,Nom de l&#39;equip de manteniment
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Gràfic de centres de costos
@@ -3413,12 +3445,12 @@
 DocType: Job Card,WIP Warehouse,Magatzem WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},L&#39;identificador d&#39;usuari no està definit per a empleat {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","La quantitat disponible és {0}, necessiteu {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,L’usuari {0} ha estat creat
 DocType: Stock Settings,Item Naming By,Element que nomena per
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Ordenat
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Aquest és un grup de clients arrel i no es pot editar.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,La sol·licitud de material {0} es cancel·la o s&#39;atura
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Basat estrictament en el tipus de registre a Checkin dels empleats
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantitat subministrada
 DocType: Cash Flow Mapper,Cash Flow Mapper,Mapeador de fluxos d’efectiu
 DocType: Soil Texture,Sand,Sorra
@@ -3477,6 +3509,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,S&#39;ha trobat el grup d’articles duplicat a la taula de grups d’articles
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Sou anual
 DocType: Supplier Scorecard,Weighting Function,Funció de ponderació
+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}) que no s’ha trobat per a l’article: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Error en avaluar la fórmula de criteris
 ,Lab Test Report,Informe de prova de laboratori
 DocType: BOM,With Operations,Amb operacions
@@ -3490,6 +3523,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,No hi ha pagaments disponibles per a l&#39;entrada de diari
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} és un estudiant inactiu
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Feu una entrada en accions
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Recursió BOM: {0} no pot ser pare o fill de {1}
 DocType: Employee Onboarding,Activities,Activitats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Almenys un magatzem és obligatori
 ,Customer Credit Balance,Saldo de crèdit de clients
@@ -3502,9 +3536,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Programa de fidelització múltiple per al client. Seleccioneu manualment.
 DocType: Patient,Medication,Medicació
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Seleccioneu el programa de fidelització
+DocType: Employee Checkin,Attendance Marked,Assistència marcada
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Matèries primeres
 DocType: Sales Order,Fully Billed,Totalment facturat
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Si us plau, establiu la tarifa de l&#39;habitació de l&#39;hotel al {}"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Seleccioneu només una prioritat com a predeterminada.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Identifiqueu / creeu un compte (registre) per al tipus - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,El nombre total de crèdit / dèbit ha de ser el mateix que l’entrada de diari enllaçada
 DocType: Purchase Invoice Item,Is Fixed Asset,És un bé fix
@@ -3525,6 +3561,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Confirmació de cites
 DocType: Shopping Cart Settings,Orders,Comandes
 DocType: HR Settings,Retirement Age,Edat de jubilació
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Si us plau, configureu les sèries de numeració per assistència mitjançant la configuració&gt; Sèries de numeració"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Quantitat projectada
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},No es permet la supressió per al país {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Fila # {0}: l’actiu {1} ja és {2}
@@ -3608,11 +3645,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Comptador
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},El Toll de tancament de POS existeix per a {0} entre la data {1} i {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navegació
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Les factures pendents no requereixen una revaloració del tipus de canvi
 DocType: Authorization Rule,Customer / Item Name,Nom del client / element
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No s’ha de tenir un magatzem nou. El magatzem ha d&#39;estar establert per l&#39;entrada de valors o el rebut de compra
 DocType: Issue,Via Customer Portal,A través del portal de clients
 DocType: Work Order Operation,Planned Start Time,Hora d&#39;inici planificada
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} és {2}
+DocType: Service Level Priority,Service Level Priority,Prioritat del nivell de servei
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’amortitzacions reservades no pot ser superior al nombre total d’amortitzacions
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Compartir llibre major
 DocType: Journal Entry,Accounts Payable,Comptes a pagar
@@ -3723,7 +3762,6 @@
 DocType: Delivery Note,Delivery To,Lliurament a
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dades bancàries
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Actualització programada
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Manteniu les hores de facturació i les hores de treball mateix en el full de temps
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Pista d’orientació per font de plom.
 DocType: Clinical Procedure,Nursing User,Usuari d&#39;Infermeria
 DocType: Support Settings,Response Key List,Llista de claus de resposta
@@ -3891,6 +3929,7 @@
 DocType: Work Order Operation,Actual Start Time,Hora d&#39;inici real
 DocType: Antibiotic,Laboratory User,Usuari de laboratori
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Subhastes en línia
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,S&#39;ha repetit la prioritat {0}.
 DocType: Fee Schedule,Fee Creation Status,Estat de creació de comissions
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Programari
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Comanda de venda a pagament
@@ -3957,6 +3996,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,No s’ha pogut recuperar la informació de {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturació ha de ser igual a la moneda de la companyia per defecte o a la moneda del compte de partit
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Introduïu l’identificador de l’empleat d’aquesta persona comercial
+DocType: Shift Type,Early Exit Consequence after,Després de sortir de la conseqüència
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Creeu factures d&#39;obertura i de compra
 DocType: Disease,Treatment Period,Període de tractament
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Configuració del correu electrònic
@@ -3974,7 +4014,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Nom de l&#39;estudiant:
 DocType: SMS Log,Sent On,Enviada
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Factura de vendes
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,El temps de resposta no pot ser superior al temps de resolució
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per al grup d&#39;estudiants basats en cursos, el curs serà validat per a cada estudiant dels cursos matriculats en matrícula."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Subministraments intraestatals
 DocType: Employee,Create User Permission,Crear permisos d&#39;usuari
@@ -4013,6 +4052,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Termes contractuals estàndard per a vendes o compra.
 DocType: Sales Invoice,Customer PO Details,Detalls de client del client
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,No s&#39;ha trobat el pacient
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Seleccioneu una prioritat per defecte.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Elimineu l’element si les càrregues no s’apliquen a l’article
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Hi ha un grup de clients amb el mateix nom si us plau canvieu el nom del client o canvieu el nom del grup de clients
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4052,6 +4092,7 @@
 DocType: Support Settings,Support Portal,Portal de suport
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,La data de finalització de la tasca <b>{0}</b> no pot ser inferior a <b>{1}</b> data d&#39;inici prevista <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},L&#39;empleat {0} està en Deixar a {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Aquest acord de nivell de servei és específic per al client {0}
 DocType: Employee,Held On,S&#39;ha acabat
 DocType: Healthcare Practitioner,Practitioner Schedules,Horaris de practicants
 DocType: Project Template Task,Begin On (Days),Comenceu (dies)
@@ -4059,6 +4100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},L’ordre de treball ha estat {0}
 DocType: Inpatient Record,Admission Schedule Date,Data del calendari d’admissió
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Ajust de valors d’actius
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Marqueu l’assistència basant-vos en l’enviament de l’empleat per a empleats assignats a aquest torn.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Subministraments realitzats a persones no registrades
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Tots els treballs
 DocType: Appointment Type,Appointment Type,Tipus de cita
@@ -4172,7 +4214,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El pes total del paquet. Normalment pes net i pes del material d’embalatge. (per imprimir)
 DocType: Plant Analysis,Laboratory Testing Datetime,Datetime de proves de laboratori
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,L’element {0} no pot tenir Lots
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Canals de vendes per etapa
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Força del grup d&#39;estudiants
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Entrada de transaccions de declaració bancària
 DocType: Purchase Order,Get Items from Open Material Requests,Obteniu elements de sol·licituds de material obert
@@ -4254,7 +4295,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Mostra el magatzem envelliment
 DocType: Sales Invoice,Write Off Outstanding Amount,Escriviu la quantitat pendent excepcional
 DocType: Payroll Entry,Employee Details,Detalls dels empleats
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,L’hora d’inici no pot ser superior a l’hora de finalització de {0}.
 DocType: Pricing Rule,Discount Amount,Import de descompte
 DocType: Healthcare Service Unit Type,Item Details,Detalls de l’element
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Declaració de l&#39;impost duplicada de {0} per al període {1}
@@ -4307,7 +4347,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,El salari net no pot ser negatiu
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Nombre d&#39;interaccions
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},La fila {0} # ítem {1} no es pot transferir més de {2} que l’ordre de compra {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Canviar
+DocType: Attendance,Shift,Canviar
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Gràfic de processament de comptes i partits
 DocType: Stock Settings,Convert Item Description to Clean HTML,Convertiu la descripció de l&#39;element a HTML net
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Tots els grups de proveïdors
@@ -4378,6 +4418,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Unitat de servei de pares
 DocType: Sales Invoice,Include Payment (POS),Inclou pagament (TPV)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Capital privat
+DocType: Shift Type,First Check-in and Last Check-out,Primer registre i registre de sortida
 DocType: Landed Cost Item,Receipt Document,Document de recepció
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Període del quadre de comandament dels proveïdors
 DocType: Employee Grade,Default Salary Structure,Estructura del salari predeterminada
@@ -4460,6 +4501,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Crea una comanda de compra
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definiu el pressupost per a un exercici.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
+DocType: Employee Checkin,Entry Grace Period Consequence,Entrada Grace Period Conseqüence
 ,Payment Period Based On Invoice Date,Període de pagament basat en la data de facturació
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},La data d’instal·lació no pot ser abans de la data de lliurament de l’element {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Enllaç a la sol·licitud de material
@@ -4468,6 +4510,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: ja existeix una entrada de reordenació per a aquest magatzem {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Data de documentació
 DocType: Monthly Distribution,Distribution Name,Nom de distribució
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,La jornada laboral {0} s&#39;ha repetit.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Agrupeu-vos a persones que no pertanyen a grups
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Actualització en curs. Pot trigar una estona.
 DocType: Item,"Example: ABCD.#####
@@ -4480,6 +4523,7 @@
 DocType: Vehicle Log,Fuel Qty,Quantitat de combustible
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Desemborsat
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Temps després del final del torn durant el qual es considera la sortida per a assistència.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Canvi net de comptes a cobrar
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,No disponible
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Temps parcial
@@ -4493,7 +4537,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Mostra PDC a Print
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Supplier
 DocType: POS Profile User,POS Profile User,Usuari de perfil de PDI
-DocType: Student,Middle Name,Segon nom
 DocType: Sales Person,Sales Person Name,Nom de la persona de vendes
 DocType: Packing Slip,Gross Weight,Pes brut
 DocType: Journal Entry,Bill No,Projecte de llei núm
@@ -4502,7 +4545,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Acord de nivell de servei
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Seleccioneu primer l’empleat i la data
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,La taxa de valoració de l’article es recalcula tenint en compte l’import del val de cost d’aterratge
 DocType: Timesheet,Employee Detail,Detall dels empleats
 DocType: Tally Migration,Vouchers,Vouchers
@@ -4537,7 +4579,7 @@
 DocType: Additional Salary,Date on which this component is applied,Data en què s&#39;aplica aquest component
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Llista d’accionistes disponibles amb números de folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Configuració dels comptes de passarel·la.
-DocType: Service Level,Response Time Period,Període de temps de resposta
+DocType: Service Level Priority,Response Time Period,Període de temps de resposta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compreu impostos i càrrecs
 DocType: Course Activity,Activity Date,Activitat Data
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Seleccioneu o afegiu un client nou
@@ -4562,6 +4604,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Any financer
 DocType: Sales Invoice Item,Deferred Revenue,Ingressos diferits
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,"Almenys, cal seleccionar un dels productes de venda o de compra"
+DocType: Shift Type,Working Hours Threshold for Half Day,Llindar de les hores de treball per a mig dia
 ,Item-wise Purchase History,Historial de compres d’un article
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},No es pot canviar la data de parada del servei de l’element de la fila {0}
 DocType: Production Plan,Include Subcontracted Items,Inclou elements subcontractats
@@ -4594,6 +4637,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Permeten múltiples vegades el mateix element
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Crea BOM
 DocType: Healthcare Practitioner,Charges,Càrregues
+DocType: Employee,Attendance and Leave Details,Assistència i detalls de sortida
 DocType: Student,Personal Details,Detalls personals
 DocType: Sales Order,Billing and Delivery Status,Estat de facturació i lliurament
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: per al proveïdor es requereix {0} l’adreça de correu electrònic per enviar correu electrònic
@@ -4645,7 +4689,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Introduïu el valor entre {0} i {1}
 DocType: Purchase Order,Order Confirmation Date,Data de confirmació de la comanda
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcula els temps d’arribada estimats
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nomenament d&#39;empleats en Recursos humans&gt; Configuració de recursos humans
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumibles
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.AAAA.-
 DocType: Subscription,Subscription Start Date,Data d&#39;inici de la subscripció
@@ -4668,7 +4711,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Compte d’entrada de diari
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Activitat del fòrum
-DocType: Service Level,Resolution Time Period,Període de temps de resolució
+DocType: Service Level Priority,Resolution Time Period,Període de temps de resolució
 DocType: Request for Quotation,Supplier Detail,Detall del proveïdor
 DocType: Project Task,View Task,Veure la tasca
 DocType: Serial No,Purchase / Manufacture Details,Detalls de compra / fabricació
@@ -4735,6 +4778,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El magatzem només es pot canviar a través d’inerta de participació / nota de lliurament / rebut de compra
 DocType: Support Settings,Close Issue After Days,Tanca l&#39;emissió després de dies
 DocType: Payment Schedule,Payment Schedule,Pla de pagament
+DocType: Shift Type,Enable Entry Grace Period,Habilita el període de gràcia d’entrada
 DocType: Patient Relation,Spouse,Cònjuge
 DocType: Purchase Invoice,Reason For Putting On Hold,Motiu per posar en espera
 DocType: Item Attribute,Increment,Increment
@@ -4874,6 +4918,7 @@
 DocType: Vehicle Log,Invoice Ref,Factura Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},El formulari C no és aplicable a la factura: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Factura creada
+DocType: Shift Type,Early Exit Grace Period,Període de gràcia de sortida anticipada
 DocType: Patient Encounter,Review Details,Reviseu els detalls
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Fila {0}: el valor de les hores ha de ser superior a zero.
 DocType: Account,Account Number,Número de compte
@@ -4885,7 +4930,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Aplicable si l&#39;empresa és SpA, SApA o SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Condicions superposades que es troben entre:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Pagat i no lliurat
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,El codi d&#39;ítem és obligatori perquè l&#39;element no està numerat automàticament
 DocType: GST HSN Code,HSN Code,Codi HSN
 DocType: GSTR 3B Report,September,Setembre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Despeses administratives
@@ -4921,6 +4965,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Compte CWIP
 DocType: SMS Log,Sender Name,Nom del remitent
 DocType: Pricing Rule,Supplier Group,Grup de proveïdors
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Definiu l’hora de sortida i l’hora de finalització del dia de suport {0} a l’índex {1}.
 DocType: Employee,Date of Issue,Data d&#39;emissió
 ,Requested Items To Be Transferred,Els elements sol·licitats a transferir
 DocType: Employee,Contract End Date,Data de finalització del contracte
@@ -4931,6 +4977,7 @@
 DocType: Opportunity,Sales Stage,Etapa de vendes
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En paraules serà visible una vegada que hàgiu desat l’ordre de venda.
 DocType: Item Reorder,Re-order Level,Reordena el nivell
+DocType: Shift Type,Enable Auto Attendance,Activa l&#39;assistència automàtica
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Preferència
 ,Department Analytics,Departament d&#39;Analítica
 DocType: Crop,Scientific Name,Nom científic
@@ -4943,6 +4990,7 @@
 DocType: Quiz Activity,Quiz Activity,Activitat del qüestionari
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} no es troba en un període de nòmina vàlid
 DocType: Timesheet,Billed,Facturat
+apps/erpnext/erpnext/config/support.py,Issue Type.,Tipus d&#39;emissió.
 DocType: Restaurant Order Entry,Last Sales Invoice,Factura de les últimes vendes
 DocType: Payment Terms Template,Payment Terms,Condicions de pagament
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Quantitat reservada: quantitat ordenada per a la venda, però no enviada."
@@ -5038,6 +5086,7 @@
 DocType: Account,Asset,Actiu
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no té un calendari de professional de la salut. Afegeix-lo al mestre del professional de la salut
 DocType: Vehicle,Chassis No,Xassís núm
+DocType: Employee,Default Shift,Canvi per defecte
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Sigles d’empreses
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Arbre de la factura de materials
 DocType: Article,LMS User,Usuari LMS
@@ -5086,6 +5135,7 @@
 DocType: Sales Person,Parent Sales Person,Persona de venda de pares
 DocType: Student Group Creation Tool,Get Courses,Obteniu cursos
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: la quantitat ha de ser 1, ja que l’ítem és un actiu fix. Utilitzeu una fila separada per a quantitat múltiple."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Hores de treball per sota de les quals es marca l’absència. (Zero per desactivar)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Només es permeten els nodes de fulla en la transacció
 DocType: Grant Application,Organization,Organització
 DocType: Fee Category,Fee Category,Categoria de tarifes
@@ -5098,6 +5148,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Actualitzeu el vostre estat per a aquest esdeveniment de formació
 DocType: Volunteer,Morning,Matí
 DocType: Quotation Item,Quotation Item,Article de cotització
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Prioritat de l&#39;emissió.
 DocType: Journal Entry,Credit Card Entry,Entrada de targeta de crèdit
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","S&#39;ha omès la franja horària, la ranura {0} a {1} se superposa a la ranura {2} existent a {3}"
 DocType: Journal Entry Account,If Income or Expense,Si són ingressos o despeses
@@ -5148,11 +5199,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Importació i configuració de dades
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Si es marca l&#39;opció Auto Opció, els clients es vincularan automàticament amb el programa de fidelització corresponent (en desar)"
 DocType: Account,Expense Account,Compte de despeses
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,El temps abans de l’hora d’inici del torn durant la qual es considera que l’hora d’inici del registre d’empleats és freqüent.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Relació amb Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Crear factura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},La sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',L&#39;empleat rellevat a {0} s&#39;ha de configurar com a &#39;Esquerra&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Paga {0} {1}
+DocType: Company,Sales Settings,Configuració de vendes
 DocType: Sales Order Item,Produced Quantity,Quantitat produïda
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Es pot accedir a la sol·licitud d’oferta fent clic a l’enllaç següent
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la distribució mensual
@@ -5231,6 +5284,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Es creen plantilles d’impostos per defecte per a vendes i compres.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,El tipus de sortida {0} no es pot reenviar
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,El compte de dèbit ha de ser un compte de cobrament
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,La data de finalització de l’acord no pot ser inferior a l’actual.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},"Si us plau, establiu el compte a Magatzem {0} o el compte d’inventari per defecte a la companyia {1}"
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Establir com a defecte
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El pes net d’aquest paquet. (calculat automàticament com a suma del pes net dels articles)
@@ -5257,8 +5311,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Lots finalitzats
 DocType: Shipping Rule,Shipping Rule Type,Tipus de regla d&#39;enviament
 DocType: Job Offer,Accepted,Acceptat
-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’empleat <a href=""#Form/Employee/{0}"">{0}</a> per cancel·lar aquest document"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Ja heu avaluat els criteris d’avaluació {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Seleccioneu els números de lot
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Edat (dies)
@@ -5285,6 +5337,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Seleccioneu els vostres dominis
 DocType: Agriculture Task,Task Name,Nom de la tasca
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entrades d&#39;estoc ja creades per a l&#39;Ordre de Treball
+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’empleat <a href=""#Form/Employee/{0}"">{0}</a> per cancel·lar aquest document"
 ,Amount to Deliver,Import a lliurar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,La companyia {0} no existeix
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,No s’han trobat sol·licituds de material pendents que enllacin els elements indicats.
@@ -5334,6 +5388,7 @@
 DocType: Lab Prescription,Test Code,Codi de prova
 DocType: Purchase Taxes and Charges,On Previous Row Total,A la fila anterior Total
 DocType: Student,Student Email Address,Adreça de correu electrònic de l&#39;estudiant
+,Delayed Item Report,Informe d&#39;ítem retardat
 DocType: Academic Term,Education,Educació
 DocType: Supplier Quotation,Supplier Address,Adreça del proveïdor
 DocType: Salary Detail,Do not include in total,No inclogueu en total
@@ -5341,7 +5396,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} no existeix
 DocType: Purchase Receipt Item,Rejected Quantity,Quantitat rebutjada
 DocType: Cashier Closing,To TIme,Al temps
-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}) que no s’ha trobat per a l’article: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Resum de treball diari Usuari del grup
 DocType: Fiscal Year Company,Fiscal Year Company,Empresa de l’exercici fiscal
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,L’element alternatiu no ha de ser el mateix que el codi de l’article
@@ -5393,6 +5447,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Retard entre parades de lliurament
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelació d’estades de més de [dies]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Esquema de productes de descompte promocional
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,La prioritat del problema ja existeix
 DocType: Account,Asset Received But Not Billed,Actiu rebut però no facturat
 DocType: POS Closing Voucher,Total Collected Amount,Import total recaptat
 DocType: Course,Default Grading Scale,Escala de qualificació per defecte
@@ -5435,6 +5490,7 @@
 DocType: Contract,Fulfilment Terms,Termes de compliment
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Sense grup a grup
 DocType: Student Guardian,Mother,Mare
+DocType: Issue,Service Level Agreement Fulfilled,Acord de nivell de servei realitzat
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Deduïu impostos sobre beneficis per als empleats no reclamats
 DocType: Travel Request,Travel Funding,Finançament de viatges
 DocType: Shipping Rule,Fixed,S&#39;ha corregit
@@ -5464,10 +5520,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,No s’ha trobat cap element.
 DocType: Item Attribute,From Range,Del rang
 DocType: Clinical Procedure,Consumables,Consumibles
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,Es requereixen &quot;employee_field_value&quot; i &quot;timestamp&quot;.
 DocType: Purchase Taxes and Charges,Reference Row #,Fila de referència
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Configureu &quot;Centre de cost d’amortització d’actius&quot; a la companyia {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: es necessita un document de pagament per completar la transmissió
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Feu clic en aquest botó per treure les dades de la vostra comanda de venda d’Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Hores de treball per sota de les quals es marca el mig dia (Zero per desactivar)
 ,Assessment Plan Status,Estat del pla d’avaluació
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Seleccioneu {0} primer
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Envieu-ho per crear el registre de l’empleat
@@ -5538,6 +5596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Establir obert
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Canviar els filtres
 DocType: Production Plan,Material Request Detail,Detall de sol·licitud de material
+DocType: Shift Type,Process Attendance After,Procés d&#39;assistència després
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i magatzem
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Aneu a Programes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Fila # {0}: entrada duplicada a les referències {1} {2}
@@ -5595,6 +5654,7 @@
 DocType: Pricing Rule,Party Information,Informació del partit
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Deutors ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Fins ara no es pot superar la data de l&#39;alliberament de l&#39;empleat
+DocType: Shift Type,Enable Exit Grace Period,Activa el període de sortida de gràcia
 DocType: Expense Claim,Employees Email Id,Identificador de correu electrònic dels empleats
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Actualització del preu de la llista de preus de Shopify To ERPNext
 DocType: Healthcare Settings,Default Medical Code Standard,Norma per defecte del codi mèdic
@@ -5625,7 +5685,6 @@
 DocType: Budget,Applicable on Material Request,Aplicable a la sol·licitud de material
 DocType: Support Settings,Search APIs,Cerca de les API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Percentatge de sobreproducció per ordre de venda
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Especificacions
 DocType: Purchase Invoice,Supplied Items,Articles subministrats
 DocType: Leave Control Panel,Select Employees,Seleccioneu Empleats
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Seleccioneu el compte d&#39;ingressos d&#39;interès en préstec {0}
@@ -5651,7 +5710,7 @@
 ,Supplier-Wise Sales Analytics,Anàlisi de vendes sàvia del proveïdor
 DocType: GSTR 3B Report,February,Febrer
 DocType: Appraisal,For Employee,Per a empleats
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Data de lliurament real
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Data de lliurament real
 DocType: Sales Partner,Sales Partner Name,Nom del soci de vendes
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Línia d’amortització {0}: la data d’inici de l’amortització s’introdueix com a data passada
 DocType: GST HSN Code,Regional,Regional
@@ -5690,6 +5749,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Quadre de comandament del proveïdor
 DocType: Travel Itinerary,Travel To,Viatjar a
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Marcar l&#39;assistència
+DocType: Shift Type,Determine Check-in and Check-out,Determineu l’entrada i el registre de sortida
 DocType: POS Closing Voucher,Difference,Diferència
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Petit
 DocType: Work Order Item,Work Order Item,Article de comanda de treball
@@ -5723,6 +5783,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Medicament
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} està tancat
 DocType: Patient,Medical History,Historial mèdic
+DocType: Expense Claim,Expense Taxes and Charges,Impostos i despeses de despeses
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Nombre de dies posteriors a la data de la factura abans de cancel·lar la subscripció o marcar la subscripció com a impagats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,La nota d’instal·lació {0} ja s’ha enviat
 DocType: Patient Relation,Family,Família
@@ -5755,7 +5816,6 @@
 DocType: Dosage Strength,Strength,Força
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessiten a {2} per completar aquesta transacció.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Inflamació de matèries primeres de subcontractació basades en
-DocType: Bank Guarantee,Customer,Client
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Si està habilitat, el camp Termini acadèmic serà obligatori a l&#39;eina d&#39;inscripció al programa."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Per al grup d&#39;estudiants basat en lots, el lot d&#39;estudiants serà validat per a cada estudiant de la matrícula del programa."
 DocType: Course,Topics,Temes
@@ -5835,6 +5895,7 @@
 DocType: Chapter,Chapter Members,Membres del capítol
 DocType: Warranty Claim,Service Address,Adreça del servei
 DocType: Journal Entry,Remark,Observació
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: la quantitat no disponible per a {4} al magatzem {1} en el moment de publicar l’entrada ({2} {3})
 DocType: Patient Encounter,Encounter Time,Temps de trobada
 DocType: Serial No,Invoice Details,Detalls de la factura
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Es poden fer comptes addicionals sota Grups, però les entrades es poden fer en contra dels no-Grups"
@@ -5915,6 +5976,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Tancament (obertura + total)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Fórmula de criteris
 apps/erpnext/erpnext/config/support.py,Support Analytics,Suport a Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Identificador de dispositiu d&#39;assistència (identificador biomètric / etiqueta RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisió i acció
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, les entrades es permeten als usuaris restringits."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Import després d’amortització
@@ -5936,6 +5998,7 @@
 DocType: Salary Slip,Loan Repayment,Amortització de préstecs
 DocType: Employee Education,Major/Optional Subjects,Assignatures majors / opcionals
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Adreces i contactes dels proveïdors
 DocType: Bank Guarantee,Bank Guarantee Type,Tipus de garantia bancària
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si es desactiva, el camp &quot;Total arrodonit&quot; no serà visible en cap transacció"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5974,6 +6037,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Obertura de l’element de l’eina de creació de factures
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Inclou transaccions de TPV
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},No s’ha trobat cap empleat per al valor del camp de l’empleat donat. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Import rebut (moneda de l’empresa)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage està ple, no ha desat"
 DocType: Chapter Member,Chapter Member,Capítol membre
@@ -6006,6 +6070,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,No s’ha creat cap grup d’estudiants.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Duplicar la fila {0} amb el mateix {1}
 DocType: Employee,Salary Details,Detalls de salari
+DocType: Employee Checkin,Exit Grace Period Consequence,Surt de la conseqüència del període de gràcia
 DocType: Bank Statement Transaction Invoice Item,Invoice,Factura
 DocType: Special Test Items,Particulars,Particulars
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Configureu el filtre segons l’element o el magatzem
@@ -6107,6 +6172,7 @@
 DocType: Serial No,Out of AMC,Fora d&#39;AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil de treball, qualificacions requerides, etc."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Envia a l&#39;Estat
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Voleu enviar la sol·licitud de material
 DocType: Opportunity Item,Basic Rate,Tarifa bàsica
 DocType: Compensatory Leave Request,Work End Date,Data de finalització del treball
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Sol·licitud de matèries primeres
@@ -6292,6 +6358,7 @@
 DocType: Sales Order Item,Gross Profit,Benefici brut
 DocType: Quality Inspection,Item Serial No,Número de sèrie de l&#39;article
 DocType: Asset,Insurer,Asseguradora
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Compra d’import
 DocType: Asset Maintenance Task,Certificate Required,Certificat necessari
 DocType: Retention Bonus,Retention Bonus,Bonificació de retenció
@@ -6407,6 +6474,8 @@
 DocType: Invoice Discounting,Sanctioned,Sancionat
 DocType: Course Enrollment,Course Enrollment,Inscripció al curs
 DocType: Item,Supplier Items,Elements del proveïdor
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",L’hora d’inici no pot ser igual o superior a l’hora de finalització de {0}.
 DocType: Sales Order,Not Applicable,No aplicable
 DocType: Support Search Source,Response Options,Opcions de resposta
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} hauria de tenir un valor entre 0 i 100
@@ -6491,7 +6560,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Actius fixos
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Guanys totals
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Share Balance,From No,Des del núm
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura de reconciliació de pagaments
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i despeses afegits
@@ -6599,6 +6667,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignora la regla de preus
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Aliments
 DocType: Lost Reason Detail,Lost Reason Detail,Detall de la raó perduda
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Es van crear els següents números de sèrie: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Comentaris dels clients
 DocType: Serial No,Warranty / AMC Details,Detalls de la garantia / AMC
 DocType: Issue,Opening Time,Horari d&#39;obertura
@@ -6648,6 +6717,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,El nom de l&#39;empresa no és el mateix
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,La promoció dels empleats no es pot enviar abans de la data de promoció
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},No es permet actualitzar les transaccions de valors més grans que {0}
+DocType: Employee Checkin,Employee Checkin,Facturació dels empleats
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La data d&#39;inici ha de ser inferior a la data de finalització de l&#39;element {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Creeu pressupostos de clients
 DocType: Buying Settings,Buying Settings,Configuració de la compra
@@ -6669,6 +6739,7 @@
 DocType: Patient,Patient Demographics,Demografia del pacient
 DocType: Share Transfer,To Folio No,A Folio núm
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Flux de caixa procedent d’operacions
+DocType: Employee Checkin,Log Type,Tipus de registre
 DocType: Stock Settings,Allow Negative Stock,Permet estoc negatiu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Cap dels ítems té cap canvi en quantitat o valor.
 DocType: Asset,Purchase Date,Data de compra
@@ -6713,6 +6784,7 @@
 DocType: Vital Signs,Very Hyper,Molt hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Seleccioneu la naturalesa del vostre negoci.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Seleccioneu el mes i l’any
+DocType: Service Level,Default Priority,Prioritat per defecte
 DocType: Student Log,Student Log,Registre d&#39;estudiants
 DocType: Shopping Cart Settings,Enable Checkout,Activa la comprovació
 apps/erpnext/erpnext/config/settings.py,Human Resources,Recursos humans
@@ -6741,7 +6813,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Connect Shopify amb ERPNext
 DocType: Homepage Section Card,Subtitle,Subtítol
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: BOM,Scrap Material Cost(Company Currency),Cost del material de ferralla (moneda de la companyia)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,No s’ha d’enviar la nota de lliurament {0}
 DocType: Task,Actual Start Date (via Time Sheet),Data d&#39;inici real (a través del full de temps)
@@ -6797,6 +6868,7 @@
 DocType: Drug Prescription,Dosage,Dosi
 DocType: Cheque Print Template,Starting position from top edge,Posició inicial des de la vora superior
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Durada de la cita (minuts)
+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 horària. {0}
 DocType: Accounting Dimension,Disable,Inhabilitar
 DocType: Email Digest,Purchase Orders to Receive,Ordres de compra per rebre
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Produccions Les comandes no es poden recopilar per:
@@ -6812,7 +6884,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Material transferit per subcontractació
 DocType: Job Card,Timing Detail,Detall de sincronització
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Obligatori activat
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Importació de {0} de {1}
 DocType: Job Offer Term,Job Offer Term,Termini de l’oferta de feina
 DocType: SMS Center,All Contact,Tots els contactes
 DocType: Project Task,Project Task,Tasca del projecte
@@ -6863,7 +6934,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,L’element {0} no s’ha configurat per als números de sèrie. Check Item master
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,De l&#39;Estat
 DocType: Leave Type,Maximum Continuous Days Applicable,Dies màxims continus aplicables
-apps/erpnext/erpnext/config/support.py,Support Team.,Equip de suport.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Introduïu primer el nom de l’empresa
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importa amb èxit
 DocType: Guardian,Alternate Number,Número alternatiu
@@ -6955,6 +7025,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Fila # {0}: article afegit
 DocType: Student Admission,Eligibility and Details,Elegibilitat i detalls
 DocType: Staffing Plan,Staffing Plan Detail,Detall del pla de personal
+DocType: Shift Type,Late Entry Grace Period,Període de presentació tardà
 DocType: Email Digest,Annual Income,Renda anual
 DocType: Journal Entry,Subscription Section,Secció de subscripció
 DocType: Salary Slip,Payment Days,Dies de pagament
@@ -7005,6 +7076,7 @@
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 DocType: Asset Maintenance Log,Periodicity,Periodicitat
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Registre mèdic
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,El tipus de registre és necessari per a les revisions que cauen al torn: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Execució
 DocType: Item,Valuation Method,Mètode de valoració
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} contra la factura de vendes {1}
@@ -7089,6 +7161,7 @@
 DocType: Loan Type,Loan Name,Nom del préstec
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Estableix el mode de pagament predeterminat
 DocType: Quality Goal,Revision,Revisió
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,El temps abans del torn finalitza l’hora en què es considera la sortida abans (en minuts).
 DocType: Healthcare Service Unit,Service Unit Type,Tipus d&#39;unitat de servei
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolució contra la factura de compra
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Genera el secret
@@ -7244,12 +7317,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Cosmètics
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Marqueu-ho si voleu forçar l’usuari a seleccionar una sèrie abans de desar. No hi haurà cap defecte si comproveu això.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquesta funció poden establir comptes congelats i crear / modificar entrades comptables contra comptes congelats
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi d&#39;ítem&gt; Grup d&#39;articles&gt; Marca
 DocType: Expense Claim,Total Claimed Amount,Import total reclamat
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},No s’ha pogut trobar la ranura de temps als {0} dies següents per a l’operació {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Ajustament
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Només es pot renovar si la seva subscripció expira dins dels 30 dies
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},El valor ha de ser entre {0} i {1}
 DocType: Quality Feedback,Parameters,Paràmetres
+DocType: Shift Type,Auto Attendance Settings,Paràmetres d’assistència automàtica
 ,Sales Partner Transaction Summary,Resum de la transacció de soci de vendes
 DocType: Asset Maintenance,Maintenance Manager Name,Nom del gestor de manteniment
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,És necessari per obtenir detalls de l’element.
@@ -7341,10 +7416,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Valideu la regla aplicada
 DocType: Job Card Item,Job Card Item,Element de la targeta de treball
 DocType: Homepage,Company Tagline for website homepage,Tagline d&#39;empresa per a la pàgina web del lloc web
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Definiu el temps de resposta i la resolució per a la prioritat {0} a l’índex {1}.
 DocType: Company,Round Off Cost Center,Centre de cost reduït
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteris Pes
 DocType: Asset,Depreciation Schedules,Calendaris d’amortització
-DocType: Expense Claim Detail,Claim Amount,Quantitat de reclamació
 DocType: Subscription,Discounts,Descomptes
 DocType: Shipping Rule,Shipping Rule Conditions,Condicions de la norma d’enviament
 DocType: Subscription,Cancelation Date,Data de cancel·lació
@@ -7372,7 +7447,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Mostra valors zero
 DocType: Employee Onboarding,Employee Onboarding,Empleat onboarding
 DocType: POS Closing Voucher,Period End Date,Data de finalització del període
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Oportunitats de venda per font
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,El primer deixar l’aprovador de la llista s’ha establert com a valoració Deixa l’autorització.
 DocType: POS Settings,POS Settings,Configuració del TPV
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Tots els comptes
@@ -7393,7 +7467,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: la tarifa ha de ser la mateixa que {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Articles del servei sanitari
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,No s’ha trobat cap registre
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Gamma d’envelliment 3
 DocType: Vital Signs,Blood Pressure,Pressió sanguínea
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Target On
@@ -7440,6 +7513,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Lots
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Defensa
 DocType: Item,Has Batch No,Té lot núm
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Dies retardats
 DocType: Lead,Person Name,Nom de la persona
 DocType: Item Variant,Item Variant,Variant de l&#39;element
 DocType: Training Event Employee,Invited,Invitat
@@ -7461,7 +7535,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Les dates d&#39;inici i de finalització no es troben en un període de nòmina vàlid, no es pot calcular {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Mostra només al client d&#39;aquests grups de clients
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Seleccioneu els elements per desar la factura
-DocType: Service Level,Resolution Time,Temps de resolució
+DocType: Service Level Priority,Resolution Time,Temps de resolució
 DocType: Grading Scale Interval,Grade Description,Descripció de qualificacions
 DocType: Homepage Section,Cards,Targetes
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Actes de reunions de qualitat
@@ -7488,6 +7562,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Balanç de declaració bancària segons el llibre major
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Assistència sanitària (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Magatzem per defecte a per crear una ordre de venda i una nota de lliurament
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,El temps de resposta de {0} a l’índex {1} no pot ser superior al temps de resolució.
 DocType: Opportunity,Customer / Lead Name,Nom del client / líder
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Import no reclamat
@@ -7534,7 +7609,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Importació de parts i adreces
 DocType: Item,List this Item in multiple groups on the website.,Enumereu aquest article en diversos grups del lloc web.
 DocType: Request for Quotation,Message for Supplier,Missatge per al proveïdor
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,No es pot canviar {0} a mesura que existeixi la transacció de valors de l’element {1}.
 DocType: Healthcare Practitioner,Phone (R),Telèfon (R)
 DocType: Maintenance Team Member,Team Member,Membre de l&#39;equip
 DocType: Asset Category Account,Asset Category Account,Compte de la categoria d’actius
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 31e3d64..9c4426b 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Schůzka {0} a prodejní faktura {1} byla zrušena
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Vaše emailová adresa...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Zahrnout výchozí položky knihy
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Zahrnout výchozí položky knihy
 DocType: Activity Cost,Activity Type,Aktivní typ
 DocType: Purchase Invoice,Get Advances Paid,Zaplacené zálohy
 DocType: Company,Gain/Loss Account on Asset Disposal,Zisk / ztráta z prodeje aktiv
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Platební položky
 DocType: Employee Education,Class / Percentage,Třída / Procenta
 ,Electronic Invoice Register,Elektronický registr faktur
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Počet výskytů, po kterých je důsledek proveden."
 DocType: Sales Invoice,Is Return (Credit Note),Is Return (Credit Note)
+DocType: Price List,Price Not UOM Dependent,Cena není závislá na UOM
 DocType: Lab Test Sample,Lab Test Sample,Vzorek laboratorního testu
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pro např. 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Čistá mzda
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Celkový fakturovaný Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Fakturace spotřebního materiálu odděleně
+DocType: Shift Type,Working Hours Threshold for Absent,Prahová hodnota pracovní doby pro nepřítomnost
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Rozpočet nelze přiřadit k účtu skupiny {0}
 DocType: Purchase Receipt Item,Rate and Amount,Sazba a částka
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Asset,Insurance End Date,Datum ukončení pojištění
 DocType: Bank Account,Branch Code,Kód pobočky
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Čas reagovat
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Uživatelské fórum
 DocType: Landed Cost Item,Landed Cost Item,Položka nákladových nákladů
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Prodávající a kupující nemohou být stejní
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Převod
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Vyhledávací položka (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Výsledek odeslán
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od data nemůže být větší než k dnešnímu dni
 DocType: Supplier,Supplier of Goods or Services.,Dodavatel zboží nebo služeb.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Název nového účtu. Poznámka: Nevytvářejte účty pro zákazníky a dodavatele
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentská skupina nebo rozvrh kurzu je povinný
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Jméno dovednosti
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Tisk sestavy
 DocType: Soil Texture,Ternary Plot,Ternární pozemek
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte položku Řada jmen pro {0} přes Nastavení&gt; Nastavení&gt; Řada názvů
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Podpora Vstupenky
 DocType: Asset Category Account,Fixed Asset Account,Účet stálých aktiv
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Nejnovější
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Povinné Pro rozvahu
 DocType: Payment Entry,Total Allocated Amount,Celková přidělená částka
 DocType: Sales Invoice,Get Advances Received,Získané zálohy
+DocType: Shift Type,Last Sync of Checkin,Poslední synchronizace služby Checkin
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Položka Daňová částka zahrnuta v hodnotě
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Krevní skupina
 apps/erpnext/erpnext/config/healthcare.py,Masters,Mistři
 DocType: Crop,Crop Spacing UOM,Mezera oříznutí UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Čas po zahájení startu, kdy je check-in považován za pozdní (v minutách)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Prozkoumat
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Nebyly nalezeny žádné zbývající faktury
 DocType: Promotional Scheme,Product Discount Slabs,Desky slev na výrobky
 DocType: Hotel Room Package,Amenities,Vybavení
 DocType: Lab Test Groups,Add Test,Přidat test
@@ -1004,6 +1009,7 @@
 DocType: Item,Moving Average,Pohyblivý průměr
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačená účast
 DocType: Homepage Section,Number of Columns,Počet sloupců
+DocType: Issue Priority,Issue Priority,Priorita problému
 DocType: Holiday List,Add Weekly Holidays,Přidat týdenní svátky
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Vytvořit platový skluz
@@ -1012,6 +1018,7 @@
 DocType: Warranty Claim,Issue Date,Datum vydání
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte dávku pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Nelze vytvořit retenční bonus pro levé zaměstnance
+DocType: Employee Checkin,Location / Device ID,Umístění / ID zařízení
 DocType: Purchase Order,To Receive,Obdržet
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Nacházíte se v režimu offline. Nebudete moci znovu načíst, dokud nebudete mít síť."
 DocType: Course Activity,Enrollment,Zápis
@@ -1020,7 +1027,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Chybí informace o elektronické fakturaci
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nebyl vytvořen žádný požadavek na materiál
-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
 DocType: Loan,Total Amount Paid,Celková částka zaplacena
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Všechny tyto položky již byly fakturovány
 DocType: Training Event,Trainer Name,Jméno trenéra
@@ -1131,6 +1137,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Uveďte prosím úvodní jméno ve vedení {0}
 DocType: Employee,You can enter any date manually,Můžete zadat libovolné datum ručně
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Položka odsouhlasení zásob
+DocType: Shift Type,Early Exit Consequence,Důsledek předčasného ukončení
 DocType: Item Group,General Settings,Obecné nastavení
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Datum splatnosti nesmí být před účtováním / datem faktury dodavatele
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Před odesláním zadejte jméno příjemce.
@@ -1169,6 +1176,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Potvrzení platby
 ,Available Stock for Packing Items,Dostupný sklad pro položky balení
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Odstraňte prosím tuto fakturu {0} z formuláře C {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Každé platné přihlášení a odhlášení
 DocType: Support Search Source,Query Route String,Řetězec dotazu dotazu
 DocType: Customer Feedback Template,Customer Feedback Template,Šablona zpětné vazby od zákazníků
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citáty vedoucí nebo zákazníky.
@@ -1203,6 +1211,7 @@
 DocType: Authorization Control,Authorization Control,Řízení autorizace
 ,Daily Work Summary Replies,Odpovědi na denní práci
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
+DocType: Issue,Response By Variance,Odezva Odchylka
 DocType: Item,Sales Details,Podrobnosti o prodeji
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Dopis hlavy pro tiskové šablony.
 DocType: Salary Detail,Tax on additional salary,Daň z příplatku
@@ -1326,6 +1335,7 @@
 DocType: Project,Task Progress,Průběh úkolů
 DocType: Journal Entry,Opening Entry,Otevření vstupu
 DocType: Bank Guarantee,Charges Incurred,Vznikly poplatky
+DocType: Shift Type,Working Hours Calculation Based On,Výpočet pracovních hodin založený na
 DocType: Work Order,Material Transferred for Manufacturing,Materiál převedený na výrobu
 DocType: Products Settings,Hide Variants,Skrýt varianty
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Zakázat plánování kapacity a sledování času
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,Zájmy
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Spotřebované množství
 DocType: Education Settings,Education Manager,Manažer vzdělávání
+DocType: Employee Checkin,Shift Actual Start,Shift Skutečný start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plánujte protokoly mimo pracovní hodiny pracovní stanice.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Věrnostní body: {0}
 DocType: Healthcare Settings,Registration Message,Registrační zpráva
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Faktura již byla vytvořena pro všechny fakturační hodiny
 DocType: Sales Partner,Contact Desc,Kontaktní formulář
 DocType: Purchase Invoice,Pricing Rules,Cenová pravidla
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",Vzhledem k existenci transakcí proti položce {0} nelze hodnotu {1} změnit.
 DocType: Hub Tracked Item,Image List,Seznam obrázků
 DocType: Item Variant Settings,Allow Rename Attribute Value,Povolit hodnotu Přejmenovat atribut
-DocType: Price List,Price Not UOM Dependant,Cena není závislá na UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Čas (v minutách)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Základní
 DocType: Loan,Interest Income Account,Účet úrokových výnosů
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Zvolte POS profil
 DocType: Support Settings,Get Latest Query,Získejte nejnovější dotaz
 DocType: Employee Incentive,Employee Incentive,Motivace zaměstnanců
+DocType: Service Level,Priorities,Priority
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Přidání karet nebo vlastních sekcí na domovské stránce
 DocType: Homepage,Hero Section Based On,Hero sekce založená na
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celková nákupní cena (prostřednictvím nákupní faktury)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Objednané množství
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutý sklad je povinný proti odmítnuté položce {1}
 ,Received Items To Be Billed,"Přijaté položky, které mají být účtovány"
-DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
+DocType: Attendance,Working Hours,Pracovní doba
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Platební režim
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Položky objednávky nebyly včas doručeny
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Doba trvání ve dnech
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Statutární informace a další obecné informace o dodavateli
 DocType: Item Default,Default Selling Cost Center,Středisko výchozích prodejních nákladů
 DocType: Sales Partner,Address & Contacts,Adresa a kontakty
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte prosím číslovací řadu pro Docházku pomocí Nastavení&gt; Číslovací řada
 DocType: Subscriber,Subscriber,Odběratel
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) není skladem
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Nejdříve vyberte Datum účtování
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,Úlohy byly vytvořeny
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Pro tuto položku nebo její šablonu musí být aktivní výchozí rozpiska ({0})
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Sazba Komise
-DocType: Service Level,Response Time,Doba odezvy
+DocType: Service Level Priority,Response Time,Doba odezvy
 DocType: Woocommerce Settings,Woocommerce Settings,Nastavení Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Množství musí být kladné
 DocType: Contract,CRM,CRM
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Mapování transakčních dat
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Vedení vyžaduje jméno osoby nebo jméno organizace
 DocType: Student,Guardians,Strážci
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím instruktorský systém pojmenování ve výuce&gt; Nastavení vzdělávání
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Vybrat značku ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Střední příjem
 DocType: Shipping Rule,Calculate Based On,Vypočítat na základě
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Záznam o docházce {0} existuje proti studentovi {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Datum transakce
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Zrušit předplatné
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Nelze nastavit dohodu o úrovni služeb {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Čistá částka mzdy
 DocType: Account,Liability,Odpovědnost
 DocType: Employee,Bank A/C No.,Bankovní číslo A / C
@@ -1701,7 +1712,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kód položky suroviny
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Faktura nákupu {0} je již odeslána
 DocType: Fees,Student Email,E-mail studenta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Rekurze kusovníku: {0} nemůže být rodičem nebo dítětem {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Získejte položky ze zdravotnických služeb
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Položka vstupu {0} není odeslána
 DocType: Item Attribute Value,Item Attribute Value,Hodnota atributu položky
@@ -1726,7 +1736,6 @@
 DocType: Production Plan,Select Items to Manufacture,Vyberte položky k výrobě
 DocType: Leave Application,Leave Approver Name,Opustit jméno schvalovatele
 DocType: Shareholder,Shareholder,Akcionář
-DocType: Issue,Agreement Status,Stav dohody
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Vyberte prosím studentský vstup, který je povinný pro zaplaceného studenta"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Vyberte kusovník
@@ -1989,6 +1998,7 @@
 DocType: Account,Income Account,Účet příjmů
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Všechny sklady
 DocType: Contract,Signee Details,Podrobnosti o signee
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Povolit odhlášení po ukončení řazení (v minutách)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Procurement
 DocType: Item Group,Check this if you want to show in website,"Zaškrtněte toto, pokud chcete zobrazit na webu"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiskální rok {0} nebyl nalezen
@@ -2055,6 +2065,7 @@
 DocType: Activity Cost,Billing Rate,Fakturační kurz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Upozornění: Další {0} # {1} existuje proti položce {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,"Chcete-li odhadnout a optimalizovat trasy, povolte nastavení Map Google"
+DocType: Purchase Invoice Item,Page Break,Přerušení stránky
 DocType: Supplier Scorecard Criteria,Max Score,Maximální skóre
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Datum začátku splácení nemůže být před datem výplaty.
 DocType: Support Search Source,Support Search Source,Zdroj vyhledávání podpory
@@ -2121,6 +2132,7 @@
 DocType: Employee Transfer,Employee Transfer,Převod zaměstnanců
 ,Sales Funnel,Prodejní nálevka
 DocType: Agriculture Analysis Criteria,Water Analysis,Analýza vody
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Zahájit odbavení před zahájením směny (v minutách)
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Zmrazené nahoru
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Není co editovat.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Operace {0} delší než jakákoli dostupná pracovní doba v pracovní stanici {1} rozdělte operaci do více operací
@@ -2134,7 +2146,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Zakázka odběratele {0} je {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Zpoždění platby (dny)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Zadejte podrobnosti o odpisech
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Zákaznické PO
 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 odběratele
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Množství položky nesmí být nulové
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Neplatný atribut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Vyberte položku BOM proti položce {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Typ faktury
@@ -2144,6 +2158,7 @@
 DocType: Volunteer,Afternoon,Odpoledne
 DocType: Vital Signs,Nutrition Values,Hodnoty výživy
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Přítomnost horečky (teplota&gt; 38,5 ° C / 101,3 ° F nebo trvalá teplota&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavení systému pojmenování zaměstnanců v nastavení lidských zdrojů&gt; Nastavení HR
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Reversed
 DocType: Project,Collect Progress,Sbírejte průběh
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energie
@@ -2194,6 +2209,7 @@
 ,Ordered Items To Be Billed,Objednané položky k vyúčtování
 DocType: Taxable Salary Slab,To Amount,Částka
 DocType: Purchase Invoice,Is Return (Debit Note),Is Return (Debet Note)
+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/config/desktop.py,Getting Started,Začínáme
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Spojit
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nelze změnit datum zahájení fiskálního roku a datum ukončení fiskálního roku po uložení fiskálního roku.
@@ -2212,8 +2228,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro sériové číslo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Řádek {0}: Kurz je povinný
 DocType: Purchase Invoice,Select Supplier Address,Vyberte adresu dodavatele
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Dostupné množství je {0}, které potřebujete {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Zadejte prosím tajné rozhraní API pro spotřebitele
 DocType: Program Enrollment Fee,Program Enrollment Fee,Poplatek za zápis programu
+DocType: Employee Checkin,Shift Actual End,Shift Skutečný konec
 DocType: Serial No,Warranty Expiry Date,Datum vypršení záruky
 DocType: Hotel Room Pricing,Hotel Room Pricing,Ceny hotelových pokojů
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Zdanitelné dodávky (jiné než nulové, s nulovým ratingem a osvobozené od daně)"
@@ -2273,6 +2291,7 @@
 DocType: Quality Inspection Reading,Reading 5,Čtení 5
 DocType: Shopping Cart Settings,Display Settings,Nastavení obrazovky
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Nastavte počet odpisů rezervovaných
+DocType: Shift Type,Consequence after,Následek po
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,S čím potřebuješ pomoci?
 DocType: Journal Entry,Printing Settings,Nastavení tisku
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bankovnictví
@@ -2282,6 +2301,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Fakturační adresa je stejná jako adresa pro odesílání
 DocType: Account,Cash,Hotovost
 DocType: Employee,Leave Policy,Opustit politiku
+DocType: Shift Type,Consequence,Následek
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Adresa studenta
 DocType: GST Account,CESS Account,Účet CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Nákladové středisko je vyžadováno pro účet &#39;Zisk a ztráta&#39; {2}. Nastavte prosím pro společnost výchozí výrobní středisko.
@@ -2344,6 +2364,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Poukaz na uzavření období
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Název Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Zadejte prosím účet výdajů
+DocType: Issue,Resolution By Variance,Rozlišení
 DocType: Employee,Resignation Letter Date,Datum odstoupení
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Doposud
@@ -2356,6 +2377,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Zobrazit nyní
 DocType: Item Price,Valid Upto,Platné Nahoru
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Odkaz Doctype musí být jeden z {0}
+DocType: Employee Checkin,Skip Auto Attendance,Přeskočit automatickou účast
 DocType: Payment Request,Transaction Currency,Měna transakce
 DocType: Loan,Repayment Schedule,Splátkový kalendář
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Vytvořte položku skladu vzorku
@@ -2427,6 +2449,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Daňové uzávěrky POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Akce Inicializováno
 DocType: POS Profile,Applicable for Users,Platí pro uživatele
+,Delayed Order Report,Zpráva o zpožděném příkazu
 DocType: Training Event,Exam,Zkouška
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Byl nalezen nesprávný počet položek hlavní knihy. Možná jste v transakci vybrali nesprávný účet.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Prodejní potrubí
@@ -2441,10 +2464,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Podmínky budou aplikovány na všechny vybrané položky.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigurovat
 DocType: Hotel Room,Capacity,Kapacita
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Instalované množství
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Dávka {0} položky {1} je zakázána.
 DocType: Hotel Room Reservation,Hotel Reservation User,Uživatel rezervačního systému
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Pracovní den byl opakován dvakrát
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Smlouva o úrovni služby s typem entity {0} a entitou {1} již existuje.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Skupina položek neuvedená v hlavní položce položky pro položku {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Chyba názvu: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Území je vyžadováno v POS profilu
@@ -2492,6 +2516,7 @@
 DocType: Depreciation Schedule,Schedule Date,Plán Datum
 DocType: Packing Slip,Package Weight Details,Podrobnosti o hmotnosti balení
 DocType: Job Applicant,Job Opening,Zahájení práce
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Poslední známá úspěšná synchronizace zaměstnanců Checkin. Obnovit pouze tehdy, pokud jste si jisti, že všechny protokoly jsou synchronizovány ze všech míst. Prosím, neupravujte to, pokud si nejste jisti."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Aktuální cena
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Celková záloha ({0}) proti objednávce {1} nemůže být větší než celkový součet ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Varianty položek aktualizovány
@@ -2536,6 +2561,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Získejte Faktury
 DocType: Tally Migration,Is Day Book Data Imported,Je importována data denní knihy
 ,Sales Partners Commission,Komise obchodních partnerů
+DocType: Shift Type,Enable Different Consequence for Early Exit,Povolit různé důsledky pro předčasné ukončení
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Právní
 DocType: Loan Application,Required by Date,Požadováno podle data
 DocType: Quiz Result,Quiz Result,Výsledek kvízu
@@ -2595,7 +2621,6 @@
 DocType: Pricing Rule,Pricing Rule,Pravidlo cen
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Volitelný seznam dovolené není nastaven na dobu dovolené {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Nastavte ID uživatele pole v záznamu zaměstnance nastavit zaměstnance role
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Čas k vyřešení
 DocType: Training Event,Training Event,Tréninková akce
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normální klidový krevní tlak u dospělých je přibližně 120 mmHg systolický a 80 mmHg diastolický, zkráceně &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Pokud je mezní hodnota nulová, systém načte všechny položky."
@@ -2639,6 +2664,7 @@
 DocType: Student Applicant,Approved,Schválený
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Od data by mělo být v rámci fiskálního roku. Za předpokladu od data = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Nastavte skupinu dodavatelů v Nastavení nákupu.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} je neplatný stav docházky.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Dočasné otevírání účtu
 DocType: Purchase Invoice,Cash/Bank Account,Hotovostní / bankovní účet
 DocType: Quality Meeting Table,Quality Meeting Table,Tabulka kvality setkání
@@ -2674,6 +2700,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Rozvrh kurzu
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detail položky Moudrá daň
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Docházka bude automaticky označena až po tomto datu.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Dodávky do držáků UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Žádost o nabídky
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Měna nemůže být změněna po zadávání pomocí jiné měny
@@ -2722,7 +2749,6 @@
 DocType: Item,Is Item from Hub,Je položka z rozbočovače
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Postup kvality.
 DocType: Share Balance,No of Shares,Počet akcií
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Řádek {0}: Počet není k dispozici pro {4} ve skladu {1} v době odeslání záznamu ({2} {3})
 DocType: Quality Action,Preventive,Preventivní
 DocType: Support Settings,Forum URL,Adresa URL fóra
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Zaměstnanec a docházka
@@ -2944,7 +2970,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Standardní daně a poplatky
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,To je založeno na transakcích s tímto dodavatelem. Podrobnosti naleznete v níže uvedené časové ose
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Zadejte datum začátku a konce smlouvy.
 DocType: Delivery Note Item,Against Sales Invoice,Proti prodejní faktuře
 DocType: Loyalty Point Entry,Purchase Amount,Částka nákupu
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Nelze nastavit jako ztracený jako zakázka odběratele.
@@ -2968,7 +2993,7 @@
 DocType: Lead,Organization Name,Název organizace
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Platné od a platné upto pole jsou pro kumulativní povinné
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Řádek # {0}: Číslo šarže musí být stejné jako {1} {2}
-DocType: Employee,Leave Details,Podrobnosti nechte
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Transakce akcií před {0} jsou zmrazeny
 DocType: Driver,Issuing Date,Datum vydání
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Žadatel
@@ -3013,9 +3038,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Podrobnosti šablony mapování peněžních toků
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Nábor a školení
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Nastavení doby odezvy pro automatickou účast
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Od měny a do měny nemůže být stejné
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Léčiva
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Hodiny podpory
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} je zrušeno nebo zavřeno
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Řádek {0}: Záloha proti zákazníkovi musí být kreditem
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Seskupit podle kupónu (Konsolidováno)
@@ -3125,6 +3152,7 @@
 DocType: Territory,Territory Manager,oblastní manažer
 DocType: Lab Test,Sample ID,ID vzorku
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Košík je prázdný
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Docházka byla označena jako přihlášení ke službě zaměstnancům
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Musí být odeslána aktiva {0}
 ,Absent Student Report,Absent Student Report
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Zahrnuto v hrubém zisku
@@ -3132,7 +3160,9 @@
 DocType: Travel Request Costing,Funded Amount,Financovaná částka
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nebylo odesláno, takže akci nelze dokončit"
 DocType: Subscription,Trial Period End Date,Datum ukončení zkušebního období
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Střídání položek jako IN a OUT během stejné směny
 DocType: BOM Update Tool,The new BOM after replacement,Nový kusovník po výměně
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Bod 5
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Dočasné otevření
@@ -3248,6 +3278,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Možný dodavatel
 ,Issued Items Against Work Order,Vydané položky proti pracovnímu příkazu
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Vytvoření faktury {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím instruktorský systém pojmenování ve výuce&gt; Nastavení vzdělávání
 DocType: Student,Joining Date,Datum připojení
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Žádající stránky
 DocType: Purchase Invoice,Against Expense Account,Proti účtu výdajů
@@ -3287,6 +3318,7 @@
 DocType: Landed Cost Item,Applicable Charges,Platné poplatky
 ,Point of Sale,Místě prodeje
 DocType: Authorization Rule,Approving User  (above authorized value),Schválení uživatele (nad autorizovanou hodnotou)
+DocType: Service Level Agreement,Entity,Subjekt
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Částka {0} {1} byla převedena z {2} na {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Zákazník {0} nepatří do projektu {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Z názvu strany
@@ -3333,6 +3365,7 @@
 DocType: Soil Texture,Sand Composition (%),Složení písku (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Importovat data denní knihy
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte položku Řada jmen pro {0} přes Nastavení&gt; Nastavení&gt; Řada názvů
 DocType: Asset,Asset Owner Company,Majitel společnosti
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Nákladové středisko je povinno si rezervovat nárok na náklady
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} platná sériová čísla pro položku {1}
@@ -3393,7 +3426,6 @@
 DocType: Asset,Asset Owner,Vlastník aktiv
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Sklad je povinný pro sklad Položka {0} v řádku {1}
 DocType: Stock Entry,Total Additional Costs,Celkové dodatečné náklady
-DocType: Marketplace Settings,Last Sync On,Poslední synchronizace zapnuta
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Nastavte alespoň jeden řádek v tabulce Daně a poplatky
 DocType: Asset Maintenance Team,Maintenance Team Name,Název týmu údržby
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Graf nákladových středisek
@@ -3409,12 +3441,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID uživatele není nastaveno pro zaměstnance {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Dostupné množství je {0}, které potřebujete {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Uživatel {0} byl vytvořen
 DocType: Stock Settings,Item Naming By,Pojmenování položky podle
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Objednáno
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Toto je skupina uživatelů root a nelze ji upravovat.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Požadavek na materiál {0} je zrušen nebo zastaven
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Striktně na základě typu protokolu v zaměstnanci Checkin
 DocType: Purchase Order Item Supplied,Supplied Qty,Dodávané množství
 DocType: Cash Flow Mapper,Cash Flow Mapper,Mapovač peněžních toků
 DocType: Soil Texture,Sand,Písek
@@ -3473,6 +3505,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Duplicitní skupina položek nalezená v tabulce skupin položek
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Roční plat
 DocType: Supplier Scorecard,Weighting Function,Funkce vážení
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverze UOM ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Chyba při vyhodnocení vzorce kritérií
 ,Lab Test Report,Laboratorní protokol
 DocType: BOM,With Operations,S operacemi
@@ -3486,6 +3519,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Pro zápis do deníku nejsou k dispozici žádné splátky
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} je neaktivní student
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Vstup do skladu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Rekurze kusovníku: {0} nemůže být rodičem nebo dítětem {1}
 DocType: Employee Onboarding,Activities,Aktivity
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Minimálně jeden sklad je povinný
 ,Customer Credit Balance,Zůstatek kreditu zákazníka
@@ -3498,9 +3532,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Věrnostní program nalezený pro zákazníka. Vyberte prosím ručně.
 DocType: Patient,Medication,Léky
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Vyberte Věrnostní program
+DocType: Employee Checkin,Attendance Marked,Docházka je označena
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Suroviny
 DocType: Sales Order,Fully Billed,Plně účtováno
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Nastavte prosím cenu hotelového pokoje na {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Vyberte pouze jednu prioritu jako výchozí.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Identifikujte / vytvořte účet (Ledger) pro typ - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Celková částka úvěru / debetu by měla být stejná jako položka vloženého deníku
 DocType: Purchase Invoice Item,Is Fixed Asset,Je pevná aktiva
@@ -3521,6 +3557,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Potvrzení schůzky
 DocType: Shopping Cart Settings,Orders,Objednávky
 DocType: HR Settings,Retirement Age,Duchodovy vek
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte prosím číslovací řadu pro Docházku pomocí Nastavení&gt; Číslovací řada
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Promítané množství
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Smazání není pro zemi {0} povoleno
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Řádek # {0}: Hodnota {1} je již {2}
@@ -3604,11 +3641,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Účetní
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Platební poukaz POS alreday existuje pro {0} mezi datem {1} a {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navigace
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Žádné zbývající faktury nevyžadují přecenění směnného kurzu
 DocType: Authorization Rule,Customer / Item Name,Název zákazníka / položky
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nové sériové číslo nemůže mít sklad. Sklad musí být nastaven skladovým vstupem nebo nákupním dokladem
 DocType: Issue,Via Customer Portal,Přes Zákaznický portál
 DocType: Work Order Operation,Planned Start Time,Plánovaný čas spuštění
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
+DocType: Service Level Priority,Service Level Priority,Priorita úrovně služby
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet účtovaných odpisů nesmí být větší než celkový počet odpisů
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Knihovna akcií
 DocType: Journal Entry,Accounts Payable,Závazky
@@ -3718,7 +3757,6 @@
 DocType: Delivery Note,Delivery To,Doručit
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankovní data
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Naplánováno Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Udržujte fakturační hodiny a pracovní hodiny stejné na časovém rozvrhu
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Vedení stopy podle zdroje olova.
 DocType: Clinical Procedure,Nursing User,Ošetřovatelský uživatel
 DocType: Support Settings,Response Key List,Seznam klíčových odpovědí
@@ -3886,6 +3924,7 @@
 DocType: Work Order Operation,Actual Start Time,Skutečný čas spuštění
 DocType: Antibiotic,Laboratory User,Uživatel laboratoře
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online aukce
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Priorita {0} byla opakována.
 DocType: Fee Schedule,Fee Creation Status,Stav vytvoření poplatku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Software
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Objednávka odběratele k platbě
@@ -3952,6 +3991,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Nelze načíst informace pro {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Fakturační měna se musí rovnat výchozí měně společnosti nebo měně účtu strany
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Zadejte ID zaměstnance této prodejní osoby
+DocType: Shift Type,Early Exit Consequence after,Důsledek předčasného ukončení po
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Vytvořit otevírací prodej a nákupní faktury
 DocType: Disease,Treatment Period,Období léčby
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Nastavení e-mailu
@@ -3969,7 +4009,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Jméno studenta:
 DocType: SMS Log,Sent On,Odesláno
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Prodejní faktura
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Doba odezvy nemůže být větší než doba rozlišení
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Pro studentskou skupinu založenou na kurzu bude kurz validován pro každého studenta ze zapsaných předmětů v programu.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Dodávky uvnitř státu
 DocType: Employee,Create User Permission,Vytvořit oprávnění uživatele
@@ -4008,6 +4047,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standardní smluvní podmínky prodeje nebo nákupu.
 DocType: Sales Invoice,Customer PO Details,Podrobnosti o objednávce zákazníka
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacient nebyl nalezen
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Vyberte výchozí prioritu.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Odstraňte položku, pokud se na tuto položku nevztahují poplatky"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Skupina zákazníků existuje se stejným jménem, prosím, změňte jméno zákazníka nebo přejmenujte skupinu zákazníků"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4047,6 +4087,7 @@
 DocType: Support Settings,Support Portal,Portál podpory
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Datum ukončení úlohy <b>{0}</b> nemůže být kratší než <b>{1}</b> očekávané datum zahájení <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Zaměstnanec {0} je na dovolené {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Tato dohoda o úrovni služeb je specifická pro zákazníka {0}
 DocType: Employee,Held On,Zapnuto
 DocType: Healthcare Practitioner,Practitioner Schedules,Plány praktikujících
 DocType: Project Template Task,Begin On (Days),Začátek dne (dny)
@@ -4054,6 +4095,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Pracovní příkaz byl {0}
 DocType: Inpatient Record,Admission Schedule Date,Termín přijetí Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Úprava hodnoty aktiv
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Označit účast na základě &#39;Zaměstnance Checkin&#39; pro zaměstnance přiřazené k této směně.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Dodávky pro neregistrované osoby
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Všechny práce
 DocType: Appointment Type,Appointment Type,Typ schůzky
@@ -4167,7 +4209,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Hrubá hmotnost balení. Obvykle čistá hmotnost + hmotnost obalového materiálu. (pro tisk)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorní testování datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Položka {0} nemůže mít dávku
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Prodejní potrubí podle etapy
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Síla studentské skupiny
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Zadání transakce výpisu z účtu
 DocType: Purchase Order,Get Items from Open Material Requests,Získejte položky z otevřených požadavků na materiál
@@ -4249,7 +4290,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Zobrazit Aging Warehouse-moudrý
 DocType: Sales Invoice,Write Off Outstanding Amount,Odepsání nezaplacené částky
 DocType: Payroll Entry,Employee Details,Podrobnosti o zaměstnancích
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Čas spuštění nemůže být větší než Konec pro {0}.
 DocType: Pricing Rule,Discount Amount,Výše slevy
 DocType: Healthcare Service Unit Type,Item Details,Podrobnosti o položce
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Duplicitní daňové prohlášení {0} pro období {1}
@@ -4302,7 +4342,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Čistá mzda nemůže být záporná
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Počet interakcí
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Řádek {0} # Položka {1} nemůže být převedena více než {2} proti objednávce {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Posun
+DocType: Attendance,Shift,Posun
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Zpracování účtové osnovy a smluvních stran
 DocType: Stock Settings,Convert Item Description to Clean HTML,Převést Popis položky na Vyčistit HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Všechny skupiny dodavatelů
@@ -4373,6 +4413,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Jednotka rodičovské služby
 DocType: Sales Invoice,Include Payment (POS),Zahrnout platbu (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Private Equity
+DocType: Shift Type,First Check-in and Last Check-out,První přihlášení a poslední odhlášení
 DocType: Landed Cost Item,Receipt Document,Dokument příjmu
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Období hodnocení dodavatelů
 DocType: Employee Grade,Default Salary Structure,Výchozí mzdová struktura
@@ -4455,6 +4496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Vytvořit objednávku
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definujte rozpočet na rozpočtový rok.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Tabulka účtů nemůže být prázdná.
+DocType: Employee Checkin,Entry Grace Period Consequence,Důsledek doby vstupu vstupů
 ,Payment Period Based On Invoice Date,Doba splatnosti založená na datu faktury
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Datum instalace nemůže být před datem dodání položky {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Odkaz na žádost o materiál
@@ -4463,6 +4505,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Řádek {0}: Pro tento sklad již existuje položka Uspořádání {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Datum dokumentu
 DocType: Monthly Distribution,Distribution Name,Název distribuce
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Pracovní den {0} byl opakován.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,"Skupina do skupiny, která není členem skupiny"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Aktualizace probíhá. Může to chvíli trvat.
 DocType: Item,"Example: ABCD.#####
@@ -4475,6 +4518,7 @@
 DocType: Vehicle Log,Fuel Qty,Množství paliva
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile Ne
 DocType: Invoice Discounting,Disbursed,Vyplaceno
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Čas po ukončení směny, během něhož je pro odbavení uvažováno o odjezdu."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Čistá změna závazků
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Není dostupný
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Poloviční úvazek
@@ -4488,7 +4532,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Zobrazit PDC v tisku
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Dodavatel
 DocType: POS Profile User,POS Profile User,Uživatel profilu POS
-DocType: Student,Middle Name,Prostřední jméno
 DocType: Sales Person,Sales Person Name,Jméno prodejní osoby
 DocType: Packing Slip,Gross Weight,Celková hmotnost
 DocType: Journal Entry,Bill No,Bill č
@@ -4497,7 +4540,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Smlouva o úrovni služeb
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Nejdříve vyberte zaměstnance a datum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Míra ocenění položky se přepočítává s ohledem na částku kupónového nákladu
 DocType: Timesheet,Employee Detail,Detail zaměstnance
 DocType: Tally Migration,Vouchers,Poukazy
@@ -4532,7 +4574,7 @@
 DocType: Additional Salary,Date on which this component is applied,Datum uplatnění této složky
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Seznam dostupných akcionářů s čísly folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Nastavení účtů brány.
-DocType: Service Level,Response Time Period,Doba odezvy
+DocType: Service Level Priority,Response Time Period,Doba odezvy
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákupní daně a poplatky
 DocType: Course Activity,Activity Date,Datum aktivity
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Vyberte nebo přidejte nového zákazníka
@@ -4557,6 +4599,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Finanční rok
 DocType: Sales Invoice Item,Deferred Revenue,Odložené příjmy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodejních nebo nákupních musí být vybrán
+DocType: Shift Type,Working Hours Threshold for Half Day,Prahová hodnota pracovní doby pro půl dne
 ,Item-wise Purchase History,Historie nákupu
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Nelze změnit datum zastavení služby pro položku v řádku {0}
 DocType: Production Plan,Include Subcontracted Items,Zahrnout subdodávky
@@ -4589,6 +4632,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Povolit vícenásobné opakování stejné položky
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Vytvořit kusovník
 DocType: Healthcare Practitioner,Charges,Poplatky
+DocType: Employee,Attendance and Leave Details,Podrobnosti o docházce a dovolené
 DocType: Student,Personal Details,Osobní údaje
 DocType: Sales Order,Billing and Delivery Status,Stav fakturace a dodání
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Řádek {0}: Pro odeslání e-mailu je nutné zadat adresu {0}
@@ -4640,7 +4684,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Zadejte hodnotu betweeen {0} a {1}
 DocType: Purchase Order,Order Confirmation Date,Datum potvrzení objednávky
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Vypočítat odhadované časy příjezdu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavení systému pojmenování zaměstnanců v nastavení lidských zdrojů&gt; Nastavení HR
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Spotřební materiál
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Datum zahájení odběru
@@ -4663,7 +4706,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Účet pro zápis do deníku
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Varianta
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Činnost fóra
-DocType: Service Level,Resolution Time Period,Časové období rozlišení
+DocType: Service Level Priority,Resolution Time Period,Časové období rozlišení
 DocType: Request for Quotation,Supplier Detail,Detail dodavatele
 DocType: Project Task,View Task,Zobrazit úkol
 DocType: Serial No,Purchase / Manufacture Details,Podrobnosti o nákupu / výrobě
@@ -4730,6 +4773,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad lze změnit pouze prostřednictvím skladu / dodacího listu / nákupního dokladu
 DocType: Support Settings,Close Issue After Days,Zavřete problém po dnech
 DocType: Payment Schedule,Payment Schedule,Platební kalendář
+DocType: Shift Type,Enable Entry Grace Period,Povolit období zadávání vstupů
 DocType: Patient Relation,Spouse,Manželka
 DocType: Purchase Invoice,Reason For Putting On Hold,Důvod pro pozastavení
 DocType: Item Attribute,Increment,Přírůstek
@@ -4869,6 +4913,7 @@
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},Formulář C neplatí pro fakturu: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Faktura byla vytvořena
+DocType: Shift Type,Early Exit Grace Period,Časné ukončení Grace
 DocType: Patient Encounter,Review Details,Podrobnosti o kontrole
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Řádek {0}: Hodnota hodin musí být větší než nula.
 DocType: Account,Account Number,Číslo účtu
@@ -4880,7 +4925,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Platí, pokud je společnost SpA, SApA nebo SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Překrývající se podmínky nalezené mezi:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Placené a nedoručené
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Kód položky je povinný, protože položka není automaticky číslována"
 DocType: GST HSN Code,HSN Code,Kód HSN
 DocType: GSTR 3B Report,September,září
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Správní náklady
@@ -4916,6 +4960,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Účet CWIP
 DocType: SMS Log,Sender Name,Jméno odesílatele
 DocType: Pricing Rule,Supplier Group,Dodavatelská skupina
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Nastavte počáteční čas a čas ukončení pro {0} v indexu {1}.
 DocType: Employee,Date of Issue,Datum vydání
 ,Requested Items To Be Transferred,"Požadované položky, které mají být převedeny"
 DocType: Employee,Contract End Date,Datum ukončení smlouvy
@@ -4926,6 +4972,7 @@
 DocType: Opportunity,Sales Stage,Prodejní fáze
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,V aplikaci Words se zobrazí po uložení objednávky odběratele.
 DocType: Item Reorder,Re-order Level,Re-order Level
+DocType: Shift Type,Enable Auto Attendance,Povolit automatickou účast
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Přednost
 ,Department Analytics,Oddělení Analytics
 DocType: Crop,Scientific Name,Odborný název
@@ -4938,6 +4985,7 @@
 DocType: Quiz Activity,Quiz Activity,Kvízová aktivita
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} není v platném období mezd
 DocType: Timesheet,Billed,Fakturováno
+apps/erpnext/erpnext/config/support.py,Issue Type.,Typ problému.
 DocType: Restaurant Order Entry,Last Sales Invoice,Poslední prodejní faktura
 DocType: Payment Terms Template,Payment Terms,Platební podmínky
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervováno Množství: Množství objednané k prodeji, ale nedodáno."
@@ -5033,6 +5081,7 @@
 DocType: Account,Asset,Aktivum
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} nemá plán zdravotnické praxe. Přidejte ji do programu Master of Healthcare Practitioner
 DocType: Vehicle,Chassis No,Podvozek č
+DocType: Employee,Default Shift,Výchozí posun
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Zkratka společnosti
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Strom kusovníku
 DocType: Article,LMS User,Uživatel LMS
@@ -5081,6 +5130,7 @@
 DocType: Sales Person,Parent Sales Person,Rodičovská prodejní osoba
 DocType: Student Group Creation Tool,Get Courses,Získejte kurzy
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, protože položka je fixní aktivum. Použijte samostatný řádek pro více qty."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Pracovní doba, pod kterou je značka Absent označena. (Zakázat vynulování)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,V transakci jsou povoleny pouze uzly listů
 DocType: Grant Application,Organization,Organizace
 DocType: Fee Category,Fee Category,Kategorie poplatků
@@ -5093,6 +5143,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Aktualizujte svůj stav pro tuto školení
 DocType: Volunteer,Morning,Ráno
 DocType: Quotation Item,Quotation Item,Položka nabídky
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Priorita problému.
 DocType: Journal Entry,Credit Card Entry,Vstup kreditní karty
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Přeskočení časového slotu, slot {0} až {1} překrývá existující slot {2} až {3}"
 DocType: Journal Entry Account,If Income or Expense,Pokud jsou příjmy nebo náklady
@@ -5143,11 +5194,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Import a nastavení dat
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Pokud je zaškrtnuto políčko Automaticky zapnout, budou zákazníci automaticky spojeni s příslušným věrnostním programem (při uložení)"
 DocType: Account,Expense Account,Účet výdajů
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Doba před začátkem směny, během které je pro účast na pracovišti zvažována registrace."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Vztah s Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Vytvořit fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Žádost o platbu již existuje {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Zaměstnanec uvolněný na {0} musí být nastaven jako &quot;levý&quot;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Platit {0} {1}
+DocType: Company,Sales Settings,Nastavení prodeje
 DocType: Sales Order Item,Produced Quantity,Vyrobené množství
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,K žádosti o cenovou nabídku se dostanete kliknutím na následující odkaz
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční distribuce
@@ -5226,6 +5279,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Jsou vytvořeny výchozí šablony daně pro prodej a nákup.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Opustit typ {0} nelze přenášet
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debetní účet musí být účet Pohledávky
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Datum ukončení smlouvy nesmí být menší než dnes.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Nastavte účet ve skladu {0} nebo výchozí účet inventáře ve společnosti {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Nastavit jako výchozí
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Čistá hmotnost tohoto balení. (vypočteno automaticky jako součet čisté hmotnosti položek)
@@ -5252,8 +5306,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Zaniklé dávky
 DocType: Shipping Rule,Shipping Rule Type,Typ pravidla přepravy
 DocType: Job Offer,Accepted,Přijato
-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, vymažte prosím <a href=""#Form/Employee/{0}"">{0}</a> zaměstnance"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Už jste posuzovali hodnotící kritéria {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Vyberte Čísla šarží
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Věk (dny)
@@ -5280,6 +5332,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Vyberte domény
 DocType: Agriculture Task,Task Name,Název úlohy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Skladové položky již vytvořené pro pracovní příkaz
+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, vymažte prosím <a href=""#Form/Employee/{0}"">{0}</a> zaměstnance"
 ,Amount to Deliver,Částka k dodání
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Společnost {0} neexistuje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nebyly nalezeny žádné nevyřízené požadavky na materiál, které by odkazovaly na dané položky."
@@ -5329,6 +5383,7 @@
 DocType: Lab Prescription,Test Code,Testovací kód
 DocType: Purchase Taxes and Charges,On Previous Row Total,Na předchozí řádek celkem
 DocType: Student,Student Email Address,E-mailová adresa studenta
+,Delayed Item Report,Zpráva o zpožděné položce
 DocType: Academic Term,Education,Vzdělání
 DocType: Supplier Quotation,Supplier Address,Adresa dodavatele
 DocType: Salary Detail,Do not include in total,Nezahrnujte celkem
@@ -5336,7 +5391,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} neexistuje
 DocType: Purchase Receipt Item,Rejected Quantity,Odmítnuté množství
 DocType: Cashier Closing,To TIme,Chcete-li
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverze UOM ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Uživatel skupiny pro denní práci
 DocType: Fiscal Year Company,Fiscal Year Company,Společnost fiskálního roku
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternativní položka nesmí být stejná jako kód položky
@@ -5388,6 +5442,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Prodleva mezi zastaveními doručení
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zmrazení zásob starších než [dny]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Sleva na propagační program
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Problematika priority již existuje
 DocType: Account,Asset Received But Not Billed,"Aktiva přijata, ale neúčtována"
 DocType: POS Closing Voucher,Total Collected Amount,Celková částka inkasa
 DocType: Course,Default Grading Scale,Výchozí stupnice třídění
@@ -5430,6 +5485,7 @@
 DocType: Contract,Fulfilment Terms,Splnění podmínek
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,"Skupina, která není členem skupiny"
 DocType: Student Guardian,Mother,Matka
+DocType: Issue,Service Level Agreement Fulfilled,Dohoda o úrovni služeb splněna
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Odpočet daně pro nevyžádané zaměstnanecké výhody
 DocType: Travel Request,Travel Funding,Cestovní financování
 DocType: Shipping Rule,Fixed,Pevný
@@ -5459,10 +5515,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Žádné předměty nenalezeny.
 DocType: Item Attribute,From Range,Z dosahu
 DocType: Clinical Procedure,Consumables,Spotřební materiál
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,jsou požadovány hodnoty „employee_field_value“ a „timestamp“.
 DocType: Purchase Taxes and Charges,Reference Row #,Řádek reference #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Nastavte ve společnosti {0} „Centrum pro odpisy nákladů“
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Řádek # {0}: K dokončení transakce je vyžadován platební doklad
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Kliknutím na toto tlačítko vytáhnete data prodejní objednávky z Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Pracovní doba, pod kterou je označen polodenní den. (Zakázat vynulování)"
 ,Assessment Plan Status,Stav plánu hodnocení
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Nejprve vyberte {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Odeslat toto vytvořit záznam zaměstnance
@@ -5533,6 +5591,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Nastavit Otevřít
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Přepnout filtry
 DocType: Production Plan,Material Request Detail,Podrobnosti o požadavku na materiál
+DocType: Shift Type,Process Attendance After,Proces Docházka Po
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Přejděte na položku Programy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Řádek # {0}: Duplicitní položka v Referencích {1} {2}
@@ -5590,6 +5649,7 @@
 DocType: Pricing Rule,Party Information,Informace o straně
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Dlužníci ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,"K dnešnímu dni nemůže být větší než datum, kdy se zaměstnanec uvolní"
+DocType: Shift Type,Enable Exit Grace Period,Povolit období ukončení Grace
 DocType: Expense Claim,Employees Email Id,Id zaměstnance Zaměstnanci
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Aktualizace ceny z Shopify do ERPNext Ceník
 DocType: Healthcare Settings,Default Medical Code Standard,Standardní standard zdravotnického kódu
@@ -5620,7 +5680,6 @@
 DocType: Budget,Applicable on Material Request,Platí pro materiálové požadavky
 DocType: Support Settings,Search APIs,Vyhledávací rozhraní API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Procento nadprodukce Pro zakázku odběratele
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Specifikace
 DocType: Purchase Invoice,Supplied Items,Dodávané položky
 DocType: Leave Control Panel,Select Employees,Vyberte zaměstnance
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Vyberte úrokový výnos v úvěru {0}
@@ -5646,7 +5705,7 @@
 ,Supplier-Wise Sales Analytics,Analytika prodejních dodavatelů
 DocType: GSTR 3B Report,February,Únor
 DocType: Appraisal,For Employee,Pro zaměstnance
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Aktuální datum dodání
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Aktuální datum dodání
 DocType: Sales Partner,Sales Partner Name,Jméno obchodního partnera
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Řádek odpisu {0}: Datum odpisu odpisu se zadává jako datum
 DocType: GST HSN Code,Regional,Regionální
@@ -5685,6 +5744,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Karta hodnocení dodavatelů
 DocType: Travel Itinerary,Travel To,Cestovat do
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Označit Účast
+DocType: Shift Type,Determine Check-in and Check-out,Určete check-in a check-out
 DocType: POS Closing Voucher,Difference,Rozdíl
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Malý
 DocType: Work Order Item,Work Order Item,Položka objednávky zakázky
@@ -5718,6 +5778,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Lék
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} je zavřeno
 DocType: Patient,Medical History,Zdravotní historie
+DocType: Expense Claim,Expense Taxes and Charges,Náklady a poplatky
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Počet dnů po uplynutí data faktury před zrušením předplatného nebo označení předplatného jako nezaplaceného
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Poznámka k instalaci {0} již byla odeslána
 DocType: Patient Relation,Family,Rodina
@@ -5750,7 +5811,6 @@
 DocType: Dosage Strength,Strength,Síla
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotek {1} potřebných v {2} k dokončení této transakce.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush Surové materiály Subcontract založené na
-DocType: Bank Guarantee,Customer,Zákazník
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Pokud je tato možnost povolena, pole Akademický termín bude povinné v nástroji pro zápis do programu."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Pro skupinu studentů založenou na dávkách bude studentská dávka validována pro každého studenta ze zápisu do programu.
 DocType: Course,Topics,Témata
@@ -5830,6 +5890,7 @@
 DocType: Chapter,Chapter Members,Členové kapitoly
 DocType: Warranty Claim,Service Address,Adresa služby
 DocType: Journal Entry,Remark,Poznámka
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Řádek {0}: Množství není k dispozici pro {4} ve skladu {1} v době odeslání záznamu ({2} {3})
 DocType: Patient Encounter,Encounter Time,Čas setkání
 DocType: Serial No,Invoice Details,Detaily faktury
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být provedeny v rámci skupin, ale záznamy mohou být provedeny proti skupinám"
@@ -5910,6 +5971,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Uzavření (otevření + celkem)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kritérium vzorec
 apps/erpnext/erpnext/config/support.py,Support Analytics,Podpora Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID docházkového zařízení (ID biometrické / RF značky)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Recenze a akce
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Pokud je účet zmrazen, jsou položky vyhrazeny omezeným uživatelům."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Částka po odpisu
@@ -5931,6 +5993,7 @@
 DocType: Salary Slip,Loan Repayment,Splácení úvěru
 DocType: Employee Education,Major/Optional Subjects,Hlavní / volitelné předměty
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Adresy dodavatelů a kontakty
 DocType: Bank Guarantee,Bank Guarantee Type,Typ bankovní záruky
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Pokud je zakázáno, pole Zaoblený součet nebude v žádné transakci viditelné"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5969,6 +6032,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Otevření položky Vytvoření faktury
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Zahrnout transakce POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Žádný zaměstnanec nalezl pro danou hodnotu pole zaměstnance. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Přijatá částka (měna společnosti)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage je plná, neuložila"
 DocType: Chapter Member,Chapter Member,Člen kapitoly
@@ -6001,6 +6065,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nebyly vytvořeny žádné studentské skupiny.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Duplikovat řádek {0} se stejným {1}
 DocType: Employee,Salary Details,Podrobnosti o platu
+DocType: Employee Checkin,Exit Grace Period Consequence,Ukončení následku Grace Perioda
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Special Test Items,Particulars,Údaje
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Nastavte filtr na základě položky nebo skladu
@@ -6102,6 +6167,7 @@
 DocType: Serial No,Out of AMC,Z AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil práce, požadované kvalifikace atd."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Stát lodí
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Chcete odeslat žádost o materiál
 DocType: Opportunity Item,Basic Rate,Základní sazba
 DocType: Compensatory Leave Request,Work End Date,Datum ukončení práce
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Požadavek na suroviny
@@ -6287,6 +6353,7 @@
 DocType: Sales Order Item,Gross Profit,Hrubý zisk
 DocType: Quality Inspection,Item Serial No,Položka Sériové číslo
 DocType: Asset,Insurer,Pojistitel
+DocType: Employee Checkin,OUT,VEN
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Nákup částka
 DocType: Asset Maintenance Task,Certificate Required,Požadovaný certifikát
 DocType: Retention Bonus,Retention Bonus,Retenční bonus
@@ -6402,6 +6469,8 @@
 DocType: Invoice Discounting,Sanctioned,Schváleno
 DocType: Course Enrollment,Course Enrollment,Zápis kurzu
 DocType: Item,Supplier Items,Položky dodavatele
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Čas spuštění nemůže být větší než nebo roven koncovému času {0}.
 DocType: Sales Order,Not Applicable,Nelze použít
 DocType: Support Search Source,Response Options,Možnosti odpovědi
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} by měla být hodnota mezi 0 a 100
@@ -6488,7 +6557,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Dlouhodobý majetek
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Celkový zisk
-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í
 DocType: Share Balance,From No,Od č
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Faktura pro odsouhlasení platby
 DocType: Purchase Invoice,Taxes and Charges Added,Přidané daně a poplatky
@@ -6596,6 +6664,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignorovat pravidlo určování cen
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Jídlo
 DocType: Lost Reason Detail,Lost Reason Detail,Detail ztraceného důvodu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Byla vytvořena následující sériová čísla: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Zákaznická zpětná vazba
 DocType: Serial No,Warranty / AMC Details,Podrobnosti o záruce / AMC
 DocType: Issue,Opening Time,Otevírací doba
@@ -6645,6 +6714,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Název společnosti není stejný
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Propagaci zaměstnance nelze podat před datem propagace
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Není povoleno aktualizovat akciové transakce starší než {0}
+DocType: Employee Checkin,Employee Checkin,Zaměstnanec Checkin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Datum zahájení by mělo být menší než datum ukončení položky {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Vytvořit zákaznické nabídky
 DocType: Buying Settings,Buying Settings,Nastavení nákupu
@@ -6666,6 +6736,7 @@
 DocType: Patient,Patient Demographics,Demografie pacientů
 DocType: Share Transfer,To Folio No,Na Folio Ne
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Peněžní toky z operací
+DocType: Employee Checkin,Log Type,Typ protokolu
 DocType: Stock Settings,Allow Negative Stock,Povolit zápornou zásobu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Žádná z položek nemá žádnou změnu v množství nebo hodnotě.
 DocType: Asset,Purchase Date,Datum nákupu
@@ -6710,6 +6781,7 @@
 DocType: Vital Signs,Very Hyper,Velmi hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Vyberte si charakter svého podnikání.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Vyberte měsíc a rok
+DocType: Service Level,Default Priority,Výchozí priorita
 DocType: Student Log,Student Log,Záznam studenta
 DocType: Shopping Cart Settings,Enable Checkout,Povolit službu Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Lidské zdroje
@@ -6738,7 +6810,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Připojit Shopify s ERPNext
 DocType: Homepage Section Card,Subtitle,Podtitul
 DocType: Soil Texture,Loam,Hlína
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: BOM,Scrap Material Cost(Company Currency),Cena materiálu šrotu (měna společnosti)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Poznámka k doručení {0} nesmí být odeslána
 DocType: Task,Actual Start Date (via Time Sheet),Skutečné datum zahájení (přes časový výkaz)
@@ -6794,6 +6865,7 @@
 DocType: Drug Prescription,Dosage,Dávkování
 DocType: Cheque Print Template,Starting position from top edge,Výchozí pozice od horního okraje
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Trvání schůzky (min)
+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á protokol se stejným časovým razítkem. {0}
 DocType: Accounting Dimension,Disable,Zakázat
 DocType: Email Digest,Purchase Orders to Receive,Objednávky obdržíte
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Výrobní objednávky nelze získat pro:
@@ -6809,7 +6881,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Materiál převedený na subdodávky
 DocType: Job Card,Timing Detail,Detail načasování
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Požadováno Zapnuto
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Import {0} z {1}
 DocType: Job Offer Term,Job Offer Term,Pracovní nabídka Termín
 DocType: SMS Center,All Contact,Všechny kontakty
 DocType: Project Task,Project Task,Projektový úkol
@@ -6860,7 +6931,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Položka {0} není nastavena pro sériová čísla
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Ze státu
 DocType: Leave Type,Maximum Continuous Days Applicable,Maximální použitelné dny
-apps/erpnext/erpnext/config/support.py,Support Team.,Tým podpory.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Nejdříve zadejte název společnosti
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Import byl úspěšný
 DocType: Guardian,Alternate Number,Alternativní číslo
@@ -6952,6 +7022,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Řádek # {0}: Přidána položka
 DocType: Student Admission,Eligibility and Details,Způsobilost a podrobnosti
 DocType: Staffing Plan,Staffing Plan Detail,Detail personálního plánu
+DocType: Shift Type,Late Entry Grace Period,Zpoždění vstupu
 DocType: Email Digest,Annual Income,Roční příjem
 DocType: Journal Entry,Subscription Section,Odběrová sekce
 DocType: Salary Slip,Payment Days,Platební dny
@@ -7002,6 +7073,7 @@
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 DocType: Asset Maintenance Log,Periodicity,Periodicita
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Zdravotní záznam
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Typ protokolu je vyžadován pro check-iny spadající do směny: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Provedení
 DocType: Item,Valuation Method,Metoda oceňování
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} proti prodejní faktuře {1}
@@ -7086,6 +7158,7 @@
 DocType: Loan Type,Loan Name,Název úvěru
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Nastavit výchozí režim platby
 DocType: Quality Goal,Revision,Revize
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Čas před ukončením směny, kdy je check-out považován za časný (v minutách)."
 DocType: Healthcare Service Unit,Service Unit Type,Typ servisní jednotky
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Purchase Invoice
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Generovat tajemství
@@ -7241,12 +7314,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmetika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Zaškrtněte toto, pokud chcete, aby uživatel před uložením vybral řadu. Pokud toto zkontrolujete, nebude žádná výchozí hodnota."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí mohou nastavit zmrazené účty a vytvářet / upravovat účetní položky proti zmrazeným účtům
+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
 DocType: Expense Claim,Total Claimed Amount,Celková částka nárokované částky
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový slot v následujících {0} dnech pro operaci {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Balení
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Obnovit lze pouze v případě, že vaše členství vyprší do 30 dnů"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Hodnota musí být mezi {0} a {1}
 DocType: Quality Feedback,Parameters,Parametry
+DocType: Shift Type,Auto Attendance Settings,Nastavení automatické účasti
 ,Sales Partner Transaction Summary,Shrnutí transakce obchodního partnera
 DocType: Asset Maintenance,Maintenance Manager Name,Název správce údržby
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Je nutné načíst podrobnosti položky.
@@ -7338,10 +7413,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Ověřit platné pravidlo
 DocType: Job Card Item,Job Card Item,Položka pracovní karty
 DocType: Homepage,Company Tagline for website homepage,Společnost Tagline pro domovskou stránku webu
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Nastavte dobu odezvy a rozlišení pro prioritu {0} v indexu {1}.
 DocType: Company,Round Off Cost Center,Nákladové středisko
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kritéria Hmotnost
 DocType: Asset,Depreciation Schedules,Odpisy
-DocType: Expense Claim Detail,Claim Amount,Částka nároku
 DocType: Subscription,Discounts,Slevy
 DocType: Shipping Rule,Shipping Rule Conditions,Podmínky přepravního pravidla
 DocType: Subscription,Cancelation Date,Datum zrušení
@@ -7369,7 +7444,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Zobrazit nulové hodnoty
 DocType: Employee Onboarding,Employee Onboarding,Zaměstnanec Onboarding
 DocType: POS Closing Voucher,Period End Date,Datum ukončení období
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Prodejní příležitosti podle zdroje
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,První Nechat schvalovatele v seznamu bude nastaven jako výchozí Leave Approver.
 DocType: POS Settings,POS Settings,Nastavení POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Všechny účty
@@ -7390,7 +7464,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Řádek # {0}: Rychlost musí být stejná jako {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Položky zdravotnické služby
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Nenalezeny žádné záznamy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Rozsah stárnutí 3
 DocType: Vital Signs,Blood Pressure,Krevní tlak
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Cíl Zapnuto
@@ -7437,6 +7510,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Dávky
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Obrana
 DocType: Item,Has Batch No,Má dávku č
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Zpožděné dny
 DocType: Lead,Person Name,Jméno osoby
 DocType: Item Variant,Item Variant,Varianta položky
 DocType: Training Event Employee,Invited,Pozván
@@ -7458,7 +7532,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Počáteční a koncová data nejsou v platném Období mezd, nelze vypočítat {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Zákazníkům zobrazujte pouze tyto Zákaznické skupiny
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Vyberte položky pro uložení faktury
-DocType: Service Level,Resolution Time,Čas rozlišení
+DocType: Service Level Priority,Resolution Time,Čas rozlišení
 DocType: Grading Scale Interval,Grade Description,Popis třídy
 DocType: Homepage Section,Cards,Karty
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Zápis o kvalitě jednání
@@ -7485,6 +7559,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Stav bankovního výpisu podle hlavní knihy
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Zdravotní péče (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Výchozí sklad pro vytvoření zakázky odběratele a dodacího listu
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Doba odezvy pro {0} v indexu {1} nemůže být vyšší než Resolution Time.
 DocType: Opportunity,Customer / Lead Name,Jméno zákazníka
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Nežádaná částka
@@ -7531,7 +7606,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Dovážející strany a adresy
 DocType: Item,List this Item in multiple groups on the website.,Seznam této položky ve více skupinách na webu.
 DocType: Request for Quotation,Message for Supplier,Zpráva pro dodavatele
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"{0} nelze změnit, protože existuje transakce pro položku {1}."
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Člen týmu
 DocType: Asset Category Account,Asset Category Account,Účet kategorie aktiv
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index fc31dee..72d01e7 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Udnævnelse {0} og salgsfaktura {1} annulleret
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Din email adresse...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Inkluder standard bogindlæg
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Inkluder standard bogindlæg
 DocType: Activity Cost,Activity Type,Aktivitetstype
 DocType: Purchase Invoice,Get Advances Paid,Få forskud betalt
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss konto på bortskaffelse af aktiver
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Betalingsindlæg
 DocType: Employee Education,Class / Percentage,Klasse / Procentdel
 ,Electronic Invoice Register,Elektronisk Faktura Register
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Antallet af forekomster, hvorefter konsekvensen udføres."
 DocType: Sales Invoice,Is Return (Credit Note),Er retur (kredit notat)
+DocType: Price List,Price Not UOM Dependent,Pris Ikke UOM Afhængig
 DocType: Lab Test Sample,Lab Test Sample,Lab Test prøve
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","For eksempel 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Net betaling
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Samlet Faktureret Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Forbrugsvarer Faktura Separat
+DocType: Shift Type,Working Hours Threshold for Absent,Arbejdstidsgrænse for fravær
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Budgettet kan ikke tildeles mod gruppekonto {0}
 DocType: Purchase Receipt Item,Rate and Amount,Pris og beløb
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Ud patientindstillinger
 DocType: Asset,Insurance End Date,Forsikrings Slutdato
 DocType: Bank Account,Branch Code,Branchkode
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Tid til at svare
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Brugerforum
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Sælgeren og køberen kan ikke være det samme
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Overførsel
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Søgeobjekt (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Resultat indsendt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Fra dato kan ikke være større end endtil dato
 DocType: Supplier,Supplier of Goods or Services.,Leverandør af varer eller tjenesteydelser.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navn på ny konto. Bemærk: Opret ikke konti til kunder og leverandører
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentgruppe eller kursusplan er obligatorisk
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Færdighedsnavn
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Udskriv rapportkort
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Support Billetter
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Seneste
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obligatorisk for balancen
 DocType: Payment Entry,Total Allocated Amount,Samlet tildelt beløb
 DocType: Sales Invoice,Get Advances Received,Få fremskridt modtaget
+DocType: Shift Type,Last Sync of Checkin,Sidste synkronisering af Checkin
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Vare Skattebeløb Inkluderet i Værdi
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Blood Group
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Beskær afstanden UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Tiden efter skiftens starttidspunkt, når check-in betragtes som sent (i minutter)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Udforske
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Ingen udestående fakturaer fundet
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.","{0} ledige stillinger og {1} budget for {2}, der allerede er planlagt til datterselskaber af {3}. \ Du kan kun planlægge op til {4} ledige stillinger og og budget {5} i henhold til personaleplan {6} for moderselskabet {3}."
 DocType: Promotional Scheme,Product Discount Slabs,Produkt Discount Plader
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Flytende gennemsnit
 DocType: Employee Attendance Tool,Unmarked Attendance,Unmarked Attendance
 DocType: Homepage Section,Number of Columns,Antal kolonner
+DocType: Issue Priority,Issue Priority,Issue Priority
 DocType: Holiday List,Add Weekly Holidays,Tilføj ugentlige helligdage
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Opret Salary Slip
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Udstedelsesdato
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst et Batch for Item {0}. Kunne ikke finde en enkelt batch, der opfylder dette krav"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Kan ikke oprette tilbageholdelsesbonus for venstre medarbejdere
+DocType: Employee Checkin,Location / Device ID,Placering / enheds-id
 DocType: Purchase Order,To Receive,At modtage
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du kan ikke genindlæse, før du har netværk."
 DocType: Course Activity,Enrollment,Tilmelding
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maks: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-fakturering oplysninger mangler
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Ingen væsentlig forespørgsel oprettet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Loan,Total Amount Paid,Samlede beløb betalt
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Alle disse elementer er allerede faktureret
 DocType: Training Event,Trainer Name,Træner navn
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Angiv Lead Name in Lead {0}
 DocType: Employee,You can enter any date manually,Du kan indtaste en dato manuelt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lagerafstemningspost
+DocType: Shift Type,Early Exit Consequence,Tidlig udgangseffekt
 DocType: Item Group,General Settings,Generelle indstillinger
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Forfaldsdato kan ikke være før bogføring / leverandør faktura dato
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,"Indtast modtagerens navn, inden du sender det."
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Betalingsbekræftelse
 ,Available Stock for Packing Items,Tilgængelig lager til pakningsartikler
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Fjern venligst denne faktura {0} fra C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Hver gyldig check-in og check-out
 DocType: Support Search Source,Query Route String,Query Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Kundefejlskabelon
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citater til ledere eller kunder.
@@ -1204,6 +1212,7 @@
 DocType: Authorization Control,Authorization Control,Autorisationskontrol
 ,Daily Work Summary Replies,Daglige Arbejdsoversigt Svar
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om projektet: {0}
+DocType: Issue,Response By Variance,Response By Variance
 DocType: Item,Sales Details,Salgsoplysninger
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Brevhoveder til udskriftsskabeloner.
 DocType: Salary Detail,Tax on additional salary,Skat på ekstra løn
@@ -1327,6 +1336,7 @@
 DocType: Project,Task Progress,Opgavefremskridt
 DocType: Journal Entry,Opening Entry,Åbning Entry
 DocType: Bank Guarantee,Charges Incurred,Afgifter opkrævet
+DocType: Shift Type,Working Hours Calculation Based On,Arbejdstimer Beregning Baseret På
 DocType: Work Order,Material Transferred for Manufacturing,Materiale overført til fremstilling
 DocType: Products Settings,Hide Variants,Skjul varianter
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deaktiver kapacitetsplanlægning og tidssporing
@@ -1356,6 +1366,7 @@
 DocType: Guardian,Interests,Interesser
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt antal
 DocType: Education Settings,Education Manager,Uddannelsesleder
+DocType: Employee Checkin,Shift Actual Start,Skift Aktuel Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tidslogger uden for arbejdsstationen Arbejdstimer.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Loyalitetspoint: {0}
 DocType: Healthcare Settings,Registration Message,Registreringsmeddelelse
@@ -1380,9 +1391,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Faktura er allerede oprettet for alle faktureringstimer
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 DocType: Purchase Invoice,Pricing Rules,Prissætningsregler
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod vare {0}, kan du ikke ændre værdien af {1}"
 DocType: Hub Tracked Item,Image List,Billedliste
 DocType: Item Variant Settings,Allow Rename Attribute Value,Tillad omdøbe attributværdi
-DocType: Price List,Price Not UOM Dependant,Pris Ikke UOM Afhængig
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Tid (i minutter)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Grundlæggende
 DocType: Loan,Interest Income Account,Renteindtægtskonto
@@ -1392,6 +1403,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Vælg POS-profil
 DocType: Support Settings,Get Latest Query,Få seneste forespørgsel
 DocType: Employee Incentive,Employee Incentive,Medarbejderincitamenter
+DocType: Service Level,Priorities,prioriteter
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Tilføj kort eller brugerdefinerede afsnit på hjemmesiden
 DocType: Homepage,Hero Section Based On,Heltafsnit Baseret på
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet købspris (via købsfaktura)
@@ -1452,7 +1464,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Bestilt Mængde
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række nr. {0}: Afvist lager er obligatorisk mod afvist post {1}
 ,Received Items To Be Billed,"Modtagne poster, der skal faktureres"
-DocType: Salary Slip Timesheet,Working Hours,Arbejdstimer
+DocType: Attendance,Working Hours,Arbejdstimer
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Betalingsmodus
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Indkøbsordre Varer ikke modtaget i tide
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Varighed i dage
@@ -1572,7 +1584,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig information og anden generel information om din leverandør
 DocType: Item Default,Default Selling Cost Center,Standard salgspriscenter
 DocType: Sales Partner,Address & Contacts,Adresse og kontakter
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserien for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 DocType: Subscriber,Subscriber,abonnent
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) er udsolgt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Vælg venligst Indsendelsesdato først
@@ -1583,7 +1594,7 @@
 DocType: Detected Disease,Tasks Created,Opgaver oprettet
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) skal være aktiv for dette element eller dets skabelon
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Kommissionens sats%
-DocType: Service Level,Response Time,Responstid
+DocType: Service Level Priority,Response Time,Responstid
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Indstillinger
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Mængden skal være positiv
 DocType: Contract,CRM,CRM
@@ -1600,7 +1611,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Transaktionsdata Kortlægning
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,En bly kræver enten en persons navn eller en organisations navn
 DocType: Student,Guardians,Guardians
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vær venlig at installere Instruktør Navngivningssystem i Uddannelse&gt; Uddannelsesindstillinger
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Vælg mærke ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Mellemindkomst
 DocType: Shipping Rule,Calculate Based On,Beregn Baseret På
@@ -1637,6 +1647,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Tilstedeværelseskort {0} findes mod Student {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Dato for transaktion
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Annuller abonnement
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Kunne ikke indstille Service Level Agreement {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Netto lønbeløb
 DocType: Account,Liability,Ansvar
 DocType: Employee,Bank A/C No.,Bank A / C nr.
@@ -1702,7 +1713,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råmateriale varekode
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede indsendt
 DocType: Fees,Student Email,Student Email
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursion: {0} kan ikke være forælder eller barn på {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Få artikler fra sundhedsydelser
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Lagerindgang {0} er ikke indsendt
 DocType: Item Attribute Value,Item Attribute Value,Vareattributværdi
@@ -1727,7 +1737,6 @@
 DocType: Production Plan,Select Items to Manufacture,Vælg varer til fremstilling
 DocType: Leave Application,Leave Approver Name,Forlad godkendelsesnavn
 DocType: Shareholder,Shareholder,Aktionær
-DocType: Issue,Agreement Status,Aftale Status
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Standardindstillinger for salgstransaktioner.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Vælg venligst Student Admission, som er obligatorisk for den betalte kandidatansøger"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Vælg BOM
@@ -1990,6 +1999,7 @@
 DocType: Account,Income Account,Indkomstkonto
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Alle varehuse
 DocType: Contract,Signee Details,Signee Detaljer
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Tillad udtjekning efter skift sluttid (i minutter)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,indkøb
 DocType: Item Group,Check this if you want to show in website,Tjek dette hvis du vil vise på hjemmesiden
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiscal Year {0} ikke fundet
@@ -2056,6 +2066,7 @@
 DocType: Activity Cost,Billing Rate,Faktureringsfrekvens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lagerindtastning {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Aktivér Google Maps Indstillinger til at estimere og optimere ruter
+DocType: Purchase Invoice Item,Page Break,Sideskift
 DocType: Supplier Scorecard Criteria,Max Score,Max score
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Tilbagebetaling Startdato kan ikke være før Udbetalingsdato.
 DocType: Support Search Source,Support Search Source,Support Search Source
@@ -2124,6 +2135,7 @@
 DocType: Employee Transfer,Employee Transfer,Medarbejderoverførsel
 ,Sales Funnel,Salgstragle
 DocType: Agriculture Analysis Criteria,Water Analysis,Vandanalyse
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Begynd check-in før skift starttid (i minutter)
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Der er ikke noget at redigere.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Drift {0} længere end nogen ledig arbejdstid i arbejdsstationen {1}, nedbryd operationen til flere operationer"
@@ -2137,7 +2149,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Salgsordre {0} er {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Forsinkelse i betaling (dage)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Indtast afskrivningsoplysninger
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Kunde PO
 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 salgsordre
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Varemængden kan ikke være nul
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ugyldig attribut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Vælg venligst BOM mod punkt {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Faktura Type
@@ -2147,6 +2161,7 @@
 DocType: Volunteer,Afternoon,Eftermiddag
 DocType: Vital Signs,Nutrition Values,Ernæringsværdier
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Tilstedeværelse af feber (temp&gt; 38,5 ° C eller vedvarende temp&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Reversed
 DocType: Project,Collect Progress,Indsamle fremskridt
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energi
@@ -2197,6 +2212,7 @@
 ,Ordered Items To Be Billed,"Bestilte varer, der skal faktureres"
 DocType: Taxable Salary Slab,To Amount,Til beløb
 DocType: Purchase Invoice,Is Return (Debit Note),Er retur (debit note)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Kom i gang
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Fusionere
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Kan ikke ændre Regnskabsårets startdato og Regnskabsårets slutdato, når Regnskabsåret er gemt."
@@ -2215,8 +2231,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelses startdato kan ikke være før leveringsdato for serienummer {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Række {0}: Valutakursen er obligatorisk
 DocType: Purchase Invoice,Select Supplier Address,Vælg leverandøradresse
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Tilgængelig mængde er {0}, du har brug for {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Indtast venligst API Consumer Secret
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programindskrivningsgebyr
+DocType: Employee Checkin,Shift Actual End,Skift Aktuel Afslutning
 DocType: Serial No,Warranty Expiry Date,Udløbsdato for garanti
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel værelsespriser
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Udadvendt skattepligtige leverancer (bortset fra nulkvalificeret, nul ratede og fritaget"
@@ -2276,6 +2294,7 @@
 DocType: Quality Inspection Reading,Reading 5,Læsning 5
 DocType: Shopping Cart Settings,Display Settings,Skærmindstillinger
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,"Indtast venligst antal afskrivninger, der er bogført"
+DocType: Shift Type,Consequence after,Konsekvens efter
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Hvad har du brug for hjælp til?
 DocType: Journal Entry,Printing Settings,Udskrivningsindstillinger
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banking
@@ -2285,6 +2304,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Faktureringsadresse er ens som forsendelsesadresse
 DocType: Account,Cash,Kontanter
 DocType: Employee,Leave Policy,Forlad politik
+DocType: Shift Type,Consequence,Følge
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Studentadresse
 DocType: GST Account,CESS Account,CESS-konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Omkostningscenter er påkrævet for &#39;Profit and Loss&#39;-konto {2}. Opret venligst et standardkostningscenter for virksomheden.
@@ -2349,6 +2369,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Periodeafslutningsbevis
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Navn
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Indtast Udgiftskonto
+DocType: Issue,Resolution By Variance,Opløsning ved variation
 DocType: Employee,Resignation Letter Date,Afgangsbrev Dato
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Tilstedeværelse til dato
@@ -2361,6 +2382,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Se nu
 DocType: Item Price,Valid Upto,Gyldig Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Reference Doktypen skal være en af {0}
+DocType: Employee Checkin,Skip Auto Attendance,Spring automatisk tilstedeværelse
 DocType: Payment Request,Transaction Currency,Transaktionsvaluta
 DocType: Loan,Repayment Schedule,Tilbagebetalingsplan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Opret prøvepræmie lagerinput
@@ -2432,6 +2454,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS Closing Voucher Skatter
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Handling initialiseret
 DocType: POS Profile,Applicable for Users,Gælder for brugere
+,Delayed Order Report,Forsinket bestillingsrapport
 DocType: Training Event,Exam,Eksamen
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Forkert antal hovedbogsnumre fundet. Du har muligvis valgt en forkert konto i transaktionen.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Salgsledning
@@ -2446,10 +2469,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Betingelserne vil blive anvendt på alle de valgte elementer kombineret.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigurer
 DocType: Hotel Room,Capacity,Kapacitet
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Installeret antal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Batch {0} i vare {1} er deaktiveret.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruger
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Arbejdsdagen er blevet gentaget to gange
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement med Entity Type {0} og Entity {1} eksisterer allerede.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},"Varegruppe, der ikke er nævnt i varemester for punkt {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Navnefejl: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Territory er påkrævet i POS Profile
@@ -2497,6 +2521,7 @@
 DocType: Depreciation Schedule,Schedule Date,Planlægningsdato
 DocType: Packing Slip,Package Weight Details,Pakkevægtens detaljer
 DocType: Job Applicant,Job Opening,Ledig stilling
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Sidste kendte vellykket synkronisering af medarbejderkontrol. Nulstil kun dette, hvis du er sikker på, at alle logfiler synkroniseres fra alle placeringer. Vær venlig at ændre dette, hvis du ikke er sikker."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Faktisk omkostninger
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forskud ({0}) mod ordre {1} kan ikke være større end Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Varevarianter opdateret
@@ -2541,6 +2566,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Få invokationer
 DocType: Tally Migration,Is Day Book Data Imported,Er data fra dagbog importeret
 ,Sales Partners Commission,Sales Partners Commission
+DocType: Shift Type,Enable Different Consequence for Early Exit,Aktivér forskellige konsekvenser for tidlig afgang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,gyldige
 DocType: Loan Application,Required by Date,Påkrævet efter dato
 DocType: Quiz Result,Quiz Result,Quiz Resultat
@@ -2600,7 +2626,6 @@
 DocType: Pricing Rule,Pricing Rule,Prissætning regel
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},"Valgfri ferieliste, der ikke er indstillet for orlovsperioden {0}"
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Angiv bruger-id-feltet i en medarbejderpost for at indstille medarbejderrolle
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Tid til at løse
 DocType: Training Event,Training Event,Træningsarrangement
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normal hvilende blodtryk hos en voksen er ca. 120 mmHg systolisk og 80 mmHg diastolisk, forkortet &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Systemet henter alle indgange, hvis grænseværdien er nul."
@@ -2644,6 +2669,7 @@
 DocType: Student Applicant,Approved,godkendt
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Fra Dato skal være inden for Skatteåret. Forudsat fra dato = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Indstil leverandørgruppe i indkøbsindstillinger.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} er en ugyldig deltagelsesstatus.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Midlertidig åbningskonto
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / bankkonto
 DocType: Quality Meeting Table,Quality Meeting Table,Kvalitetsmødetabel
@@ -2679,6 +2705,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Mad, drikkevarer og tobak"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Kursusplan
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Varebeskrivelse
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Deltagelse vil kun blive markeret automatisk efter denne dato.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Forsyninger til UIN indehavere
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Anmodning om tilbud
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,"Valuta kan ikke ændres, når du har foretaget poster med en anden valuta"
@@ -2727,7 +2754,6 @@
 DocType: Item,Is Item from Hub,Er vare fra nav
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Kvalitetsprocedure.
 DocType: Share Balance,No of Shares,Antal aktier
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Række {0}: Antal ikke tilgængelig for {4} i lager {1} ved bogføringstidspunktet for indgangen ({2} {3})
 DocType: Quality Action,Preventive,Forebyggende
 DocType: Support Settings,Forum URL,Forum-URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Medarbejder og deltagelse
@@ -2949,7 +2975,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Standardskatter og afgifter
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner mod denne leverandør. Se tidslinjen nedenfor for detaljer
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Indtast start og slutdato for aftalen.
 DocType: Delivery Note Item,Against Sales Invoice,Mod salgsfaktura
 DocType: Loyalty Point Entry,Purchase Amount,Købsbeløb
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som tabt som salgsordre er lavet.
@@ -2973,7 +2998,7 @@
 DocType: Lead,Organization Name,Organisationens navn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Gyldig fra og gyldig op til felter er obligatoriske for den kumulative
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
-DocType: Employee,Leave Details,Forlad Detaljer
+DocType: Employee Checkin,Shift Start,Skift start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Aktietransaktioner inden {0} er frosset
 DocType: Driver,Issuing Date,Udstedelsesdato
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Anmoders
@@ -3018,9 +3043,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Cash Flow Mapping Template Detaljer
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Rekruttering og træning
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Indstillinger for grace period for automatisk deltagelse
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Fra valuta og til valuta kan ikke være ens
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Lægemidler
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Support timer
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} annulleres eller lukkes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod kunden skal være kredit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Gruppe efter Voucher (konsolideret)
@@ -3130,6 +3157,7 @@
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Lab Test,Sample ID,Prøve ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Indkøbskurven er tom
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Deltagelse er blevet markeret som pr. Medarbejderinsjekk
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Aktivet {0} skal indsendes
 ,Absent Student Report,Afhængig Studentrapport
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Inkluderet i bruttoresultat
@@ -3137,7 +3165,9 @@
 DocType: Travel Request Costing,Funded Amount,Finansieret beløb
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} er ikke indsendt, så handlingen kan ikke gennemføres"
 DocType: Subscription,Trial Period End Date,Prøveperiode Slutdato
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Alternerende indtastninger som IN og OUT under samme skift
 DocType: BOM Update Tool,The new BOM after replacement,Den nye BOM efter udskiftning
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Punkt 5
 DocType: Employee,Passport Number,Pasnummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Midlertidig åbning
@@ -3253,6 +3283,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Mulig leverandør
 ,Issued Items Against Work Order,Udstedte varer mod arbejdsordre
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Oprettelse af {0} faktura
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vær venlig at installere Instruktør Navngivningssystem i Uddannelse&gt; Uddannelsesindstillinger
 DocType: Student,Joining Date,Tilmeldingsdato
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Anmodning om websted
 DocType: Purchase Invoice,Against Expense Account,Mod bekostning konto
@@ -3292,6 +3323,7 @@
 DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
 ,Point of Sale,Salgsstedet
 DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse af bruger (over autoriseret værdi)
+DocType: Service Level Agreement,Entity,Enhed
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Beløb {0} {1} overført fra {2} til {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Kunden {0} hører ikke til projektet {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Fra Party Name
@@ -3338,6 +3370,7 @@
 DocType: Soil Texture,Sand Composition (%),Sandkomposition (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Import dagbogsdata
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Omkostningerne er påkrævet for at bestille en udgiftskrav
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} gyldige serienummer for vare {1}
@@ -3398,7 +3431,6 @@
 DocType: Asset,Asset Owner,Aktiv ejer
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Lager er obligatorisk for lager vare {0} i række {1}
 DocType: Stock Entry,Total Additional Costs,Samlede ekstra omkostninger
-DocType: Marketplace Settings,Last Sync On,Sidste synkronisering
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Indstil mindst en række i skat og afgifter tabel
 DocType: Asset Maintenance Team,Maintenance Team Name,Vedligeholdelsesnavn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Diagram over omkostningscentre
@@ -3414,12 +3446,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Bruger-id er ikke indstillet til Medarbejder {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Tilgængelig antal er {0}, du har brug for {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Bruger {0} oprettet
 DocType: Stock Settings,Item Naming By,Vare navn ved
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,bestilt
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dette er en root kundegruppe og kan ikke redigeres.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materialeanmodning {0} annulleres eller stoppes
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Strenkt baseret på Log Type i Medarbejder Checkin
 DocType: Purchase Order Item Supplied,Supplied Qty,Leveres Antal
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,Sand
@@ -3478,6 +3510,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Duplikér elementgruppe fundet i elementgruppen tabellen
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Årlig løn
 DocType: Supplier Scorecard,Weighting Function,Vægtningsfunktion
+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}) blev ikke fundet for elementet: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Fejl ved evaluering af kriterieformlen
 ,Lab Test Report,Lab Test Report
 DocType: BOM,With Operations,Med Operations
@@ -3491,6 +3524,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Ingen tilbagebetalinger til rådighed for Journal Entry
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} er inaktiv studerende
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Lav lagerregistrering
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM rekursion: {0} kan ikke være forælder eller barn på {1}
 DocType: Employee Onboarding,Activities,Aktiviteter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Atleast et lager er obligatorisk
 ,Customer Credit Balance,Kreditorkredit
@@ -3503,9 +3537,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Flere loyalitetsprogram fundet for kunden. Vælg venligst manuelt.
 DocType: Patient,Medication,Medicin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Vælg Loyalitetsprogram
+DocType: Employee Checkin,Attendance Marked,Tilstedeværelse Markeret
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Råmateriale
 DocType: Sales Order,Fully Billed,Fuldt billet
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Venligst indstil Hotel værelsespris på {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Vælg kun en prioritet som standard.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Venligst identificer / opret konto (Ledger) for type - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Samlet kredit- / debiteringsbeløb skal være det samme som den tilknyttede tidsskriftindgang
 DocType: Purchase Invoice Item,Is Fixed Asset,Er fast ejendom
@@ -3526,6 +3562,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Aftalebekræftelse
 DocType: Shopping Cart Settings,Orders,ordrer
 DocType: HR Settings,Retirement Age,Pensionsalder
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserien for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Projiceret antal
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Sletning er ikke tilladt for land {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Række # {0}: aktiv {1} er allerede {2}
@@ -3609,11 +3646,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Revisor
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS Closing Voucher eksisterer alligevel for {0} mellem dato {1} og {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navigation
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Ingen udestående fakturaer kræver omregning af valutakurserne
 DocType: Authorization Rule,Customer / Item Name,Navn på kunde / varenummer
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nyt serienummer kan ikke have lager. Lager skal indstilles ved lageropgørelse eller købskvittering
 DocType: Issue,Via Customer Portal,Via kundeportalen
 DocType: Work Order Operation,Planned Start Time,Planlagt starttid
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} er {2}
+DocType: Service Level Priority,Service Level Priority,Serviceniveau prioritet
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Antal afskrivninger, der bogføres, kan ikke være større end det samlede antal afskrivninger"
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Del Ledger
 DocType: Journal Entry,Accounts Payable,Betalingspligtige
@@ -3724,7 +3763,6 @@
 DocType: Delivery Note,Delivery To,Levering til
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdata
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Planlagt Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Vedligeholde faktureringstid og arbejdstid samme på tidsskema
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Sporledninger af blykilde.
 DocType: Clinical Procedure,Nursing User,Sygeplejerske bruger
 DocType: Support Settings,Response Key List,Response Key List
@@ -3892,6 +3930,7 @@
 DocType: Work Order Operation,Actual Start Time,Faktisk starttid
 DocType: Antibiotic,Laboratory User,Laboratoriebruger
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online auktioner
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Prioritet {0} er blevet gentaget.
 DocType: Fee Schedule,Fee Creation Status,Fee Creation Status
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Softwares
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Salgsordre til betaling
@@ -3958,6 +3997,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Kunne ikke hente oplysninger for {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta skal være lig med enten standardfirmaets valuta eller part konto konto valuta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Indtast venligst medarbejder-id for denne sælger
+DocType: Shift Type,Early Exit Consequence after,Tidlig udgangseffekt efter
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Opret åbne salgs- og købsfakturaer
 DocType: Disease,Treatment Period,Behandlingsperiode
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Opsætning af e-mail
@@ -3975,7 +4015,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Elevnavn:
 DocType: SMS Log,Sent On,Sendt på
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Salgsfaktura
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Response Time kan ikke være større end Resolution Time
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",For kursusbaseret studentegruppe vil kurset blive valideret for hver elev fra de tilmeldte kurser i programtilmelding.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Intra-State Supplies
 DocType: Employee,Create User Permission,Opret brugertilladelse
@@ -4014,6 +4053,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for salg eller køb.
 DocType: Sales Invoice,Customer PO Details,Kunde PO Detaljer
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patient ikke fundet
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Vælg en standardprioritet.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Fjern element, hvis gebyrer ikke er gældende for den pågældende vare"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En kundegruppe eksisterer med samme navn, skal du ændre kundens navn eller omdøbe kundegruppen"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4053,6 +4093,7 @@
 DocType: Support Settings,Support Portal,Support Portal
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Slutdatoen for opgaven <b>{0}</b> kan ikke være mindre end <b>{1}</b> forventet startdato <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Medarbejder {0} er på ferie på {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Denne serviceniveauaftale er specifik for kunden {0}
 DocType: Employee,Held On,Holdt fast
 DocType: Healthcare Practitioner,Practitioner Schedules,Practitioner Schedules
 DocType: Project Template Task,Begin On (Days),Begynd den (dage)
@@ -4060,6 +4101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Arbejdsordre har været {0}
 DocType: Inpatient Record,Admission Schedule Date,Adgangskalender Dato
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Asset Value Adjustment
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Markere tilstedeværelse baseret på &#39;Employee Checkin&#39; for medarbejdere tildelt dette skifte.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Forsyninger til uregistrerede personer
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Alle job
 DocType: Appointment Type,Appointment Type,Udnævnelsestype
@@ -4173,7 +4215,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pakkenes bruttovægt. Normalt nettovægt + emballagemateriale vægt. (til print)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorietestning Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Varen {0} kan ikke have Batch
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Salgsledning efter trin
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Studentgruppens styrke
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Bankregnskab Transaktion
 DocType: Purchase Order,Get Items from Open Material Requests,Få varer fra åbne materialeanmodninger
@@ -4255,7 +4296,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Vis Aging Warehouse-wise
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv ud Udestående beløb
 DocType: Payroll Entry,Employee Details,Medarbejderdetaljer
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Starttidspunktet kan ikke være større end sluttid for {0}.
 DocType: Pricing Rule,Discount Amount,Rabatbeløb
 DocType: Healthcare Service Unit Type,Item Details,Elementdetaljer
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Duplicate Tax Declaration af {0} for periode {1}
@@ -4308,7 +4348,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Netto løn kan ikke være negativ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Ingen af interaktioner
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Række {0} # Item {1} kan ikke overføres mere end {2} imod indkøbsordre {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Flytte
+DocType: Attendance,Shift,Flytte
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Behandling af kontoplan og parter
 DocType: Stock Settings,Convert Item Description to Clean HTML,Konverter varebeskrivelse for at rydde HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Alle leverandørgrupper
@@ -4379,6 +4419,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Moderselskab
 DocType: Sales Invoice,Include Payment (POS),Inkluder betaling (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Kapitalfond
+DocType: Shift Type,First Check-in and Last Check-out,Første check-in og sidste check-out
 DocType: Landed Cost Item,Receipt Document,Kvitteringsdokument
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Leverandør Scorecard Periode
 DocType: Employee Grade,Default Salary Structure,Standard lønstruktur
@@ -4461,6 +4502,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Opret indkøbsordre
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definer budget for et regnskabsår.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Kontobordet kan ikke være tomt.
+DocType: Employee Checkin,Entry Grace Period Consequence,Indtræden Grace Period Konsekvens
 ,Payment Period Based On Invoice Date,Betalingsperiode baseret på faktura dato
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Installationsdato kan ikke være før leveringsdato for punkt {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Link til materialeanmodning
@@ -4469,6 +4511,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: Der findes allerede en genbestilling for dette lager {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dok Dato
 DocType: Monthly Distribution,Distribution Name,Distributionsnavn
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Arbejdsdag {0} er blevet gentaget.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Gruppe til ikke-koncern
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Opdatering i gang. Det kan tage et stykke tid.
 DocType: Item,"Example: ABCD.#####
@@ -4481,6 +4524,7 @@
 DocType: Vehicle Log,Fuel Qty,Antal brændstof
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobilnr
 DocType: Invoice Discounting,Disbursed,udbetalt
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Tid efter afslutningen af skiftet i løbet af hvilket check-out anses for deltagelse.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,"Netto ændring i konti, der skal betales"
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Ikke tilgængelig
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Deltid
@@ -4494,7 +4538,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Vis PDC i Print
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Leverandør
 DocType: POS Profile User,POS Profile User,POS profil bruger
-DocType: Student,Middle Name,Mellemnavn
 DocType: Sales Person,Sales Person Name,Salg Personnavn
 DocType: Packing Slip,Gross Weight,Bruttovægt
 DocType: Journal Entry,Bill No,Bill nr
@@ -4503,7 +4546,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-vlog-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Service Level Agreement
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Vælg venligst medarbejder og dato først
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Varevalueringskursen genberegnes i betragtning af det landede kostprisbeløb
 DocType: Timesheet,Employee Detail,Medarbejderdetaljer
 DocType: Tally Migration,Vouchers,Beviserne
@@ -4538,7 +4580,7 @@
 DocType: Additional Salary,Date on which this component is applied,"Dato, hvor denne komponent anvendes"
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Liste over tilgængelige aktionærer med folio numre
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Setup Gateway-konti.
-DocType: Service Level,Response Time Period,Response Time Periode
+DocType: Service Level Priority,Response Time Period,Response Time Periode
 DocType: Purchase Invoice,Purchase Taxes and Charges,Køb skatter og afgifter
 DocType: Course Activity,Activity Date,Aktivitetsdato
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Vælg eller tilføj ny kunde
@@ -4563,6 +4605,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Finansielt år
 DocType: Sales Invoice Item,Deferred Revenue,Udskudte indtægter
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,I det mindste en af Sælg eller Køb skal vælges
+DocType: Shift Type,Working Hours Threshold for Half Day,Arbejdstidstærskel for halv dag
 ,Item-wise Purchase History,Item-wise købshistorik
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Kan ikke ændre Service Stop Date for element i række {0}
 DocType: Production Plan,Include Subcontracted Items,Inkluder underleverancer
@@ -4595,6 +4638,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Tillad samme vare flere gange
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Opret BOM
 DocType: Healthcare Practitioner,Charges,Afgifter
+DocType: Employee,Attendance and Leave Details,Tilstedeværelse og efterladselsdetaljer
 DocType: Student,Personal Details,Personlige detaljer
 DocType: Sales Order,Billing and Delivery Status,Fakturerings- og leveringsstatus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Række {0}: For leverandør {0} Emailadresse er påkrævet for at sende e-mail
@@ -4646,7 +4690,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Indtast værdi mellem {0} og {1}
 DocType: Purchase Order,Order Confirmation Date,Ordrebekræftelsesdato
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Beregn Anslåede ankomsttider
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,forbrugsmateriale
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Abonnements startdato
@@ -4668,7 +4711,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal entry-konto
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forumaktivitet
-DocType: Service Level,Resolution Time Period,Opløsningstidsperiode
+DocType: Service Level Priority,Resolution Time Period,Opløsningstidsperiode
 DocType: Request for Quotation,Supplier Detail,Leverandør Detail
 DocType: Project Task,View Task,Se opgave
 DocType: Serial No,Purchase / Manufacture Details,Køb / Produktion Detaljer
@@ -4735,6 +4778,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lageret kan kun ændres via lagerindtastning / leveringsnota / købskvittering
 DocType: Support Settings,Close Issue After Days,Luk udgave efter dage
 DocType: Payment Schedule,Payment Schedule,Betalingsplan
+DocType: Shift Type,Enable Entry Grace Period,Aktivér adgangsperiode
 DocType: Patient Relation,Spouse,Ægtefælle
 DocType: Purchase Invoice,Reason For Putting On Hold,Årsag til at sætte på hold
 DocType: Item Attribute,Increment,Forøgelse
@@ -4874,6 +4918,7 @@
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-formularen gælder ikke for faktura: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Faktura er oprettet
+DocType: Shift Type,Early Exit Grace Period,Early Exit Grace Period
 DocType: Patient Encounter,Review Details,Gennemgå detaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Række {0}: Timer værdi skal være større end nul.
 DocType: Account,Account Number,Kontonummer
@@ -4885,7 +4930,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Gælder, hvis virksomheden er SpA, SApA eller SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Overlappende forhold fundet mellem:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Betalt og ikke leveret
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Varekoden er obligatorisk, fordi varen ikke automatisk nummereres"
 DocType: GST HSN Code,HSN Code,HSN kode
 DocType: GSTR 3B Report,September,september
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administrative udgifter
@@ -4921,6 +4965,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP-konto
 DocType: SMS Log,Sender Name,Afsender navn
 DocType: Pricing Rule,Supplier Group,Leverandørgruppe
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Indstil starttid og sluttid for \ support dag {0} i indeks {1}.
 DocType: Employee,Date of Issue,Udstedelsesdato
 ,Requested Items To Be Transferred,"Forespurgte emner, der skal overføres"
 DocType: Employee,Contract End Date,Kontraktens slutdato
@@ -4931,6 +4977,7 @@
 DocType: Opportunity,Sales Stage,Salgstrin
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord bliver du synlig, når du har gemt salgsordren."
 DocType: Item Reorder,Re-order Level,Re-order Level
+DocType: Shift Type,Enable Auto Attendance,Aktivér automatisk deltagelse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Preference
 ,Department Analytics,Afdeling Analytics
 DocType: Crop,Scientific Name,Videnskabeligt navn
@@ -4943,6 +4990,7 @@
 DocType: Quiz Activity,Quiz Activity,Quiz Aktivitet
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} er ikke i en gyldig lønseddel
 DocType: Timesheet,Billed,billed
+apps/erpnext/erpnext/config/support.py,Issue Type.,Udstedelsestype.
 DocType: Restaurant Order Entry,Last Sales Invoice,Sidste salgsfaktura
 DocType: Payment Terms Template,Payment Terms,Betalingsbetingelser
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserveret antal: Antal bestilt til salg, men ikke leveret."
@@ -5038,6 +5086,7 @@
 DocType: Account,Asset,Asset
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} har ikke en Healthcare Practitioner Schedule. Tilføj det i Healthcare Practitioner master
 DocType: Vehicle,Chassis No,Chassis nr
+DocType: Employee,Default Shift,Standardskift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Virksomhedsforkortelse
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Træ af materiale
 DocType: Article,LMS User,LMS Bruger
@@ -5086,6 +5135,7 @@
 DocType: Sales Person,Parent Sales Person,Moderselskab
 DocType: Student Group Creation Tool,Get Courses,Få kurser
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række nr. {0}: Antal skal være 1, da varen er et fast aktiv. Brug venligst separat række til flere antal."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Arbejdstider under hvilke Fravær er markeret. (Nul for at deaktivere)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Kun blade noder er tilladt i transaktionen
 DocType: Grant Application,Organization,Organisation
 DocType: Fee Category,Fee Category,Gebyr kategori
@@ -5098,6 +5148,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Opdater venligst din status for denne træningsbegivenhed
 DocType: Volunteer,Morning,Morgen
 DocType: Quotation Item,Quotation Item,Citat
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Issue Priority.
 DocType: Journal Entry,Credit Card Entry,Kreditkort indtastning
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Tidspausen overspring, spalten {0} til {1} overlapper ekspansionen slot {2} til {3}"
 DocType: Journal Entry Account,If Income or Expense,Hvis indkomst eller udgift
@@ -5148,11 +5199,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Dataimport og indstillinger
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Hvis Auto Opt In er markeret, bliver kunderne automatisk knyttet til det berørte loyalitetsprogram (ved at gemme)"
 DocType: Account,Expense Account,Udgiftskonto
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Tiden før skiftens starttidspunkt, hvor medarbejderins Check-in anses for deltagelse."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Forholdet med Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Opret faktura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Betalingsforespørgsel eksisterer allerede {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &#39;Venstre&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Betal {0} {1}
+DocType: Company,Sales Settings,Salg Indstillinger
 DocType: Sales Order Item,Produced Quantity,Produceret mængde
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Anmodningen om tilbud er tilgængelig ved at klikke på følgende link
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på den månedlige distribution
@@ -5231,6 +5284,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standard skat skabeloner til salg og køb oprettes.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Forladetype {0} kan ikke videreføres
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debit til konto skal være en tilgodehavende konto
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Slutdato for aftale kan ikke være mindre end i dag.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Indstil konto i lager {0} eller standard lagerkonto i firma {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Indstillet som standard
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (beregnes automatisk som summen af nettovægten af varer)
@@ -5257,8 +5311,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Udløbet Batcher
 DocType: Shipping Rule,Shipping Rule Type,Forsendelsesregel Type
 DocType: Job Offer,Accepted,Accepteret
-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","Fjern venligst medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Du har allerede vurderet for bedømmelseskriterierne {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Vælg batchnumre
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Alder (dage)
@@ -5285,6 +5337,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Vælg dine domæner
 DocType: Agriculture Task,Task Name,Opgavenavn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Lagerindtægter, der allerede er oprettet til Arbejdsordre"
+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","Fjern venligst medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 ,Amount to Deliver,"Beløb, der skal leveres"
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Virksomheden {0} eksisterer ikke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Ingen afventer materialeanmodninger fundet for at linke for de givne varer.
@@ -5334,6 +5388,7 @@
 DocType: Lab Prescription,Test Code,Testkode
 DocType: Purchase Taxes and Charges,On Previous Row Total,På forrige række i alt
 DocType: Student,Student Email Address,Student Email Adresse
+,Delayed Item Report,Forsinket varerapport
 DocType: Academic Term,Education,Uddannelse
 DocType: Supplier Quotation,Supplier Address,Leverandøradresse
 DocType: Salary Detail,Do not include in total,Inkluder ikke i alt
@@ -5341,7 +5396,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 DocType: Purchase Receipt Item,Rejected Quantity,Afvist mængde
 DocType: Cashier Closing,To TIme,Til tiden
-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}) blev ikke fundet for elementet: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Daglig Arbejdsopsummering Gruppe Bruger
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternativt element må ikke være det samme som varekode
@@ -5393,6 +5447,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Forsinkelse mellem Leveringsstop
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Aktier Ældre end [Dage]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Salgsfremmende ordning produkt rabat
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Problemer prioriteres allerede
 DocType: Account,Asset Received But Not Billed,Asset modtaget men ikke faktureret
 DocType: POS Closing Voucher,Total Collected Amount,Samlet samlet beløb
 DocType: Course,Default Grading Scale,Standardgraderingsskala
@@ -5435,6 +5490,7 @@
 DocType: Contract,Fulfilment Terms,Opfyldelsesbetingelser
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ikke-gruppe til gruppe
 DocType: Student Guardian,Mother,Mor
+DocType: Issue,Service Level Agreement Fulfilled,Service Level Agreement Opfyldt
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Fradragsafgift for uopkrævede medarbejderfordele
 DocType: Travel Request,Travel Funding,Rejsefinansiering
 DocType: Shipping Rule,Fixed,Fast
@@ -5464,10 +5520,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ingen emner fundet.
 DocType: Item Attribute,From Range,Fra rækkevidde
 DocType: Clinical Procedure,Consumables,Forbrugsstoffer
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; og &#39;timestamp&#39; er påkrævet.
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Indtast venligst &#39;Asset Depreciation Cost Center&#39; i Firma {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Række nr. {0}: Betalingsdokument er påkrævet for at afslutte trasactionen
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Klik på denne knap for at trække dine salgsordre data fra Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Arbejdstid under hvilken halvdag er markeret. (Nul for at deaktivere)
 ,Assessment Plan Status,Evalueringsplan Status
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Vælg venligst {0} først
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Indsend dette for at oprette medarbejderposten
@@ -5538,6 +5596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Indstil Åbn
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Skift filtre
 DocType: Production Plan,Material Request Detail,Materialeforespørgselsdetaljer
+DocType: Shift Type,Process Attendance After,Procesbesøg efter
 DocType: Material Request Item,Quantity and Warehouse,Mængde og lager
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Gå til Programmer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Duplicate entry i Referencer {1} {2}
@@ -5595,6 +5654,7 @@
 DocType: Pricing Rule,Party Information,Party Information
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debitorer ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Til dato kan ikke større end medarbejderens lindrende dato
+DocType: Shift Type,Enable Exit Grace Period,Aktivér Exit Grace Period
 DocType: Expense Claim,Employees Email Id,Medarbejdere E-mail-id
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Opdater pris fra Shopify til ERPNæste prisliste
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Medical Code Standard
@@ -5625,7 +5685,6 @@
 DocType: Budget,Applicable on Material Request,Gælder for materialeanmodning
 DocType: Support Settings,Search APIs,Søg API&#39;er
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Overproduktionsprocent for salgsordre
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,specifikationer
 DocType: Purchase Invoice,Supplied Items,Leverede varer
 DocType: Leave Control Panel,Select Employees,Vælg medarbejdere
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Vælg renteindtægter konto i lån {0}
@@ -5651,7 +5710,7 @@
 ,Supplier-Wise Sales Analytics,Leverandør-Wise Sales Analytics
 DocType: GSTR 3B Report,February,februar
 DocType: Appraisal,For Employee,For medarbejder
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Faktisk Leveringsdato
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Faktisk Leveringsdato
 DocType: Sales Partner,Sales Partner Name,Salgspartnernavn
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afskrivningsrække {0}: Afskrivning Startdato er indtastet som tidligere dato
 DocType: GST HSN Code,Regional,Regional
@@ -5690,6 +5749,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Leverandør Scorecard
 DocType: Travel Itinerary,Travel To,Rejse til
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,Bestem Check-in og Check-out
 DocType: POS Closing Voucher,Difference,Forskel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Lille
 DocType: Work Order Item,Work Order Item,Arbejdsordre
@@ -5723,6 +5783,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,medicin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} er lukket
 DocType: Patient,Medical History,Medicinsk historie
+DocType: Expense Claim,Expense Taxes and Charges,Udgifter Skatter og afgifter
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Antal dage efter fakturadato er udløbet, før annullering af abonnement eller mærkningsabonnement er ubetalt"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Installation Note {0} er allerede indsendt
 DocType: Patient Relation,Family,Familie
@@ -5755,7 +5816,6 @@
 DocType: Dosage Strength,Strength,Styrke
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} enheder af {1} der kræves i {2} for at fuldføre denne transaktion.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush råmaterialer af underentreprise baseret på
-DocType: Bank Guarantee,Customer,Kunde
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Hvis aktiveret, vil feltet Academic Term være obligatorisk i programmet tilmelding."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",For Batch-baserede Studentegruppe bliver Student Batch Valideret for hver Student fra Programindskrivningen.
 DocType: Course,Topics,Emner
@@ -5835,6 +5895,7 @@
 DocType: Chapter,Chapter Members,Kapitel Medlemmer
 DocType: Warranty Claim,Service Address,Serviceadresse
 DocType: Journal Entry,Remark,Bemærkning
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Række {0}: Mængden er ikke tilgængelig for {4} i varehus {1} ved bogføringstidspunktet for indgangen ({2} {3})
 DocType: Patient Encounter,Encounter Time,Encounter Time
 DocType: Serial No,Invoice Details,Faktura detaljer
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Yderligere konti kan foretages under Grupper, men der kan indføres indgange mod ikke-grupper"
@@ -5915,6 +5976,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Lukning (Åbning + I alt)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriterier Formel
 apps/erpnext/erpnext/config/support.py,Support Analytics,Support Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Attendance Device ID (Biometrisk / RF tag ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Gennemgang og handling
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er indefrosset, er det tilladt at begrænse brugere."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Beløb efter afskrivninger
@@ -5936,6 +5998,7 @@
 DocType: Salary Slip,Loan Repayment,Lån tilbagebetaling
 DocType: Employee Education,Major/Optional Subjects,Store / Valgfag
 DocType: Soil Texture,Silt,silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Leverandøradresser og kontakter
 DocType: Bank Guarantee,Bank Guarantee Type,Bankgaranti Type
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Hvis deaktiveres, vil feltet &#39;Afrundet totalt&#39; ikke være synligt i en transaktion"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5974,6 +6037,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Åbning af fakturaoprettelsesværktøj
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Inkluder POS-transaktioner
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Ingen medarbejder fundet for den givne medarbejders feltværdi. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Modtaget beløb (Company Valuta)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage er fuld, ikke gemt"
 DocType: Chapter Member,Chapter Member,Kapitel Medlem
@@ -6006,6 +6070,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Ingen Student Grupper oprettet.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
 DocType: Employee,Salary Details,Løn Detaljer
+DocType: Employee Checkin,Exit Grace Period Consequence,Afslut Grace Period Konsekvens
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktura
 DocType: Special Test Items,Particulars,Oplysninger
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Indstil venligst filter baseret på vare eller lager
@@ -6107,6 +6172,7 @@
 DocType: Serial No,Out of AMC,Ud af AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Job profil, kvalifikationer kræves mv."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Skib til stat
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Ønsker du at indsende materialebegæringen
 DocType: Opportunity Item,Basic Rate,Grundfrekvens
 DocType: Compensatory Leave Request,Work End Date,Arbejdets slutdato
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Anmodning om råmaterialer
@@ -6292,6 +6358,7 @@
 DocType: Sales Order Item,Gross Profit,Bruttoresultat
 DocType: Quality Inspection,Item Serial No,Vare serienummer
 DocType: Asset,Insurer,Forsikringsgiver
+DocType: Employee Checkin,OUT,UD
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Købsbeløb
 DocType: Asset Maintenance Task,Certificate Required,Certifikat er påkrævet
 DocType: Retention Bonus,Retention Bonus,Retention Bonus
@@ -6407,6 +6474,8 @@
 DocType: Invoice Discounting,Sanctioned,sanktioneret
 DocType: Course Enrollment,Course Enrollment,Kursusmelding
 DocType: Item,Supplier Items,Leverandør Varer
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Starttidspunktet kan ikke være større end eller lig med sluttid \ for {0}.
 DocType: Sales Order,Not Applicable,Ikke anvendelig
 DocType: Support Search Source,Response Options,Svarindstillinger
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} skal være en værdi mellem 0 og 100
@@ -6493,7 +6562,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Faste aktiver
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Samlet indtjening
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Share Balance,From No,Fra nr
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Betalingsafstemning faktura
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og afgifter tilføjet
@@ -6601,6 +6669,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignorer prissætningsregel
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Mad
 DocType: Lost Reason Detail,Lost Reason Detail,Mistet årsag detaljer
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Følgende serienumre blev oprettet: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Kunde feedback
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
 DocType: Issue,Opening Time,Åbningstid
@@ -6650,6 +6719,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Virksomhedens navn er ikke det samme
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Medarbejderfremme kan ikke indsendes før Kampagnedato
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lager transaktioner ældre end {0}
+DocType: Employee Checkin,Employee Checkin,Medarbejdercheck
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Startdatoen skal være mindre end slutdato for punkt {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Opret kunde citater
 DocType: Buying Settings,Buying Settings,Købsindstillinger
@@ -6671,6 +6741,7 @@
 DocType: Patient,Patient Demographics,Patient Demografi
 DocType: Share Transfer,To Folio No,Til Folio nr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Pengestrøm fra driften
+DocType: Employee Checkin,Log Type,Log Type
 DocType: Stock Settings,Allow Negative Stock,Tillad negativ lager
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Ingen af elementerne har nogen ændring i mængde eller værdi.
 DocType: Asset,Purchase Date,Købsdato
@@ -6715,6 +6786,7 @@
 DocType: Vital Signs,Very Hyper,Meget Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Vælg arten af din virksomhed.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Vælg venligst måned og år
+DocType: Service Level,Default Priority,Standardprioritet
 DocType: Student Log,Student Log,Student Log
 DocType: Shopping Cart Settings,Enable Checkout,Aktivér Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Menneskelige ressourcer
@@ -6743,7 +6815,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Tilslut Shopify med ERPNext
 DocType: Homepage Section Card,Subtitle,Undertekst
 DocType: Soil Texture,Loam,lerjord
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 DocType: BOM,Scrap Material Cost(Company Currency),Skrotmateriale omkostninger (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Leveringsnotat {0} må ikke indsendes
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via tidsskrift)
@@ -6799,6 +6870,7 @@
 DocType: Drug Prescription,Dosage,Dosis
 DocType: Cheque Print Template,Starting position from top edge,Startposition fra øverste kant
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Aftale Varighed (minutter)
+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 logfil med samme tidsstempel. {0}
 DocType: Accounting Dimension,Disable,Deaktiver
 DocType: Email Digest,Purchase Orders to Receive,Indkøbsordrer til modtagelse
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Produktioner Ordrer kan ikke rejses for:
@@ -6814,7 +6886,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Materialet overført til underentreprise
 DocType: Job Card,Timing Detail,Timing Detail
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Påkrævet På
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Importerer {0} af {1}
 DocType: Job Offer Term,Job Offer Term,Jobtilbudsperiode
 DocType: SMS Center,All Contact,Alle kontaktpersoner
 DocType: Project Task,Project Task,Projektopgave
@@ -6865,7 +6936,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Element {0} er ikke konfigureret til serienummer. Kontroller elementmasteren
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Fra stat
 DocType: Leave Type,Maximum Continuous Days Applicable,Maksimale kontinuerlige dage gældende
-apps/erpnext/erpnext/config/support.py,Support Team.,Støttegruppe.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Indtast venligst firmaets navn først
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Import Succesfuld
 DocType: Guardian,Alternate Number,Alternativt nummer
@@ -6957,6 +7027,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Række # {0}: Element tilføjet
 DocType: Student Admission,Eligibility and Details,Støtteberettigelse og detaljer
 DocType: Staffing Plan,Staffing Plan Detail,Bemandingsplandetaljer
+DocType: Shift Type,Late Entry Grace Period,Late Ence Grace Period
 DocType: Email Digest,Annual Income,Årlige indkomst
 DocType: Journal Entry,Subscription Section,Abonnementsafdeling
 DocType: Salary Slip,Payment Days,Betalingsdage
@@ -7007,6 +7078,7 @@
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 DocType: Asset Maintenance Log,Periodicity,hyppighed
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Medicinsk post
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,"Log type er påkrævet for check-ins, der falder i skiftet: {0}."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Udførelse
 DocType: Item,Valuation Method,Værdiansættelsesmetode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} imod salgsfaktura {1}
@@ -7091,6 +7163,7 @@
 DocType: Loan Type,Loan Name,Lånnavn
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Indstil standard betalingsform
 DocType: Quality Goal,Revision,Revision
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Tiden før skiftetidspunktet, når check-out betragtes som tidligt (i minutter)."
 DocType: Healthcare Service Unit,Service Unit Type,Service Unit Type
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur mod købsfaktura
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Generer hemmelighed
@@ -7246,12 +7319,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmetik
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Tjek dette, hvis du vil tvinge brugeren til at vælge en serie, før du gemmer. Der vil ikke være nogen standard, hvis du tjekker dette."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle har lov til at indstille frosne konti og oprette / ændre regnskabsposter mod frosne konti
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Expense Claim,Total Claimed Amount,Samlet krævet beløb
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage for Operation {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Afslutter
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Du kan kun forny, hvis dit medlemskab udløber inden for 30 dage"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Værdien skal være mellem {0} og {1}
 DocType: Quality Feedback,Parameters,Parametre
+DocType: Shift Type,Auto Attendance Settings,Indstillinger for automatisk deltagelse
 ,Sales Partner Transaction Summary,Salgspartner Transaktionsoversigt
 DocType: Asset Maintenance,Maintenance Manager Name,Maintenance Manager Navn
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Det er nødvendigt at hente varedetaljer.
@@ -7343,10 +7418,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Valider Anvendt regel
 DocType: Job Card Item,Job Card Item,Jobkort vare
 DocType: Homepage,Company Tagline for website homepage,Firmagrænse for hjemmesidenes hjemmeside
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Indstil svarstid og opløsning for prioritet {0} ved indeks {1}.
 DocType: Company,Round Off Cost Center,Round Off Cost Center
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterier Vægt
 DocType: Asset,Depreciation Schedules,Afskrivningsplaner
-DocType: Expense Claim Detail,Claim Amount,Claimsbeløb
 DocType: Subscription,Discounts,Rabatter
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelsesregler
 DocType: Subscription,Cancelation Date,Annulleringsdato
@@ -7374,7 +7449,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Vis nulværdier
 DocType: Employee Onboarding,Employee Onboarding,Medarbejder Onboarding
 DocType: POS Closing Voucher,Period End Date,Periode Slutdato
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Salgsmuligheder ved kilde
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Den første tilladelse til tilladelse i listen vil blive indstillet som standardladningsgodkendelse.
 DocType: POS Settings,POS Settings,POS-indstillinger
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Alle konti
@@ -7395,7 +7469,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Rate skal være den samme som {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Sundhedsydelser
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Ingen resultater fundet
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Aging Range 3
 DocType: Vital Signs,Blood Pressure,Blodtryk
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Mål mod
@@ -7442,6 +7515,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,partier
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Forsvar
 DocType: Item,Has Batch No,Har parti nr
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Forsinkede dage
 DocType: Lead,Person Name,Personnavn
 DocType: Item Variant,Item Variant,Varevariant
 DocType: Training Event Employee,Invited,inviteret
@@ -7463,7 +7537,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Start og slut dato ikke i en gyldig lønseddel, kan ikke beregne {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Vis kun kunden af disse kundegrupper
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Vælg elementer for at gemme fakturaen
-DocType: Service Level,Resolution Time,Opløsningstid
+DocType: Service Level Priority,Resolution Time,Opløsningstid
 DocType: Grading Scale Interval,Grade Description,Grade Beskrivelse
 DocType: Homepage Section,Cards,Kort
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kvalitetsmøder
@@ -7490,6 +7564,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankoversigt saldo som pr. Hovedbog
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Sundhedspleje (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Standardlager til at oprette salgsordre og leveringsnotat
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Svarstid for {0} ved indeks {1} kan ikke være større end opløsningstid.
 DocType: Opportunity,Customer / Lead Name,Kunde- / Ledernavn
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Uopkrævet beløb
@@ -7536,7 +7611,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Import af parter og adresser
 DocType: Item,List this Item in multiple groups on the website.,Skriv denne vare i flere grupper på hjemmesiden.
 DocType: Request for Quotation,Message for Supplier,Meddelelse til leverandør
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Kan ikke ændre {0} som lagertransaktion for vare {1} eksisterer.
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Medarbejder
 DocType: Asset Category Account,Asset Category Account,Asset Category Account
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 0b7485a..7db432c 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Termin {0} und Verkaufsrechnung {1} storniert
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Deine Emailadresse...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Standardbucheinträge einschließen
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Standardbucheinträge einschließen
 DocType: Activity Cost,Activity Type,Aktivitätsart
 DocType: Purchase Invoice,Get Advances Paid,Erhalten Sie bezahlte Vorschüsse
 DocType: Company,Gain/Loss Account on Asset Disposal,Gewinn- / Verlustkonto bei der Veräußerung von Vermögenswerten
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Zahlungseingaben
 DocType: Employee Education,Class / Percentage,Klasse / Prozentsatz
 ,Electronic Invoice Register,Elektronisches Rechnungsregister
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Die Anzahl der Vorkommen, nach denen die Konsequenz ausgeführt wird."
 DocType: Sales Invoice,Is Return (Credit Note),Ist Rückgabe (Gutschrift)
+DocType: Price List,Price Not UOM Dependent,Preis nicht UOM abhängig
 DocType: Lab Test Sample,Lab Test Sample,Labortestmuster
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Für zB 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Nettogehalt
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Gesamtbetrag der Rechnungsstellung
 DocType: Clinical Procedure,Consumables Invoice Separately,Verbrauchsmaterialrechnung separat
+DocType: Shift Type,Working Hours Threshold for Absent,Arbeitszeitschwelle für Abwesenheit
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Budget kann nicht für Gruppenkonto {0} zugewiesen werden
 DocType: Purchase Receipt Item,Rate and Amount,Kurs und Betrag
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Asset,Insurance End Date,Enddatum der Versicherung
 DocType: Bank Account,Branch Code,Branchencode
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Zeit zu antworten
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Benutzerforum
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Der Verkäufer und der Käufer können nicht gleich sein
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Artikel suchen (Strg + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Ergebnis übermittelt
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Ab Datum kann nicht größer als Bis Datum sein
 DocType: Supplier,Supplier of Goods or Services.,Lieferant von Waren oder Dienstleistungen.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Name des neuen Kontos. Hinweis: Bitte erstellen Sie keine Konten für Kunden und Lieferanten
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentengruppe oder Kursplan ist obligatorisch
@@ -881,7 +884,6 @@
 DocType: Skill,Skill Name,Name der Fertigkeit
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Bericht drucken
 DocType: Soil Texture,Ternary Plot,Ternäre Handlung
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Support-Tickets
 DocType: Asset Category Account,Fixed Asset Account,Anlagekonto
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Neueste
@@ -894,6 +896,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obligatorisch für Bilanz
 DocType: Payment Entry,Total Allocated Amount,Zugewiesener Gesamtbetrag
 DocType: Sales Invoice,Get Advances Received,Erhalten Sie erhaltene Vorschüsse
+DocType: Shift Type,Last Sync of Checkin,Letzte Synchronisierung des Eincheckens
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Artikel Steuerbetrag im Wert enthalten
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -902,7 +905,9 @@
 DocType: Student,Blood Group,Blutgruppe
 apps/erpnext/erpnext/config/healthcare.py,Masters,Meister
 DocType: Crop,Crop Spacing UOM,Zuschnittabstand UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Die Zeit nach dem Schichtstart, zu der der Check-in als verspätet gilt (in Minuten)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Erkunden
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Keine offenen Rechnungen gefunden
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} Stellenangebote und {1} Budget für {2} sind bereits für Tochterunternehmen von {3} geplant. \ Sie können nur bis zu {4} freie Stellen und ein Budget {5} gemäß Belegschaftsplan {6} für die Muttergesellschaft {3} einplanen.
 DocType: Promotional Scheme,Product Discount Slabs,Produktrabattplatten
@@ -1004,6 +1009,7 @@
 DocType: Item,Moving Average,Gleitender Durchschnitt
 DocType: Employee Attendance Tool,Unmarked Attendance,Nicht gekennzeichnete Teilnahme
 DocType: Homepage Section,Number of Columns,Anzahl der Spalten
+DocType: Issue Priority,Issue Priority,Ausgabepriorität
 DocType: Holiday List,Add Weekly Holidays,Wöchentliche Feiertage hinzufügen
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Gehaltsabrechnung erstellen
@@ -1012,6 +1018,7 @@
 DocType: Warranty Claim,Issue Date,Ausgabedatum
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Stapel für Artikel {0}. Es konnte keine einzelne Charge gefunden werden, die diese Anforderung erfüllt"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Für verbliebene Mitarbeiter kann kein Aufbewahrungsbonus erstellt werden
+DocType: Employee Checkin,Location / Device ID,Standort / Geräte-ID
 DocType: Purchase Order,To Receive,Bekommen
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Sie können nicht neu laden, bis Sie über ein Netzwerk verfügen."
 DocType: Course Activity,Enrollment,Anmeldung
@@ -1020,7 +1027,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Fehlende E-Invoicing-Informationen
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Es wurde keine Materialanforderung erstellt
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Loan,Total Amount Paid,Gezahlte Gesamtsumme
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Alle diese Artikel wurden bereits in Rechnung gestellt
 DocType: Training Event,Trainer Name,Trainer Name
@@ -1131,6 +1137,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Bitte erwähnen Sie den Lead-Namen in Lead {0}.
 DocType: Employee,You can enter any date manually,Sie können jedes Datum manuell eingeben
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleichsposten
+DocType: Shift Type,Early Exit Consequence,Early-Exit-Konsequenz
 DocType: Item Group,General Settings,Allgemeine Einstellungen
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Das Fälligkeitsdatum darf nicht vor dem Datum der Buchung / Lieferantenrechnung liegen
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Geben Sie vor dem Absenden den Namen des Begünstigten ein.
@@ -1169,6 +1176,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Zahlungsbestätigung
 ,Available Stock for Packing Items,Lagerbestand für Verpackungsartikel
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Bitte entfernen Sie diese Rechnung {0} aus dem C-Formular {1}.
+DocType: Shift Type,Every Valid Check-in and Check-out,Jeder gültige Check-in und Check-out
 DocType: Support Search Source,Query Route String,Abfrage Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Vorlage für Kundenfeedback
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Angebote für Leads oder Kunden.
@@ -1203,6 +1211,7 @@
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 ,Daily Work Summary Replies,Tägliche Antworten auf die Arbeitszusammenfassung
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},"Sie wurden eingeladen, an dem Projekt mitzuarbeiten: {0}"
+DocType: Issue,Response By Variance,Reaktion nach Abweichung
 DocType: Item,Sales Details,Verkaufsdetails
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Briefköpfe für Druckvorlagen.
 DocType: Salary Detail,Tax on additional salary,Steuer auf zusätzliches Gehalt
@@ -1326,6 +1335,7 @@
 DocType: Project,Task Progress,Aufgabenfortschritt
 DocType: Journal Entry,Opening Entry,Eröffnungseintrag
 DocType: Bank Guarantee,Charges Incurred,Entstandene Gebühren
+DocType: Shift Type,Working Hours Calculation Based On,Arbeitszeitberechnung basierend auf
 DocType: Work Order,Material Transferred for Manufacturing,Material für die Herstellung übertragen
 DocType: Products Settings,Hide Variants,Varianten ausblenden
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Kapazitätsplanung und Zeiterfassung deaktivieren
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,Interessen
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Verbrauchte Menge
 DocType: Education Settings,Education Manager,Bildungsmanager
+DocType: Employee Checkin,Shift Actual Start,Tatsächlichen Start verschieben
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planen Sie Zeitprotokolle außerhalb der Arbeitsstunden der Workstation.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Treuepunkte: {0}
 DocType: Healthcare Settings,Registration Message,Registrierungsnachricht
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Rechnung bereits für alle Rechnungsstunden erstellt
 DocType: Sales Partner,Contact Desc,Wenden Sie sich an Desc
 DocType: Purchase Invoice,Pricing Rules,Preisregeln
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Da für Artikel {0} bereits Transaktionen vorhanden sind, können Sie den Wert von {1} nicht ändern."
 DocType: Hub Tracked Item,Image List,Bildliste
 DocType: Item Variant Settings,Allow Rename Attribute Value,"Zulassen, Attributwert umzubenennen"
-DocType: Price List,Price Not UOM Dependant,Preis nicht UOM abhängig
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Zeit (in Minuten)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Basic
 DocType: Loan,Interest Income Account,Zinsertragskonto
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Wählen Sie POS-Profil
 DocType: Support Settings,Get Latest Query,Letzte Abfrage abrufen
 DocType: Employee Incentive,Employee Incentive,Mitarbeiter-Incentive
+DocType: Service Level,Priorities,Prioritäten
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Fügen Sie Karten oder benutzerdefinierte Bereiche auf der Startseite hinzu
 DocType: Homepage,Hero Section Based On,Helden-Sektion basierend auf
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gesamtkaufkosten (über Kaufrechnung)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Bestellte Menge
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Zeile # {0}: Abgelehntes Lager ist für abgelehnte Artikel {1} obligatorisch.
 ,Received Items To Be Billed,"Erhaltene Gegenstände, die in Rechnung gestellt werden müssen"
-DocType: Salary Slip Timesheet,Working Hours,Arbeitszeit
+DocType: Attendance,Working Hours,Arbeitszeit
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Zahlungsart
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Bestellartikel nicht rechtzeitig erhalten
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Dauer in Tagen
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Gesetzliche Informationen und sonstige allgemeine Informationen zu Ihrem Lieferanten
 DocType: Item Default,Default Selling Cost Center,Standardverkaufskostenstelle
 DocType: Sales Partner,Address & Contacts,Adresse und Kontakte
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 DocType: Subscriber,Subscriber,Teilnehmer
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ist nicht vorrätig
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Bitte wählen Sie zuerst das Buchungsdatum aus
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,Aufgaben erstellt
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Die Standardstückliste ({0}) muss für diesen Artikel oder seine Vorlage aktiv sein
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Provisionssatz%
-DocType: Service Level,Response Time,Reaktionszeit
+DocType: Service Level Priority,Response Time,Reaktionszeit
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-Einstellungen
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Die Menge muss positiv sein
 DocType: Contract,CRM,CRM
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Transaktionsdaten-Mapping
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Ein Lead benötigt entweder den Namen einer Person oder den Namen einer Organisation
 DocType: Student,Guardians,Wächter
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Marke auswählen ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Mittleres Einkommen
 DocType: Shipping Rule,Calculate Based On,Berechnen Sie basierend auf
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Anwesenheitsliste {0} für Schüler {1} vorhanden
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Datum der Transaktion
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Abonnement kündigen
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Service Level Agreement {0} konnte nicht festgelegt werden.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Nettogehaltsbetrag
 DocType: Account,Liability,Haftung
 DocType: Employee,Bank A/C No.,Bank A / C Nr.
@@ -1700,7 +1711,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Artikelcode für Rohmaterial
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Kaufrechnung {0} wurde bereits übermittelt
 DocType: Fees,Student Email,Schüler-E-Mail
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Stücklistenrekursion: {0} kann nicht über- oder untergeordnet zu {2} sein
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Holen Sie sich Artikel von Healthcare Services
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Bestandsaufnahme {0} wird nicht übermittelt
 DocType: Item Attribute Value,Item Attribute Value,Artikelattributwert
@@ -1725,7 +1735,6 @@
 DocType: Production Plan,Select Items to Manufacture,Wählen Sie die herzustellenden Artikel
 DocType: Leave Application,Leave Approver Name,Übernehmen Sie den Namen des Genehmigenden
 DocType: Shareholder,Shareholder,Aktionär
-DocType: Issue,Agreement Status,Vertragsstatus
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Standardeinstellungen für den Verkauf von Transaktionen.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Bitte wählen Sie die für den bezahlten Studienbewerber obligatorische Studienzulassung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Wählen Sie Stückliste
@@ -1988,6 +1997,7 @@
 DocType: Account,Income Account,Einkommenskonto
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Alle Lagerhäuser
 DocType: Contract,Signee Details,Angaben zum Unterzeichner
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Auschecken nach Schichtende erlauben (in Minuten)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Beschaffung
 DocType: Item Group,Check this if you want to show in website,"Aktivieren Sie dieses Kontrollkästchen, wenn Sie auf der Website anzeigen möchten"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Geschäftsjahr {0} nicht gefunden
@@ -2054,6 +2064,7 @@
 DocType: Activity Cost,Billing Rate,Abrechnungsrate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Warnung: Es gibt eine weitere {0} # {1} für den Lagereintrag {2}.
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,"Aktivieren Sie die Google Maps-Einstellungen, um Routen zu schätzen und zu optimieren"
+DocType: Purchase Invoice Item,Page Break,Seitenumbruch
 DocType: Supplier Scorecard Criteria,Max Score,Maximale Punktzahl
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Das Rückzahlungsbeginndatum kann nicht vor dem Auszahlungstag liegen.
 DocType: Support Search Source,Support Search Source,Support-Suchquelle
@@ -2122,6 +2133,7 @@
 DocType: Employee Transfer,Employee Transfer,Mitarbeitertransfer
 ,Sales Funnel,Verkaufstrichter
 DocType: Agriculture Analysis Criteria,Water Analysis,Wasseranalyse
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Beginnen Sie den Check-in vor Schichtbeginn (in Minuten)
 DocType: Accounts Settings,Accounts Frozen Upto,Konten eingefroren bis
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Der Vorgang {0} ist länger als die auf der Arbeitsstation {1} verfügbaren Arbeitsstunden und unterteilt den Vorgang in mehrere Vorgänge
@@ -2135,7 +2147,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Zahlungsverzug (Tage)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Geben Sie die Abschreibungsdetails ein
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Kunden-Bestellung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Das voraussichtliche Lieferdatum sollte nach dem Datum des Kundenauftrags liegen
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Artikelmenge kann nicht Null sein
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ungültiges Attribut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Bitte wählen Sie Stückliste gegen Position {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Rechnungsart
@@ -2145,6 +2159,7 @@
 DocType: Volunteer,Afternoon,Nachmittag
 DocType: Vital Signs,Nutrition Values,Nährwerte
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Vorliegen von Fieber (Temperatur&gt; 38,5 ° C oder anhaltende Temperatur&gt; 38 ° C)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC rückgängig gemacht
 DocType: Project,Collect Progress,Sammle Fortschritt
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energie
@@ -2195,6 +2210,7 @@
 ,Ordered Items To Be Billed,Zu fakturierende bestellte Artikel
 DocType: Taxable Salary Slab,To Amount,Zum Betrag
 DocType: Purchase Invoice,Is Return (Debit Note),Ist Rückgabe (Lastschrift)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Fertig machen
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Verschmelzen
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Das Startdatum des Geschäftsjahres und das Enddatum des Geschäftsjahres können nach dem Speichern des Geschäftsjahres nicht mehr geändert werden.
@@ -2213,8 +2229,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Wartungsbeginn kann nicht vor dem Liefertermin für Seriennummer {0} liegen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Zeile {0}: Wechselkurs ist obligatorisch
 DocType: Purchase Invoice,Select Supplier Address,Wählen Sie die Lieferantenadresse
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",Die verfügbare Menge ist {0}. Sie benötigen {1}.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Bitte geben Sie API Consumer Secret ein
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programm Einschreibegebühr
+DocType: Employee Checkin,Shift Actual End,Tatsächliches Ende verschieben
 DocType: Serial No,Warranty Expiry Date,Ablaufdatum der Garantie
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotelzimmerpreise
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Steuerpflichtige Lieferungen im Ausland (andere als null, null und befreit)"
@@ -2274,6 +2292,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lesen 5
 DocType: Shopping Cart Settings,Display Settings,Bildschirmeinstellungen
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Bitte geben Sie die Anzahl der gebuchten Abschreibungen an
+DocType: Shift Type,Consequence after,Folge danach
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Womit brauchst du Hilfe?
 DocType: Journal Entry,Printing Settings,Druckeinstellungen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banking
@@ -2283,6 +2302,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Rechnungsadresse stimmt mit Versandadresse überein
 DocType: Account,Cash,Kasse
 DocType: Employee,Leave Policy,Richtlinie verlassen
+DocType: Shift Type,Consequence,Folge
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Studentenadresse
 DocType: GST Account,CESS Account,CESS-Konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Für das Konto &quot;Gewinn und Verlust&quot; ist eine Kostenstelle erforderlich {2}. Bitte richten Sie eine Standardkostenstelle für das Unternehmen ein.
@@ -2347,6 +2367,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Periodenabschlussbeleg
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Name
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Bitte Spesenabrechnung eingeben
+DocType: Issue,Resolution By Variance,Auflösung durch Varianz
 DocType: Employee,Resignation Letter Date,Kündigungsschreiben Datum
 DocType: Soil Texture,Sandy Clay,Sandiger Lehm
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis heute
@@ -2359,6 +2380,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Jetzt ansehen
 DocType: Item Price,Valid Upto,Gültig bis
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Referenz-Doctype muss einer von {0} sein
+DocType: Employee Checkin,Skip Auto Attendance,Automatische Teilnahme überspringen
 DocType: Payment Request,Transaction Currency,Transaktionswährung
 DocType: Loan,Repayment Schedule,Rückzahlungsplan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Legen Sie einen Muster-Retention-Stock-Eintrag an
@@ -2430,6 +2452,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS Closing Voucher Taxes
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Aktion initialisiert
 DocType: POS Profile,Applicable for Users,Anwendbar für Benutzer
+,Delayed Order Report,Bericht über verspätete Bestellung
 DocType: Training Event,Exam,Prüfung
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Falsche Anzahl gefundener Hauptbucheinträge. Möglicherweise haben Sie in der Transaktion ein falsches Konto ausgewählt.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Vertriebspipeline
@@ -2444,10 +2467,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Die Bedingungen werden auf alle ausgewählten Elemente zusammen angewendet.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigurieren
 DocType: Hotel Room,Capacity,Kapazität
+DocType: Employee Checkin,Shift End,Schichtende
 DocType: Installation Note Item,Installed Qty,Installierte Menge
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Der Stapel {0} von Artikel {1} ist deaktiviert.
 DocType: Hotel Room Reservation,Hotel Reservation User,Benutzer der Hotelreservierung
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Arbeitstag wurde zweimal wiederholt
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement mit Entitätstyp {0} und Entität {1} ist bereits vorhanden.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Artikelgruppe für Artikel {0} im Artikelstamm nicht erwähnt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Namensfehler: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Im POS-Profil ist ein Gebiet erforderlich
@@ -2495,6 +2519,7 @@
 DocType: Depreciation Schedule,Schedule Date,Planen Sie Datum
 DocType: Packing Slip,Package Weight Details,Angaben zum Paketgewicht
 DocType: Job Applicant,Job Opening,Stellenangebote
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Letzte bekannte erfolgreiche Synchronisierung des Eincheckens von Mitarbeitern. Setzen Sie dies nur zurück, wenn Sie sicher sind, dass alle Protokolle von allen Speicherorten synchronisiert wurden. Bitte ändern Sie dies nicht, wenn Sie sich nicht sicher sind."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tatsächliche Kosten
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Der Gesamtvorschuss ({0}) gegen Auftrag {1} kann nicht größer sein als der Gesamtsumme ({2}).
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Artikelvarianten aktualisiert
@@ -2539,6 +2564,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Erhalten Sie Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Werden Tagebuchdaten importiert?
 ,Sales Partners Commission,Vertriebspartnerkommission
+DocType: Shift Type,Enable Different Consequence for Early Exit,Unterschiedliche Konsequenzen für vorzeitiges Beenden aktivieren
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Legal
 DocType: Loan Application,Required by Date,Erforderlich bis Datum
 DocType: Quiz Result,Quiz Result,Quiz-Ergebnis
@@ -2598,7 +2624,6 @@
 DocType: Pricing Rule,Pricing Rule,Preisregel
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Optionale Feiertagsliste für Urlaubszeitraum {0} nicht festgelegt
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Legen Sie das Feld Benutzer-ID in einem Mitarbeiterdatensatz fest, um die Mitarbeiterrolle festzulegen"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Zeit zu lösen
 DocType: Training Event,Training Event,Schulungsveranstaltung
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Der normale Ruheblutdruck bei Erwachsenen beträgt ungefähr 120 mmHg systolisch und 80 mmHg diastolisch, abgekürzt &quot;120/80 mmHg&quot;."
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Das System ruft alle Einträge ab, wenn der Grenzwert Null ist."
@@ -2642,6 +2667,7 @@
 DocType: Student Applicant,Approved,Genehmigt
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Ab Datum sollte innerhalb des Geschäftsjahres liegen. Angenommen ab Datum = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Bitte legen Sie die Lieferantengruppe in den Einkaufseinstellungen fest.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} ist ein ungültiger Anwesenheitsstatus.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Temporäres Eröffnungskonto
 DocType: Purchase Invoice,Cash/Bank Account,Bargeld / Bankkonto
 DocType: Quality Meeting Table,Quality Meeting Table,Qualität Besprechungstisch
@@ -2677,6 +2703,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Stundenplan
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Einzelteil-kluges Steuerdetail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Die Teilnahme wird erst nach diesem Datum automatisch markiert.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Lieferungen an UIN-Inhaber
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Angebotsanfrage
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Die Währung kann nach Eingabe einer anderen Währung nicht geändert werden
@@ -2725,7 +2752,6 @@
 DocType: Item,Is Item from Hub,Ist Gegenstand von Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Qualitätsverfahren.
 DocType: Share Balance,No of Shares,Anzahl der Anteile
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Zeile {0}: Menge nicht verfügbar für {4} in Lager {1} zum Buchungszeitpunkt des Eintrags ({2} {3})
 DocType: Quality Action,Preventive,Präventiv
 DocType: Support Settings,Forum URL,Forum URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Mitarbeiter und Anwesenheit
@@ -2947,7 +2973,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Standardsteuern und -gebühren
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Lieferanten. Einzelheiten finden Sie in der Zeitleiste unten
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Der maximale Leistungsbetrag des Mitarbeiters {0} überschreitet {1}.
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Geben Sie das Start- und Enddatum für die Vereinbarung ein.
 DocType: Delivery Note Item,Against Sales Invoice,Gegen Verkaufsrechnung
 DocType: Loyalty Point Entry,Purchase Amount,Gesamtbetrag des Einkaufs
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,"Kann nicht als &quot;Verloren&quot; festgelegt werden, da ein Kundenauftrag erstellt wurde."
@@ -2971,7 +2996,7 @@
 DocType: Lead,Organization Name,Name der Organisation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Gültig ab und gültig bis Felder sind kumulativ Pflichtfelder
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Batch-Nr. Muss mit {1} {2} identisch sein
-DocType: Employee,Leave Details,Details hinterlassen
+DocType: Employee Checkin,Shift Start,Schichtstart
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Aktiengeschäfte vor {0} werden eingefroren
 DocType: Driver,Issuing Date,Ausstellungsdatum
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Anforderer
@@ -3016,9 +3041,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Cash Flow Mapping-Vorlagendetails
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Rekrutierung und Schulung
 DocType: Drug Prescription,Interval UOM,Intervall UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Grace Period-Einstellungen für die automatische Teilnahme
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Von Währung und Bis Währung dürfen nicht identisch sein
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Pharmazeutika
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Support-Stunden
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} wurde storniert oder geschlossen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Zeile {0}: Der Vorschuss gegen den Kunden muss gutgeschrieben sein
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Group by Voucher (konsolidiert)
@@ -3128,6 +3155,7 @@
 DocType: Territory,Territory Manager,Gebietsmanager
 DocType: Lab Test,Sample ID,Proben ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Einkaufswagen ist leer
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Die Teilnahme wurde gemäß den Check-ins der Mitarbeiter markiert
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Asset {0} muss eingereicht werden
 ,Absent Student Report,Bericht über abwesende Schüler
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Im Bruttogewinn enthalten
@@ -3135,7 +3163,9 @@
 DocType: Travel Request Costing,Funded Amount,Finanzierungsbetrag
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} wurde nicht übermittelt, sodass die Aktion nicht abgeschlossen werden kann"
 DocType: Subscription,Trial Period End Date,Enddatum des Testzeitraums
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Wechselnde Eingaben wie IN und OUT während derselben Schicht
 DocType: BOM Update Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Punkt 5
 DocType: Employee,Passport Number,Ausweisnummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Vorübergehende Eröffnung
@@ -3251,6 +3281,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Möglicher Lieferant
 ,Issued Items Against Work Order,Ausgegebene Artikel gegen Fertigungsauftrag
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} Rechnung erstellen
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 DocType: Student,Joining Date,Beitrittsdatum
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Anfordernde Site
 DocType: Purchase Invoice,Against Expense Account,Gegen Spesenabrechnung
@@ -3290,6 +3321,7 @@
 DocType: Landed Cost Item,Applicable Charges,Anwendbare Gebühren
 ,Point of Sale,Kasse
 DocType: Authorization Rule,Approving User  (above authorized value),Genehmigender Benutzer (über dem autorisierten Wert)
+DocType: Service Level Agreement,Entity,Entität
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Betrag {0} {1} von {2} auf {3} übertragen
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Kunde {0} gehört nicht zum Projekt {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Vom Party-Namen
@@ -3336,6 +3368,7 @@
 DocType: Soil Texture,Sand Composition (%),Sandzusammensetzung (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Tagesbuchdaten importieren
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Für die Buchung einer Spesenabrechnung ist eine Kostenstelle erforderlich
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
@@ -3396,7 +3429,6 @@
 DocType: Asset,Asset Owner,Asset-Besitzer
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Lager ist obligatorisch für Lagerartikel {0} in Reihe {1}
 DocType: Stock Entry,Total Additional Costs,Zusätzliche Gesamtkosten
-DocType: Marketplace Settings,Last Sync On,Letzte Synchronisierung Ein
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Bitte setzen Sie mindestens eine Zeile in die Tabelle Steuern und Abgaben
 DocType: Asset Maintenance Team,Maintenance Team Name,Name des Wartungsteams
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Diagramm der Kostenstellen
@@ -3412,12 +3444,12 @@
 DocType: Job Card,WIP Warehouse,WIP-Lager
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Benutzer-ID für Mitarbeiter {0} nicht festgelegt
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}",Die verfügbare Menge ist {0}. Sie benötigen {1}.
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Benutzer {0} wurde erstellt
 DocType: Stock Settings,Item Naming By,Item Naming By
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Bestellt
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dies ist eine Stammkundengruppe und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materialanforderung {0} wurde abgebrochen oder gestoppt
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Streng basierend auf dem Protokolltyp beim Einchecken von Mitarbeitern
 DocType: Purchase Order Item Supplied,Supplied Qty,Mitgelieferte Menge
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,Sand
@@ -3476,6 +3508,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Doppelte Artikelgruppe in der Artikelgruppentabelle gefunden
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Jahresgehalt
 DocType: Supplier Scorecard,Weighting Function,Gewichtungsfunktion
+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 Artikel nicht gefunden: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Fehler beim Auswerten der Kriterienformel
 ,Lab Test Report,Labortestbericht
 DocType: BOM,With Operations,Mit Operationen
@@ -3489,6 +3522,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Keine Rückzahlungen für Journaleintrag verfügbar
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ist inaktiver Schüler
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Bestandserfassung vornehmen
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Stücklistenrekursion: {0} kann nicht über- oder untergeordnet zu {1} sein
 DocType: Employee Onboarding,Activities,Aktivitäten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Mindestens ein Lager ist obligatorisch
 ,Customer Credit Balance,Kundenguthaben
@@ -3501,9 +3535,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Mehrfach-Treueprogramm für den Kunden gefunden. Bitte manuell auswählen.
 DocType: Patient,Medication,Medikation
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Wählen Sie Treueprogramm
+DocType: Employee Checkin,Attendance Marked,Teilnahme markiert
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Rohes Material
 DocType: Sales Order,Fully Billed,Vollständig in Rechnung gestellt
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Bitte setzen Sie den Hotelzimmerpreis auf {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Wählen Sie nur eine Priorität als Standard aus.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Bitte identifizieren / erstellen Sie ein Konto (Ledger) für den Typ - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Der gesamte Kredit- / Debitbetrag sollte mit dem verknüpften Journaleintrag übereinstimmen
 DocType: Purchase Invoice Item,Is Fixed Asset,Ist Anlagevermögen
@@ -3524,6 +3560,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Terminbestätigung
 DocType: Shopping Cart Settings,Orders,Aufträge
 DocType: HR Settings,Retirement Age,Rentenalter
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Projizierte Menge
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Das Löschen ist für das Land {0} nicht zulässig.
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Zeile # {0}: Asset {1} ist bereits {2}
@@ -3607,11 +3644,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Buchhalter
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Zwischen dem Datum {1} und {2} ist bereits ein POS-Abschlussbeleg für {0} vorhanden.
 apps/erpnext/erpnext/config/help.py,Navigating,Navigation
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Keine ausstehenden Rechnungen erfordern eine Neubewertung des Wechselkurses
 DocType: Authorization Rule,Customer / Item Name,Name des Kunden / Artikels
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Neue Seriennummer kann kein Lager haben. Das Lager muss durch Bestandserfassung oder Kaufbeleg festgelegt werden
 DocType: Issue,Via Customer Portal,Über das Kundenportal
 DocType: Work Order Operation,Planned Start Time,Geplante Startzeit
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ist {2}
+DocType: Service Level Priority,Service Level Priority,Service Level Priorität
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Die Anzahl der gebuchten Abschreibungen darf die Gesamtanzahl der Abschreibungen nicht überschreiten
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Aktienbuch
 DocType: Journal Entry,Accounts Payable,Abbrechnungsverbindlichkeiten
@@ -3722,7 +3761,6 @@
 DocType: Delivery Note,Delivery To,Lieferung nach
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankdaten
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Geplant bis
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Abrechnungs- und Arbeitszeiten in der Arbeitszeittabelle beibehalten
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Verfolgen Sie Leads nach Lead-Quelle.
 DocType: Clinical Procedure,Nursing User,Stillender Benutzer
 DocType: Support Settings,Response Key List,Liste der Antwortschlüssel
@@ -3890,6 +3928,7 @@
 DocType: Work Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: Antibiotic,Laboratory User,Laborbenutzer
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online-Auktionen
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Die Priorität {0} wurde wiederholt.
 DocType: Fee Schedule,Fee Creation Status,Status der Gebührenerstellung
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Software
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Kundenauftrag zur Zahlung
@@ -3956,6 +3995,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Informationen für {0} konnten nicht abgerufen werden.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Die Rechnungswährung muss entweder der Währung des Standardunternehmens oder der Währung des Partykontos entsprechen
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Bitte geben Sie die Mitarbeiter-ID dieses Verkäufers ein
+DocType: Shift Type,Early Exit Consequence after,Early Exit Consequence nach
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Erstellen Sie Eingangsverkaufs- und Einkaufsrechnungen
 DocType: Disease,Treatment Period,Behandlungszeitraum
 apps/erpnext/erpnext/config/settings.py,Setting up Email,E-Mail einrichten
@@ -3973,7 +4013,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Name des Studenten:
 DocType: SMS Log,Sent On,Gesendet am
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Verkaufsrechnung
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Die Reaktionszeit kann nicht länger als die Auflösungszeit sein
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Für kursbasierte Studentengruppen wird der Kurs für jeden Studenten aus den eingeschriebenen Kursen für die Programmeinschreibung validiert.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Innerstaatliche Lieferungen
 DocType: Employee,Create User Permission,Benutzerberechtigung erstellen
@@ -4012,6 +4051,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standardvertragsbedingungen für Verkauf oder Einkauf.
 DocType: Sales Invoice,Customer PO Details,Kundenauftragsdetails
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patient nicht gefunden
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Wählen Sie eine Standardpriorität.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn für diesen Artikel keine Gebühren anfallen"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Es gibt eine Kundengruppe mit demselben Namen. Bitte ändern Sie den Kundennamen oder benennen Sie die Kundengruppe um
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4051,6 +4091,7 @@
 DocType: Support Settings,Support Portal,Support-Portal
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Das Enddatum von Aufgabe <b>{0}</b> darf nicht unter dem <b>{1}</b> erwarteten Startdatum <b>{2} liegen.</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Mitarbeiter {0} ist beurlaubt am {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Diese Vereinbarung zum Servicelevel ist spezifisch für den Kunden {0}.
 DocType: Employee,Held On,Angehalten
 DocType: Healthcare Practitioner,Practitioner Schedules,Praktizierende Termine
 DocType: Project Template Task,Begin On (Days),Beginn an (Tage)
@@ -4058,6 +4099,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Fertigungsauftrag war {0}
 DocType: Inpatient Record,Admission Schedule Date,Zulassungszeitplan Datum
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Wertberichtigung von Vermögenswerten
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Markieren Sie die Anwesenheit basierend auf dem &quot;Einchecken von Mitarbeitern&quot; für Mitarbeiter, die dieser Schicht zugeordnet sind."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Lieferungen an nicht registrierte Personen
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Alle Jobs
 DocType: Appointment Type,Appointment Type,Terminart
@@ -4171,7 +4213,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Verpackungsmaterialgewicht. (zum Ausdrucken)
 DocType: Plant Analysis,Laboratory Testing Datetime,Labortests Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Der Artikel {0} kann keinen Stapel haben
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Vertriebspipeline nach Phase
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Schülergruppenstärke
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Kontoauszug Transaktionserfassung
 DocType: Purchase Order,Get Items from Open Material Requests,Abrufen von Elementen aus offenen Materialanforderungen
@@ -4253,7 +4294,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Show Aging Warehouse-weise
 DocType: Sales Invoice,Write Off Outstanding Amount,Ausstehender Betrag abschreiben
 DocType: Payroll Entry,Employee Details,Mitarbeiterdetails
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Die Startzeit darf für {0} nicht größer als die Endzeit sein.
 DocType: Pricing Rule,Discount Amount,Rabattbetrag
 DocType: Healthcare Service Unit Type,Item Details,Artikeldetails
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Doppelte Steuererklärung von {0} für Zeitraum {1}
@@ -4306,7 +4346,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Nettolohn kann nicht negativ sein
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Anzahl der Interaktionen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Zeile {0} # Artikel {1} kann nicht mehr als {2} gegen Bestellung {3} übertragen werden
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Verschiebung
+DocType: Attendance,Shift,Verschiebung
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Verarbeiten des Kontenplans und der Parteien
 DocType: Stock Settings,Convert Item Description to Clean HTML,Artikelbeschreibung in sauberes HTML konvertieren
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Alle Lieferantengruppen
@@ -4377,6 +4417,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Eltern-Service-Einheit
 DocType: Sales Invoice,Include Payment (POS),Zahlung einschließen (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Private Equity
+DocType: Shift Type,First Check-in and Last Check-out,Erster Check-in und letzter Check-out
 DocType: Landed Cost Item,Receipt Document,Belegdokument
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Zeitraum der Lieferanten-Scorecard
 DocType: Employee Grade,Default Salary Structure,Standardgehalt Struktur
@@ -4459,6 +4500,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Bestellung anlegen
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Budget für ein Geschäftsjahr festlegen.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Die Kontentabelle darf nicht leer sein.
+DocType: Employee Checkin,Entry Grace Period Consequence,Konsequenz der Meldefrist
 ,Payment Period Based On Invoice Date,Zahlungszeitraum basierend auf dem Rechnungsdatum
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Installationsdatum darf nicht vor Lieferdatum für Artikel {0} liegen
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Link zur Materialanfrage
@@ -4467,6 +4509,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Für dieses Lager ist bereits ein Nachbestellungseintrag vorhanden. {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 DocType: Monthly Distribution,Distribution Name,Verteilungsname
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Arbeitstag {0} wurde wiederholt.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Gruppe zu Nicht-Gruppe
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Aktualisierung läuft. Es könnte eine Weile dauern.
 DocType: Item,"Example: ABCD.#####
@@ -4479,6 +4522,7 @@
 DocType: Vehicle Log,Fuel Qty,Kraftstoffmenge
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile Nr
 DocType: Invoice Discounting,Disbursed,Ausbezahlt
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Zeit nach Schichtende, in der der Check-out für die Anwesenheit in Betracht gezogen wird."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Nettoveränderung der Verbindlichkeiten aus Lieferungen und Leistungen
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nicht verfügbar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Teilzeit
@@ -4492,7 +4536,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,PDC im Druck anzeigen
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Lieferant
 DocType: POS Profile User,POS Profile User,POS-Profilbenutzer
-DocType: Student,Middle Name,Zweiter Vorname
 DocType: Sales Person,Sales Person Name,Name des Verkäufers
 DocType: Packing Slip,Gross Weight,Bruttogewicht
 DocType: Journal Entry,Bill No,Rechnung Nr
@@ -4501,7 +4544,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Service Level Agreement
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Bitte wählen Sie zuerst Mitarbeiter und Datum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Der Artikelbewertungskurs wird unter Berücksichtigung des Betrags des Gutscheins für gelandete Kosten neu berechnet
 DocType: Timesheet,Employee Detail,Mitarbeiterdetail
 DocType: Tally Migration,Vouchers,Gutscheine
@@ -4536,7 +4578,7 @@
 DocType: Additional Salary,Date on which this component is applied,"Datum, an dem diese Komponente angewendet wird"
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Liste der verfügbaren Aktionäre mit Folionummern
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Richten Sie die Gateway-Konten ein.
-DocType: Service Level,Response Time Period,Reaktionszeit
+DocType: Service Level Priority,Response Time Period,Reaktionszeit
 DocType: Purchase Invoice,Purchase Taxes and Charges,Steuern und Gebühren kaufen
 DocType: Course Activity,Activity Date,Aktivitätsdatum
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Neuen Kunden auswählen oder hinzufügen
@@ -4561,6 +4603,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Geschäftsjahr
 DocType: Sales Invoice Item,Deferred Revenue,Aufgeschobene Einnahmen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Es muss mindestens eine der Optionen Verkaufen oder Kaufen ausgewählt sein
+DocType: Shift Type,Working Hours Threshold for Half Day,Arbeitszeitschwelle für halben Tag
 ,Item-wise Purchase History,Artikelweise Kaufhistorie
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Das Service-Stopp-Datum für das Element in Zeile {0} kann nicht geändert werden.
 DocType: Production Plan,Include Subcontracted Items,Unterauftragsgegenstände einbeziehen
@@ -4593,6 +4636,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Gleiches Element mehrmals zulassen
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Stückliste anlegen
 DocType: Healthcare Practitioner,Charges,Gebühren
+DocType: Employee,Attendance and Leave Details,Anwesenheits- und Urlaubsdetails
 DocType: Student,Personal Details,Persönliche Details
 DocType: Sales Order,Billing and Delivery Status,Rechnungs- und Lieferstatus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,"Zeile {0}: Für den Lieferanten {0} ist eine E-Mail-Adresse erforderlich, um eine E-Mail zu senden"
@@ -4644,7 +4688,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Wert zwischen {0} und {1} eingeben
 DocType: Purchase Order,Order Confirmation Date,Auftragsbestätigungsdatum
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Berechnen Sie die voraussichtliche Ankunftszeit
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Verbrauchbar
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Startdatum des Abonnements
@@ -4667,7 +4710,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Journaleintragskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variante
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forum Aktivität
-DocType: Service Level,Resolution Time Period,Auflösungszeitraum
+DocType: Service Level Priority,Resolution Time Period,Auflösungszeitraum
 DocType: Request for Quotation,Supplier Detail,Lieferantendetail
 DocType: Project Task,View Task,Aufgabe anzeigen
 DocType: Serial No,Purchase / Manufacture Details,Kauf- / Herstellerdetails
@@ -4734,6 +4777,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Das Lager kann nur über Bestandsbuchung / Lieferschein / Kaufbeleg geändert werden
 DocType: Support Settings,Close Issue After Days,Problem nach Tagen schließen
 DocType: Payment Schedule,Payment Schedule,Zahlungsplan
+DocType: Shift Type,Enable Entry Grace Period,Aktivieren Sie die Anmeldefrist
 DocType: Patient Relation,Spouse,Ehepartner
 DocType: Purchase Invoice,Reason For Putting On Hold,Grund für das Zurückstellen
 DocType: Item Attribute,Increment,Zuwachs
@@ -4873,6 +4917,7 @@
 DocType: Vehicle Log,Invoice Ref,Rechnungsreferenz
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-Formular gilt nicht für Rechnung: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Rechnung erstellt
+DocType: Shift Type,Early Exit Grace Period,Early Exit Grace Period
 DocType: Patient Encounter,Review Details,Details überprüfen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Zeile {0}: Stundenwert muss größer als Null sein.
 DocType: Account,Account Number,Kontonummer
@@ -4884,7 +4929,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Anwendbar, wenn das Unternehmen SpA, SApA oder SRL ist"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Überlappende Bedingungen zwischen:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Bezahlt und nicht geliefert
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Der Artikelcode ist obligatorisch, da der Artikel nicht automatisch nummeriert wird"
 DocType: GST HSN Code,HSN Code,HSN-Code
 DocType: GSTR 3B Report,September,September
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Verwaltungsaufwendungen
@@ -4920,6 +4964,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP-Konto
 DocType: SMS Log,Sender Name,Absender
 DocType: Pricing Rule,Supplier Group,Lieferantengruppe
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Legen Sie die Start- und Endzeit für den \ Support-Tag {0} unter dem Index {1} fest.
 DocType: Employee,Date of Issue,Ausgabedatum
 ,Requested Items To Be Transferred,Angeforderte zu übertragende Elemente
 DocType: Employee,Contract End Date,Vertragsende
@@ -4930,6 +4976,7 @@
 DocType: Opportunity,Sales Stage,Verkaufsphase
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"In Words wird angezeigt, sobald Sie den Kundenauftrag speichern."
 DocType: Item Reorder,Re-order Level,Level nachbestellen
+DocType: Shift Type,Enable Auto Attendance,Automatische Teilnahme aktivieren
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Präferenz
 ,Department Analytics,Abteilung Analytik
 DocType: Crop,Scientific Name,Wissenschaftlicher Name
@@ -4942,6 +4989,7 @@
 DocType: Quiz Activity,Quiz Activity,Quiz-Aktivität
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} befindet sich nicht in einem gültigen Abrechnungszeitraum
 DocType: Timesheet,Billed,In Rechnung gestellt
+apps/erpnext/erpnext/config/support.py,Issue Type.,Problemtyp.
 DocType: Restaurant Order Entry,Last Sales Invoice,Letzte Verkaufsrechnung
 DocType: Payment Terms Template,Payment Terms,Zahlungsbedingungen
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reservierte Menge: Zum Verkauf bestellte, aber nicht gelieferte Menge."
@@ -5037,6 +5085,7 @@
 DocType: Account,Asset,Vermögenswert
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} hat keinen Terminplan für Ärzte. Fügen Sie es in Healthcare Practitioner master hinzu
 DocType: Vehicle,Chassis No,Fahrwerksnummer
+DocType: Employee,Default Shift,Standardverschiebung
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Abkürzung der Firma
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Baum der Stückliste
 DocType: Article,LMS User,LMS-Benutzer
@@ -5085,6 +5134,7 @@
 DocType: Sales Person,Parent Sales Person,Übergeordneter Verkäufer
 DocType: Student Group Creation Tool,Get Courses,Kurse erhalten
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Zeile # {0}: Menge muss 1 sein, da der Artikel ein Anlagevermögen ist. Bitte verwenden Sie eine separate Zeile für mehrere Mengen."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Arbeitszeit, unter der Abwesend markiert ist. (Null zu deaktivieren)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,In der Transaktion sind nur Blattknoten zulässig
 DocType: Grant Application,Organization,Organisation
 DocType: Fee Category,Fee Category,Gebührenkategorie
@@ -5097,6 +5147,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Bitte aktualisieren Sie Ihren Status für diese Schulungsveranstaltung
 DocType: Volunteer,Morning,Morgen
 DocType: Quotation Item,Quotation Item,Angebotsposition
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Ausgabepriorität.
 DocType: Journal Entry,Credit Card Entry,Kreditkarteneintrag
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Das Zeitfenster wurde übersprungen, und das Zeitfenster {0} bis {1} überschneidet sich mit dem vorhandenen Zeitfenster {2} bis {3}."
 DocType: Journal Entry Account,If Income or Expense,Ob Einnahmen oder Ausgaben
@@ -5147,11 +5198,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Datenimport und Einstellungen
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Wenn Auto Opt In aktiviert ist, werden die Kunden automatisch mit dem betreffenden Treueprogramm verknüpft (beim Speichern)."
 DocType: Account,Expense Account,Aufwandskonto
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Die Zeit vor dem Schichtbeginn, in der der Mitarbeiter-Check-in für die Anwesenheit berücksichtigt wird."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Beziehung mit Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Rechnung erstellen
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Zahlungsanforderung ist bereits vorhanden {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',"Mitarbeiter, der auf {0} entlassen wurde, muss als &quot;Links&quot; festgelegt werden"
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},{0} {1} bezahlen
+DocType: Company,Sales Settings,Verkaufseinstellungen
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Auf die Angebotsanfrage kann durch Klicken auf den folgenden Link zugegriffen werden
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name der monatlichen Verteilung
@@ -5230,6 +5283,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Standardsteuervorlagen für Verkauf und Einkauf werden erstellt.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Der Urlaubstyp {0} kann nicht weitergeleitet werden
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debit To-Konto muss ein Debitorenkonto sein
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Das Enddatum der Vereinbarung kann nicht unter dem heutigen Datum liegen.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Bitte legen Sie Konto in Lager {0} oder Standard-Inventarkonto in Firma {1} fest.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Als Standard einstellen
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Das Nettogewicht dieses Pakets. (automatisch berechnet als Summe des Nettogewichts der Artikel)
@@ -5256,8 +5310,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Abgelaufene Chargen
 DocType: Shipping Rule,Shipping Rule Type,Versandregel Typ
 DocType: Job Offer,Accepted,Akzeptiert
-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 abzubrechen"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Sie haben bereits für die Bewertungskriterien {} bewertet.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Wählen Sie Chargennummern
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Alter (Tage)
@@ -5284,6 +5336,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Wählen Sie Ihre Domains aus
 DocType: Agriculture Task,Task Name,Aufgabennname
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Für den Fertigungsauftrag bereits erstellte Bestandsbuchungen
+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"
 ,Amount to Deliver,Menge zu liefern
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Firma {0} existiert nicht
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Für die angegebenen Artikel wurden keine ausstehenden Materialanforderungen zum Verknüpfen gefunden.
@@ -5333,6 +5387,7 @@
 DocType: Lab Prescription,Test Code,Code testen
 DocType: Purchase Taxes and Charges,On Previous Row Total,In der vorherigen Zeile insgesamt
 DocType: Student,Student Email Address,E-Mail-Adresse des Schülers
+,Delayed Item Report,Bericht über verzögerte Artikel
 DocType: Academic Term,Education,Bildung
 DocType: Supplier Quotation,Supplier Address,Lieferantenadresse
 DocType: Salary Detail,Do not include in total,Nicht insgesamt einbeziehen
@@ -5340,7 +5395,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} existiert nicht
 DocType: Purchase Receipt Item,Rejected Quantity,Abgelehnte Menge
 DocType: Cashier Closing,To TIme,Zur Zeit
-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 Artikel nicht gefunden: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Tägliche Arbeitszusammenfassung Gruppenbenutzer
 DocType: Fiscal Year Company,Fiscal Year Company,Geschäftsjahr Unternehmen
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Der alternative Artikel darf nicht mit dem Artikelcode identisch sein
@@ -5392,6 +5446,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Verzögerung zwischen Lieferstopps
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Lagerbestände einfrieren, die älter als [Tage] sind"
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Aktionsprogramm Produktrabatt
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Die Ausgabepriorität ist bereits vorhanden
 DocType: Account,Asset Received But Not Billed,"Erhaltener, aber nicht in Rechnung gestellter Vermögenswert"
 DocType: POS Closing Voucher,Total Collected Amount,Gesammelte Gesamtmenge
 DocType: Course,Default Grading Scale,Standard-Bewertungsskala
@@ -5434,6 +5489,7 @@
 DocType: Contract,Fulfilment Terms,Erfüllungsbedingungen
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Nicht-Gruppe zu Gruppe
 DocType: Student Guardian,Mother,Mutter
+DocType: Issue,Service Level Agreement Fulfilled,Service Level Agreement erfüllt
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Steuern auf nicht beanspruchte Leistungen an Arbeitnehmer abziehen
 DocType: Travel Request,Travel Funding,Reisefinanzierung
 DocType: Shipping Rule,Fixed,Fest
@@ -5463,10 +5519,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Keine Elemente gefunden.
 DocType: Item Attribute,From Range,Aus Reichweite
 DocType: Clinical Procedure,Consumables,Verbrauchsmaterial
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; und &#39;timestamp&#39; sind erforderlich.
 DocType: Purchase Taxes and Charges,Reference Row #,Referenzzeile #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Bitte setzen Sie die &#39;Kostenstelle für die Abschreibung von Vermögenswerten&#39; in Firma {0}.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,"Zeile # {0}: Der Zahlungsbeleg ist erforderlich, um die Transaktion abzuschließen"
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Klicken Sie auf diese Schaltfläche, um Ihre Kundenauftragsdaten von Amazon MWS abzurufen."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Arbeitszeit, unter der der halbe Tag markiert ist. (Null zu deaktivieren)"
 ,Assessment Plan Status,Status des Bewertungsplans
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Bitte wählen Sie zuerst {0} aus
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Senden Sie dies, um den Mitarbeiterdatensatz zu erstellen"
@@ -5537,6 +5595,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Set öffnen
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Filter umschalten
 DocType: Production Plan,Material Request Detail,Detail der Materialanfrage
+DocType: Shift Type,Process Attendance After,Anwesenheit verarbeiten nach
 DocType: Material Request Item,Quantity and Warehouse,Menge und Lager
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Gehen Sie zu Programme
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Zeile # {0}: Doppelter Eintrag in Referenzen {1} {2}
@@ -5594,6 +5653,7 @@
 DocType: Pricing Rule,Party Information,Party Informationen
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Schuldner ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Bis dato darf das Entlassungsdatum des Mitarbeiters nicht überschritten werden
+DocType: Shift Type,Enable Exit Grace Period,Aktiviere Exit Grace Period
 DocType: Expense Claim,Employees Email Id,Mitarbeiter E-Mail-ID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Preis von Shopify auf ERPNext-Preisliste aktualisieren
 DocType: Healthcare Settings,Default Medical Code Standard,Medizinischer Standard
@@ -5624,7 +5684,6 @@
 DocType: Budget,Applicable on Material Request,Anwendbar auf Materialanfrage
 DocType: Support Settings,Search APIs,Such-APIs
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Überproduktionsprozentsatz für Kundenauftrag
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Spezifikationen
 DocType: Purchase Invoice,Supplied Items,Mitgelieferte Artikel
 DocType: Leave Control Panel,Select Employees,Wählen Sie Mitarbeiter
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Zinsertragskonto im Darlehen auswählen {0}
@@ -5650,7 +5709,7 @@
 ,Supplier-Wise Sales Analytics,Supplier-Wise Sales Analytics
 DocType: GSTR 3B Report,February,Februar
 DocType: Appraisal,For Employee,Für Mitarbeiter
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Tatsächliches Lieferdatum
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Tatsächliches Lieferdatum
 DocType: Sales Partner,Sales Partner Name,Name des Vertriebspartners
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Abschreibungszeile {0}: Das Abschreibungsstartdatum wird als vergangenes Datum eingegeben
 DocType: GST HSN Code,Regional,Regional
@@ -5689,6 +5748,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Lieferanten-Scorecard
 DocType: Travel Itinerary,Travel To,Reisen nach
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Anwesenheit markieren
+DocType: Shift Type,Determine Check-in and Check-out,Check-in und Check-out festlegen
 DocType: POS Closing Voucher,Difference,Unterschied
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Klein
 DocType: Work Order Item,Work Order Item,Fertigungsauftragsposition
@@ -5722,6 +5782,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Droge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ist geschlossen
 DocType: Patient,Medical History,Krankengeschichte
+DocType: Expense Claim,Expense Taxes and Charges,Steuern und Gebühren
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Anzahl der Tage nach Ablauf des Rechnungsdatums, bevor das Abonnement gekündigt oder als nicht bezahlt markiert wird"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits gesendet
 DocType: Patient Relation,Family,Familie
@@ -5754,7 +5815,6 @@
 DocType: Dosage Strength,Strength,Stärke
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,"{0} Einheiten von {1} werden in {2} benötigt, um diese Transaktion abzuschließen."
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Rückmeldung der Rohstoffe des Lohnbearbeiters auf der Basis von
-DocType: Bank Guarantee,Customer,Kunde
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Wenn aktiviert, ist das Feld Akademischer Begriff im Programmeinschreibungs-Tool obligatorisch."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Für die stapelbasierte Studentengruppe wird der Studentenstapel für jeden Studenten aus der Programmeinschreibung validiert.
 DocType: Course,Topics,Themen
@@ -5834,6 +5894,7 @@
 DocType: Chapter,Chapter Members,Kapitel Mitglieder
 DocType: Warranty Claim,Service Address,Serviceadresse
 DocType: Journal Entry,Remark,Anmerkung
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Zeile {0}: Menge für {4} in Lager {1} zum Buchungszeitpunkt des Eintrags nicht verfügbar ({2} {3})
 DocType: Patient Encounter,Encounter Time,Begegnungszeit
 DocType: Serial No,Invoice Details,Rechnungs-Details
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen erstellt werden, Einträge können jedoch auch für Nicht-Gruppen vorgenommen werden"
@@ -5914,6 +5975,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Abschluss (Eröffnung + Summe)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriterienformel
 apps/erpnext/erpnext/config/support.py,Support Analytics,Support Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Anwesenheitsgeräte-ID (biometrische / RF-Tag-ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Überprüfung und Aktion
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, dürfen nur eingeschränkte Benutzer teilnehmen."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Betrag nach Abschreibung
@@ -5935,6 +5997,7 @@
 DocType: Salary Slip,Loan Repayment,Kreditrückzahlung
 DocType: Employee Education,Major/Optional Subjects,Hauptfächer / Wahlfächer
 DocType: Soil Texture,Silt,Versanden
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Lieferantenadressen und Kontakte
 DocType: Bank Guarantee,Bank Guarantee Type,Art der Bankgarantie
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Wenn diese Option deaktiviert ist, wird das Feld &quot;Summe gerundet&quot; in keiner Transaktion angezeigt"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5973,6 +6036,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Rechnungserstellungstool öffnen
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,POS-Transaktionen einschließen
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Für den angegebenen Mitarbeiterfeldwert wurde kein Mitarbeiter gefunden. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Erhaltener Betrag (Firmenwährung)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage ist voll, nicht gespeichert"
 DocType: Chapter Member,Chapter Member,Chapter Member
@@ -6005,6 +6069,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Es wurden keine Studentengruppen erstellt.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Doppelte Zeile {0} mit derselben {1}
 DocType: Employee,Salary Details,Gehaltsangaben
+DocType: Employee Checkin,Exit Grace Period Consequence,Grace Period Consequence beenden
 DocType: Bank Statement Transaction Invoice Item,Invoice,Rechnung
 DocType: Special Test Items,Particulars,Einzelheiten
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Bitte Filter basierend auf Artikel oder Lager einstellen
@@ -6106,6 +6171,7 @@
 DocType: Serial No,Out of AMC,Aus AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Berufsbild, erforderliche Qualifikationen usw."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Schiff nach Staat
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Möchten Sie die Materialanfrage einreichen?
 DocType: Opportunity Item,Basic Rate,Grundrate
 DocType: Compensatory Leave Request,Work End Date,Arbeitsende-Datum
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Anfrage für Rohstoffe
@@ -6291,6 +6357,7 @@
 DocType: Sales Order Item,Gross Profit,Bruttoertrag
 DocType: Quality Inspection,Item Serial No,Artikel Seriennr
 DocType: Asset,Insurer,Versicherer
+DocType: Employee Checkin,OUT,AUS
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Kaufbetrag
 DocType: Asset Maintenance Task,Certificate Required,Zertifikat erforderlich
 DocType: Retention Bonus,Retention Bonus,Retention Bonus
@@ -6406,6 +6473,8 @@
 DocType: Invoice Discounting,Sanctioned,Sanktioniert
 DocType: Course Enrollment,Course Enrollment,Kursanmeldung
 DocType: Item,Supplier Items,Lieferantenartikel
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Die Startzeit darf für {0} nicht größer oder gleich der Endzeit \ sein.
 DocType: Sales Order,Not Applicable,Unzutreffend
 DocType: Support Search Source,Response Options,Antwortoptionen
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} sollte ein Wert zwischen 0 und 100 sein
@@ -6492,7 +6561,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Anlagevermögen
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Gesamtverdienst
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Share Balance,From No,Ab Nr
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Zahlungsabgleichsrechnung
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
@@ -6600,6 +6668,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Preisregel ignorieren
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Essen
 DocType: Lost Reason Detail,Lost Reason Detail,Verlorene Begründung Detail
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Die folgenden Seriennummern wurden erstellt: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Kundenbewertung
 DocType: Serial No,Warranty / AMC Details,Garantie- / AMC-Details
 DocType: Issue,Opening Time,Öffnungszeit
@@ -6649,6 +6718,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Firmenname nicht gleich
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Mitarbeiterbeförderung kann nicht vor dem Beförderungsdatum eingereicht werden
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Nicht erlaubt, Lagertransaktionen zu aktualisieren, die älter als {0} sind"
+DocType: Employee Checkin,Employee Checkin,Mitarbeiter einchecken
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Das Startdatum sollte unter dem Enddatum für Artikel {0} liegen.
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Erstellen Sie Kundenangebote
 DocType: Buying Settings,Buying Settings,Einstellungen kaufen
@@ -6670,6 +6740,7 @@
 DocType: Patient,Patient Demographics,Patientendemographie
 DocType: Share Transfer,To Folio No,Zum Folio Nr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Cashflow aus laufender Geschäftstätigkeit
+DocType: Employee Checkin,Log Type,Protokolltyp
 DocType: Stock Settings,Allow Negative Stock,Negativen Bestand zulassen
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung in Menge oder Wert.
 DocType: Asset,Purchase Date,Kaufdatum
@@ -6714,6 +6785,7 @@
 DocType: Vital Signs,Very Hyper,Sehr Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Wählen Sie die Art Ihres Geschäfts aus.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Bitte wählen Sie Monat und Jahr
+DocType: Service Level,Default Priority,Standardpriorität
 DocType: Student Log,Student Log,Schülerprotokoll
 DocType: Shopping Cart Settings,Enable Checkout,Kasse aktivieren
 apps/erpnext/erpnext/config/settings.py,Human Resources,Humanressourcen
@@ -6742,7 +6814,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Verbinden Sie Shopify mit ERPNext
 DocType: Homepage Section Card,Subtitle,Untertitel
 DocType: Soil Texture,Loam,Lehm
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: BOM,Scrap Material Cost(Company Currency),Ausschussmaterialkosten (Firmenwährung)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Lieferschein {0} darf nicht eingereicht werden
 DocType: Task,Actual Start Date (via Time Sheet),Tatsächliches Startdatum (über Arbeitszeitblatt)
@@ -6798,6 +6869,7 @@
 DocType: Drug Prescription,Dosage,Dosierung
 DocType: Cheque Print Template,Starting position from top edge,Ausgangsposition von der Oberkante
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Termindauer (Minuten)
+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}
 DocType: Accounting Dimension,Disable,Deaktivieren
 DocType: Email Digest,Purchase Orders to Receive,Bestellungen zu erhalten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Produktionen Aufträge können nicht erhoben werden für:
@@ -6813,7 +6885,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Material für Lohnbearbeiter übergeben
 DocType: Job Card,Timing Detail,Timing-Detail
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Erforderlich am
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} von {1} wird importiert
 DocType: Job Offer Term,Job Offer Term,Laufzeit des Stellenangebots
 DocType: SMS Center,All Contact,Alle Kontakte
 DocType: Project Task,Project Task,Projektaufgabe
@@ -6864,7 +6935,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Artikel {0} ist nicht für Seriennummern eingerichtet. Artikelstamm prüfen
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Vom Staat
 DocType: Leave Type,Maximum Continuous Days Applicable,Maximal anwendbare ununterbrochene Tage
-apps/erpnext/erpnext/config/support.py,Support Team.,Support-team.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Bitte geben Sie zuerst den Firmennamen ein
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Import erfolgreich
 DocType: Guardian,Alternate Number,Alternative Nummer
@@ -6956,6 +7026,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Zeile # {0}: Element hinzugefügt
 DocType: Student Admission,Eligibility and Details,Teilnahmeberechtigung und Details
 DocType: Staffing Plan,Staffing Plan Detail,Besetzungsplan Detail
+DocType: Shift Type,Late Entry Grace Period,Nachfrist
 DocType: Email Digest,Annual Income,Jährliches Einkommen
 DocType: Journal Entry,Subscription Section,Abo-Bereich
 DocType: Salary Slip,Payment Days,Zahlungstage
@@ -7006,6 +7077,7 @@
 DocType: Journal Entry Account,Account Balance,Kontostand
 DocType: Asset Maintenance Log,Periodicity,Periodizität
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Krankenakte
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Der Protokolltyp ist für Eincheckvorgänge in der Schicht erforderlich: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Ausführung
 DocType: Item,Valuation Method,Bewertungsmethode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} gegen Verkaufsrechnung {1}
@@ -7090,6 +7162,7 @@
 DocType: Loan Type,Loan Name,Darlehensname
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Standardzahlungsmodus einstellen
 DocType: Quality Goal,Revision,Revision
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Die Zeit vor dem Schichtende, zu der der Check-out als früh angesehen wird (in Minuten)."
 DocType: Healthcare Service Unit,Service Unit Type,Typ der Wartungseinheit
 DocType: Purchase Invoice,Return Against Purchase Invoice,Gegen Rechnung zurücksenden
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Geheimnis generieren
@@ -7245,12 +7318,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmetika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Aktivieren Sie dieses Kontrollkästchen, wenn Sie den Benutzer zwingen möchten, vor dem Speichern eine Serie auszuwählen. Wenn Sie dies aktivieren, wird es keine Standardeinstellung geben."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle können gesperrte Konten festlegen und Konteneinträge für gesperrte Konten erstellen / ändern
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Expense Claim,Total Claimed Amount,Total Claimed Amount
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Zeitfenster in den nächsten {0} Tagen für Vorgang {1} nicht gefunden
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Einpacken
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Sie können nur erneuern, wenn Ihre Mitgliedschaft innerhalb von 30 Tagen abläuft"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Wert muss zwischen {0} und {1} liegen
 DocType: Quality Feedback,Parameters,Parameter
+DocType: Shift Type,Auto Attendance Settings,Einstellungen für die automatische Teilnahme
 ,Sales Partner Transaction Summary,Sales Partner Transaction Summary
 DocType: Asset Maintenance,Maintenance Manager Name,Name des Wartungsmanagers
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,"Es wird benötigt, um Artikeldetails abzurufen."
@@ -7342,10 +7417,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Angewandte Regel validieren
 DocType: Job Card Item,Job Card Item,Jobkartenelement
 DocType: Homepage,Company Tagline for website homepage,Firmen-Slogan für die Homepage der Website
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Stellen Sie die Reaktionszeit und die Auflösung für die Priorität {0} auf den Index {1} ein.
 DocType: Company,Round Off Cost Center,Kostenstelle abrunden
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterien Gewicht
 DocType: Asset,Depreciation Schedules,Abschreibungspläne
-DocType: Expense Claim Detail,Claim Amount,Anspruchsbetrag
 DocType: Subscription,Discounts,Rabatte
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: Subscription,Cancelation Date,Stornierungsdatum
@@ -7373,7 +7448,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Nullwerte anzeigen
 DocType: Employee Onboarding,Employee Onboarding,Mitarbeiter-Onboarding
 DocType: POS Closing Voucher,Period End Date,Enddatum des Zeitraums
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Verkaufschancen nach Quelle
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Der erste Urlaubsgenehmiger in der Liste wird als Standard-Urlaubsgenehmiger festgelegt.
 DocType: POS Settings,POS Settings,POS-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Alle Konten
@@ -7394,7 +7468,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Zeile # {0}: Die Rate muss mit {1}: {2} ({3} / {4}) übereinstimmen.
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLK-HLK-JJJJ.-
 DocType: Healthcare Settings,Healthcare Service Items,Serviceartikel für das Gesundheitswesen
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Keine Aufzeichnungen gefunden
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Alterungsbereich 3
 DocType: Vital Signs,Blood Pressure,Blutdruck
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Ziel Ein
@@ -7441,6 +7514,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Chargen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Verteidigung
 DocType: Item,Has Batch No,Hat Charge Nr
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Verzögerte Tage
 DocType: Lead,Person Name,Name der Person
 DocType: Item Variant,Item Variant,Artikelvariante
 DocType: Training Event Employee,Invited,Eingeladen
@@ -7462,7 +7536,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Start- und Enddatum liegen nicht in einer gültigen Abrechnungsperiode, {0} kann nicht berechnet werden."
 DocType: POS Profile,Only show Customer of these Customer Groups,Nur Kunden dieser Kundengruppen anzeigen
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,"Wählen Sie Elemente aus, um die Rechnung zu speichern"
-DocType: Service Level,Resolution Time,Lösungszeit
+DocType: Service Level Priority,Resolution Time,Lösungszeit
 DocType: Grading Scale Interval,Grade Description,Sortenbeschreibung
 DocType: Homepage Section,Cards,Karten
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Qualitätssitzungsprotokoll
@@ -7489,6 +7563,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Kontoauszugssaldo gemäß Hauptbuch
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Gesundheitswesen (Beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Standardlager zum Anlegen von Kundenauftrag und Lieferschein
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Die Antwortzeit für {0} am Index {1} darf nicht länger als die Auflösungszeit sein.
 DocType: Opportunity,Customer / Lead Name,Name des Kunden / Interessenten
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Nicht beanspruchter Betrag
@@ -7535,7 +7610,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Parteien und Adressen importieren
 DocType: Item,List this Item in multiple groups on the website.,Listen Sie diesen Artikel in mehreren Gruppen auf der Website.
 DocType: Request for Quotation,Message for Supplier,Nachricht für Lieferanten
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"{0} kann nicht geändert werden, da Lagertransaktion für Artikel {1} vorhanden ist."
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Teammitglied
 DocType: Asset Category Account,Asset Category Account,Anlagenkategorie-Konto
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 583602e..ed3744a 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Το ραντεβού {0} και το Τιμολόγιο Πωλήσεων {1} ακυρώθηκαν
 DocType: Purchase Receipt,Vehicle Number,Αριθμός οχήματος
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Η ηλεκτρονική σου διεύθυνση...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Συμπεριλάβετε τις προεπιλεγμένες καταχωρίσεις βιβλίων
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Συμπεριλάβετε τις προεπιλεγμένες καταχωρίσεις βιβλίων
 DocType: Activity Cost,Activity Type,Είδος δραστηριότητας
 DocType: Purchase Invoice,Get Advances Paid,Πληρωμή προπληρωμών
 DocType: Company,Gain/Loss Account on Asset Disposal,Λογαριασμός κερδών / ζημιών για τη διάθεση περιουσιακών στοιχείων
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Καταχωρήσεις πληρωμών
 DocType: Employee Education,Class / Percentage,Κατηγορία / Ποσοστό
 ,Electronic Invoice Register,Ηλεκτρονικό μητρώο τιμολογίων
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Ο αριθμός εμφάνισης μετά τον οποίο εκτελείται η συνέπεια.
 DocType: Sales Invoice,Is Return (Credit Note),Επιστροφή (Πιστωτική Σημείωση)
+DocType: Price List,Price Not UOM Dependent,Τιμή δεν εξαρτάται από UOM
 DocType: Lab Test Sample,Lab Test Sample,Δοκιμαστικό δείγμα εργαστηρίου
 DocType: Shopify Settings,status html,κατάσταση html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Για παράδειγμα 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Καθαρές αποδοχές
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Συνολικό τιμολογημένο ποσό
 DocType: Clinical Procedure,Consumables Invoice Separately,Αναλώσιμα Τιμολόγιο Ξεχωριστά
+DocType: Shift Type,Working Hours Threshold for Absent,Όριο ωρών εργασίας για απουσία
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να ανατεθεί έναντι του λογαριασμού ομάδας {0}
 DocType: Purchase Receipt Item,Rate and Amount,Ποσοστό και Ποσό
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Out Ρυθμίσεις ασθενούς
 DocType: Asset,Insurance End Date,Ημερομηνία λήξης ασφάλισης
 DocType: Bank Account,Branch Code,Κωδικός υποκαταστήματος
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Ώρα να απαντήσω
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Φόρουμ χρηστών
 DocType: Landed Cost Item,Landed Cost Item,Στοιχείο Landed Cost
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Ο πωλητής και ο αγοραστής δεν μπορούν να είναι οι ίδιοι
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,ΜΕΤΑΦΟΡΑ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Στοιχείο αναζήτησης (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Αποτέλεσμα υποβολής
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,"Από την ημερομηνία δεν μπορεί να είναι μεγαλύτερη από ό, τι από Μέχρι σήμερα"
 DocType: Supplier,Supplier of Goods or Services.,Προμηθευτής αγαθών ή υπηρεσιών.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Όνομα νέου λογαριασμού. Σημείωση: Μην δημιουργείτε λογαριασμούς για πελάτες και προμηθευτές
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Το πρόγραμμα σπουδών ή το πρόγραμμα σπουδών είναι υποχρεωτικό
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Όνομα δεξιοτήτων
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Εκτύπωση καρτών αναφοράς
 DocType: Soil Texture,Ternary Plot,Τρισδιάστατο οικόπεδο
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Υποστήριξη εισιτηρίων
 DocType: Asset Category Account,Fixed Asset Account,Λογαριασμός Σταθερού Ενεργητικού
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Αργότερο
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Υποχρεωτικό για ισολογισμό
 DocType: Payment Entry,Total Allocated Amount,Συνολικό κατανεμόμενο ποσό
 DocType: Sales Invoice,Get Advances Received,Λάβετε προπληρωμές
+DocType: Shift Type,Last Sync of Checkin,Τελευταίο συγχρονισμό του Checkin
 DocType: Student,B-,ΣΙ-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Το ποσό του ποσού ΦΠΑ περιλαμβάνεται στην αξία
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Ομάδα αίματος
 apps/erpnext/erpnext/config/healthcare.py,Masters,Δάσκαλοι
 DocType: Crop,Crop Spacing UOM,Διευκόλυνση διαχωρισμού UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Ο χρόνος μετά την ώρα έναρξης της αλλαγής ταχυτήτων, όταν ο check-in θεωρείται καθυστερημένος (σε λεπτά)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Εξερευνώ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Δεν βρέθηκαν εκκρεμή τιμολόγια
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",Οι {0} κενές θέσεις και ο {1} προϋπολογισμός για {2} έχουν ήδη προγραμματιστεί για θυγατρικές εταιρείες {3}. \ Μπορείτε να προγραμματίσετε μόνο για {4} κενές θέσεις και προϋπολογισμό {5} σύμφωνα με το σχέδιο προσωπικού {6} για τη μητρική εταιρεία {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Φύλλα έκπτωσης προϊόντων
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Κινητό μέσο
 DocType: Employee Attendance Tool,Unmarked Attendance,Μη επισημασμένη συμμετοχή
 DocType: Homepage Section,Number of Columns,Αριθμός στηλών
+DocType: Issue Priority,Issue Priority,Προτεραιότητα έκδοσης
 DocType: Holiday List,Add Weekly Holidays,Προσθέστε Εβδομαδιαίες Διακοπές
 DocType: Shopify Log,Shopify Log,Κατάστημα καταγραφής
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Δημιουργία Υπολογισμού μισθοδοσίας
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Δεν είναι δυνατή η δημιουργία μπόνους διατήρησης για τους αριστερούς υπαλλήλους
+DocType: Employee Checkin,Location / Device ID,Αναγνωριστικό τοποθεσίας / συσκευής
 DocType: Purchase Order,To Receive,Να λάβω
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα μπορείτε να φορτώσετε ξανά μέχρι να έχετε δίκτυο.
 DocType: Course Activity,Enrollment,Εγγραφή
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Στοιχεία ηλεκτρονικής τιμολόγησης που λείπουν
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Δεν δημιουργήθηκε κανένα υλικό υλικό
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Loan,Total Amount Paid,Συνολικό ποσό που καταβλήθηκε
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Όλα αυτά τα στοιχεία έχουν ήδη τιμολογηθεί
 DocType: Training Event,Trainer Name,Όνομα εκπαιδευτή
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Παρακαλείστε να αναφέρετε το ονοματεπώνυμο Lead {0}
 DocType: Employee,You can enter any date manually,Μπορείτε να καταχωρίσετε οποιαδήποτε ημερομηνία χειροκίνητα
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Στοιχείο συμφωνίας συμφερόντων
+DocType: Shift Type,Early Exit Consequence,Πρόωρη Εξόδου
 DocType: Item Group,General Settings,Γενικές Ρυθμίσεις
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία αποστολής / προμηθευτή τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Καταχωρίστε το όνομα του Δικαιούχου πριν από την υποβολή.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Επιβεβαίωση πληρωμής
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Καταργήστε αυτό το τιμολόγιο {0} από τη φόρμα C {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Κάθε έγκυρο check-in και check-out
 DocType: Support Search Source,Query Route String,Αναζήτηση συμβολοσειράς διαδρομής
 DocType: Customer Feedback Template,Customer Feedback Template,Πρότυπο σχολίων πελατών
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Προσφορές σε πελάτες ή πελάτες.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 ,Daily Work Summary Replies,Ημερήσια σύνοψη εργασιών Απαντήσεις
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστείτε στο έργο: {0}
+DocType: Issue,Response By Variance,Απάντηση με Απόκλιση
 DocType: Item,Sales Details,Λεπτομέρειες πωλήσεων
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Κεφαλίδες επιστολών για πρότυπα εκτύπωσης.
 DocType: Salary Detail,Tax on additional salary,Φόρος επί του πρόσθετου μισθού
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Πρόοδος εργασιών
 DocType: Journal Entry,Opening Entry,Άνοιγμα εγγραφής
 DocType: Bank Guarantee,Charges Incurred,Οι χρεώσεις προέκυψαν
+DocType: Shift Type,Working Hours Calculation Based On,Υπολογισμός Ώρας Λειτουργίας με βάση
 DocType: Work Order,Material Transferred for Manufacturing,Μεταφερόμενο υλικό για μεταποίηση
 DocType: Products Settings,Hide Variants,Απόκρυψη παραλλαγών
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Απενεργοποιήστε τον προγραμματισμό χωρητικότητας και την παρακολούθηση χρόνου
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,Τα ενδιαφέροντα
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Καταναλωμένη ποσότητα
 DocType: Education Settings,Education Manager,Διευθυντής Εκπαίδευσης
+DocType: Employee Checkin,Shift Actual Start,Μετακίνηση πραγματικής εκκίνησης
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Προγραμματίστε τα αρχεία χρόνου εκτός των ωρών εργασίας του σταθμού εργασίας.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Πόντοι πίστης: {0}
 DocType: Healthcare Settings,Registration Message,Μήνυμα εγγραφής
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Τα τιμολόγια που έχουν ήδη δημιουργηθεί για όλες τις ώρες χρέωσης
 DocType: Sales Partner,Contact Desc,Επικοινωνία Desc
 DocType: Purchase Invoice,Pricing Rules,Κανόνες τιμολόγησης
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν υπάρχουσες συναλλαγές έναντι του στοιχείου {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
 DocType: Hub Tracked Item,Image List,Λίστα εικόνων
 DocType: Item Variant Settings,Allow Rename Attribute Value,Επιτρέψτε τη μετονομασία της τιμής του χαρακτηριστικού
-DocType: Price List,Price Not UOM Dependant,Τιμή δεν εξαρτάται από UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Χρόνος (σε λεπτά)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Βασικός
 DocType: Loan,Interest Income Account,Λογαριασμός Εισοδήματος Τόκων
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Επιλέξτε POS Profile
 DocType: Support Settings,Get Latest Query,Λάβετε το τελευταίο ερώτημα
 DocType: Employee Incentive,Employee Incentive,Κίνητρο εργαζομένων
+DocType: Service Level,Priorities,Προτεραιότητες
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Προσθέστε κάρτες ή προσαρμοσμένες ενότητες στην αρχική σελίδα
 DocType: Homepage,Hero Section Based On,Τμήμα ήρωας βασισμένο σε
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό κόστος αγοράς (μέσω τιμολογίου αγοράς)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Παραγγελθείσα ποσότητα
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Η απόρριψη αποθήκης είναι υποχρεωτική έναντι του απορριφθέντος στοιχείου {1}
 ,Received Items To Be Billed,Τα ληφθέντα στοιχεία που χρεώνονται
-DocType: Salary Slip Timesheet,Working Hours,Ωρες εργασίας
+DocType: Attendance,Working Hours,Ωρες εργασίας
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Τρόπος πληρωμής
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Στοιχεία παραγγελίας που δεν έχουν ληφθεί εγκαίρως
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Διάρκεια σε ημέρες
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Κανονιστικές πληροφορίες και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
 DocType: Item Default,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πώλησης
 DocType: Sales Partner,Address & Contacts,Διεύθυνση &amp; Επαφές
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 DocType: Subscriber,Subscriber,Συνδρομητής
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Φόρμα / Θέμα / {0}) είναι εκτός αποθέματος
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Παρακαλούμε επιλέξτε Ημερομηνία πρώτης δημοσίευσης
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,Δημιουργήθηκαν εργασίες
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Το προεπιλεγμένο BOM ({0}) πρέπει να είναι ενεργό για αυτό το στοιχείο ή το πρότυπο του
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Επιτροπή Ποσοστό%
-DocType: Service Level,Response Time,Χρόνος απόκρισης
+DocType: Service Level Priority,Response Time,Χρόνος απόκρισης
 DocType: Woocommerce Settings,Woocommerce Settings,Ρυθμίσεις Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Η ποσότητα πρέπει να είναι θετική
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Χαρτογράφηση δεδομένων συναλλαγών
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Ο μόλυβδος απαιτεί το όνομα ενός ατόμου ή το όνομα ενός οργανισμού
 DocType: Student,Guardians,Κηδεμόνες
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Επιλογή Μάρκα ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Μεσαιο εισοδημα
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός βασισμένος σε
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Η εγγραφή συμμετοχής {0} υπάρχει εναντίον του Student {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Ημερομηνία συναλλαγής
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Ακύρωση συνδρομής
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Δεν ήταν δυνατή η ρύθμιση της συμφωνίας επιπέδου υπηρεσιών {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Καθαρό ποσό μισθού
 DocType: Account,Liability,Ευθύνη
 DocType: Employee,Bank A/C No.,Τράπεζα A / C Αρ.
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Το τιμολόγιο αγοράς {0} έχει ήδη υποβληθεί
 DocType: Fees,Student Email,Φοιτητικό ηλεκτρονικό ταχυδρομείο
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Επαναλήψεις BOM: {0} δεν μπορεί να είναι γονέας ή παιδί {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Λάβετε στοιχεία από Υπηρεσίες Υγείας
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Η καταχώρηση αποθεμάτων {0} δεν έχει υποβληθεί
 DocType: Item Attribute Value,Item Attribute Value,Τιμή ιδιότητας στοιχείου
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,Επιλέξτε τα στοιχεία που θα κατασκευαστούν
 DocType: Leave Application,Leave Approver Name,Αφήστε το όνομα του χρήστη
 DocType: Shareholder,Shareholder,Μέτοχος
-DocType: Issue,Agreement Status,Κατάσταση Συμφωνίας
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Προεπιλεγμένες ρυθμίσεις για την πώληση συναλλαγών.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Επιλέξτε φοιτητική εισαγωγή, η οποία είναι υποχρεωτική για τον αιτηθέντα φοιτητή"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Επιλέξτε BOM
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,Λογαριασμός Εισοδήματος
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Όλες οι Αποθήκες
 DocType: Contract,Signee Details,Signee Λεπτομέρειες
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Επιτρέψτε το check out μετά τη λήξη της μετατόπισης (σε λεπτά)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Προμήθεια
 DocType: Item Group,Check this if you want to show in website,Ελέγξτε αν θέλετε να εμφανίζεται στον ιστότοπο
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Το οικονομικό έτος {0} δεν βρέθηκε
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,Ποσοστό χρέωσης
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Προειδοποίηση: Υπάρχει άλλη {0} # {1} κατά της εισαγωγής στο απόθεμα {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Ενεργοποιήστε τις Ρυθμίσεις του Google Maps για να εκτιμήσετε και να βελτιστοποιήσετε τις διαδρομές
+DocType: Purchase Invoice Item,Page Break,Διάλειμμα σελίδας
 DocType: Supplier Scorecard Criteria,Max Score,Μέγιστη βαθμολογία
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Η Ημερομηνία έναρξης αποπληρωμής δεν μπορεί να γίνει πριν από την Ημερομηνία Εκταμίευσης.
 DocType: Support Search Source,Support Search Source,Υποστήριξη πηγής αναζήτησης
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,Μεταφορά εργαζομένων
 ,Sales Funnel,Χωνί πωλήσεων
 DocType: Agriculture Analysis Criteria,Water Analysis,Ανάλυση Νερού
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Ξεκινήστε το check-in πριν από την ώρα έναρξης της αλλαγής ταχυτήτων (σε λεπτά)
 DocType: Accounts Settings,Accounts Frozen Upto,Λογαριασμοί Κατεψυγμένο μέχρι
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Δεν υπάρχει τίποτα για επεξεργασία.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} μεγαλύτερη από οποιαδήποτε διαθέσιμη ώρα εργασίας στο σταθμό εργασίας {1}, καταργήστε τη λειτουργία σε πολλαπλές λειτουργίες"
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Η εντολή πωλήσεων {0} είναι {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Καθυστέρηση πληρωμής (Ημέρες)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Καταχωρίστε τις λεπτομέρειες απόσβεσης
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO πελάτη
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Η αναμενόμενη ημερομηνία παράδοσης πρέπει να είναι μετά την ημερομηνία παραγγελίας
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Η ποσότητα του στοιχείου δεν μπορεί να είναι μηδέν
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Μη έγκυρο χαρακτηριστικό
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Παρακαλούμε επιλέξτε BOM έναντι στοιχείου {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Τύπος τιμολογίου
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,Απόγευμα
 DocType: Vital Signs,Nutrition Values,Τιμές Διατροφής
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Παρουσία πυρετού (θερμοκρασία&gt; 38,5 ° C / 101,3 ° F ή διατηρούμενη θερμοκρασία&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Αντιστροφή
 DocType: Project,Collect Progress,Συλλέξτε την πρόοδο
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Ενέργεια
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,Στοιχεία που παραγγέλλονται για χρέωση
 DocType: Taxable Salary Slab,To Amount,Στο ποσό
 DocType: Purchase Invoice,Is Return (Debit Note),Επιστροφή (χρεωστική σημείωση)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Ξεκινώντας
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Συγχώνευση
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Δεν είναι δυνατή η αλλαγή της Ημερομηνίας Έναρξης Φορολογικού Έτους και της Ημερομηνία Λήξης του Φορολογικού Έτους μόλις αποθηκευτεί το Φορολογικό Έτος.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Η ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για τον σειριακό αριθμό {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Γραμμή {0}: Η συναλλαγματική ισοτιμία είναι υποχρεωτική
 DocType: Purchase Invoice,Select Supplier Address,Επιλέξτε διεύθυνση προμηθευτή
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Η διαθέσιμη ποσότητα είναι {0}, χρειάζεστε {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Εισαγάγετε το μυστικό του καταναλωτή API
 DocType: Program Enrollment Fee,Program Enrollment Fee,Πρόγραμμα εγγραφής στο πρόγραμμα
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,Ημερομηνία λήξης της εγγύησης
 DocType: Hotel Room Pricing,Hotel Room Pricing,Τιμολόγηση δωματίου στο ξενοδοχείο
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Φορολογητέες προμήθειες (εκτός μηδενικού, μηδενικού και απαλλασσομένου)"
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,Ανάγνωση 5
 DocType: Shopping Cart Settings,Display Settings,Ρυθμίσεις οθόνης
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Ορίστε τον αριθμό των αποσβέσεων που έχετε κρατήσει
+DocType: Shift Type,Consequence after,Συνέπεια μετά
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Σε τι χρειάζεσαι βοήθεια?
 DocType: Journal Entry,Printing Settings,Ρυθμίσεις εκτύπωσης
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ΤΡΑΠΕΖΙΚΕΣ ΕΡΓΑΣΙΕΣ
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Η διεύθυνση χρέωσης είναι ίδια με τη διεύθυνση αποστολής
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Leave Policy,Αφήστε την πολιτική
+DocType: Shift Type,Consequence,Συνέπεια
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Διεύθυνση σπουδαστών
 DocType: GST Account,CESS Account,Λογαριασμός CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Απαιτείται το Κέντρο κόστους για λογαριασμό &quot;Κέρδη και απώλειες&quot; {2}. Ορίστε ένα προεπιλεγμένο Κέντρο κόστους για την Εταιρεία.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Κουπόνι κλεισίματος περιόδου
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Όνομα Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Εισαγάγετε Λογαριασμό Εξόδων
+DocType: Issue,Resolution By Variance,Ψήφισμα Με Απόκλιση
 DocType: Employee,Resignation Letter Date,Ημερομηνία επιστολής παραίτησης
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Συμμετοχή στην ημερομηνία
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Προβολή τώρα
 DocType: Item Price,Valid Upto,Ισχύει μέχρι
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Το Doctype αναφοράς πρέπει να είναι ένα από τα {0}
+DocType: Employee Checkin,Skip Auto Attendance,Παράλειψη αυτόματης παρακολούθησης
 DocType: Payment Request,Transaction Currency,Νόμισμα συναλλαγής
 DocType: Loan,Repayment Schedule,Πρόγραμμα αποπληρωμής
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Δημιουργία καταχώρησης παρακαταθήκης δείγματος
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Φόροι από το κουπόνι κλεισίματος POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Ενέργεια Αρχικοποιήθηκε
 DocType: POS Profile,Applicable for Users,Ισχύει για χρήστες
+,Delayed Order Report,Αναφορά καθυστερημένης παραγγελίας
 DocType: Training Event,Exam,Εξέταση
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Εμφανίστηκε εσφαλμένος αριθμός εγγραφών γενικής εφημερίδας. Μπορεί να έχετε επιλέξει λάθος λογαριασμό στη συναλλαγή.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Πωλήσεις αγωγών
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Οι συνθήκες θα εφαρμοστούν σε όλα τα επιλεγμένα στοιχεία μαζί.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Διαμορφώστε
 DocType: Hotel Room,Capacity,Χωρητικότητα
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Η παρτίδα {0} του στοιχείου {1} είναι απενεργοποιημένη.
 DocType: Hotel Room Reservation,Hotel Reservation User,Χρήστης κράτησης ξενοδοχείων
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Η εργάσιμη μέρα έχει επαναληφθεί δύο φορές
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Συμφωνία επιπέδου υπηρεσίας με τον τύπο οντότητας {0} και την οντότητα {1} υπάρχει ήδη.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Ομάδα στοιχείων που δεν αναφέρεται στην κύρια μονάδα στοιχείου για το στοιχείο {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Σφάλμα ονόματος: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Το έδαφος απαιτείται στο POS Profile
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,Ημερομηνία προγραμματισμού
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρους συσκευασίας
 DocType: Job Applicant,Job Opening,Άνοιγμα εργασίας
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Τελευταία Γνωστή Επιτυχής Συγχρονισμός Έργου Checkin. Επαναφέρετε αυτήν τη ρύθμιση μόνο εάν είστε βέβαιοι ότι όλα τα αρχεία καταγραφής συγχρονίζονται από όλες τις τοποθεσίες. Μην τροποποιείτε αυτό εάν δεν είστε σίγουροι.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Πραγματικό κόστος
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Η συνολική πρόοδος ({0}) έναντι της Παραγγελίας {1} δεν μπορεί να είναι μεγαλύτερη από το συνολικό ποσό ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Οι παραλλαγές στοιχείων ενημερώθηκαν
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Λάβετε Τιμωρίες
 DocType: Tally Migration,Is Day Book Data Imported,Εισάγονται δεδομένα βιβλίου ημέρας
 ,Sales Partners Commission,Επιτροπή Συνεργατών Πωλήσεων
+DocType: Shift Type,Enable Different Consequence for Early Exit,Ενεργοποιήστε διαφορετικές συνέπειες για την έγκαιρη έξοδο
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Νομικός
 DocType: Loan Application,Required by Date,Απαιτείται από την ημερομηνία
 DocType: Quiz Result,Quiz Result,Quiz Αποτέλεσμα
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Η προαιρετική Λίστα διακοπών δεν έχει οριστεί για περίοδο άδειας {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Ορίστε το πεδίο User ID σε μια εγγραφή υπαλλήλου για να ορίσετε τον ρόλο του υπαλλήλου
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Ώρα για επίλυση
 DocType: Training Event,Training Event,Εκπαιδευτικό συμβάν
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Η φυσιολογική πίεση αίματος σε έναν ενήλικα είναι περίπου 120 mmHg συστολική και 80 mmHg διαστολική, συντομογραφία &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Το σύστημα θα ανακτήσει όλες τις καταχωρήσεις εάν η οριακή τιμή είναι μηδενική.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,Εγκρίθηκε
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Από την ημερομηνία θα πρέπει να είναι εντός του Φορολογικού Έτους. Υποθέτοντας από την ημερομηνία = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Ορίστε την ομάδα προμηθευτών στις ρυθμίσεις αγοράς.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} είναι άκυρη Κατάσταση Συμμετοχής.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Προσωρινός λογαριασμός έναρξης
 DocType: Purchase Invoice,Cash/Bank Account,Λογαριασμός μετρητών / τραπεζών
 DocType: Quality Meeting Table,Quality Meeting Table,Πίνακας ποιότητας συναντήσεων
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Τρόφιμα, Ποτά &amp; Καπνός"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Πρόγραμμα μαθημάτων
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Στοιχείο Wise Tax Details
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Η συμμετοχή θα επισημαίνεται αυτόματα μόνο μετά από αυτή την ημερομηνία.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Προμήθειες που γίνονται στους κατόχους UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Αίτηση υποβολής προσφορών
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Το νόμισμα δεν μπορεί να αλλάξει μετά την πραγματοποίηση εγγραφών χρησιμοποιώντας κάποιο άλλο νόμισμα
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,Είναι στοιχείο από τον κεντρικό υπολογιστή
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Διαδικασία ποιότητας.
 DocType: Share Balance,No of Shares,Αριθμός μετοχών
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Η ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} κατά το χρόνο απόσπασης της καταχώρισης ({2} {3})
 DocType: Quality Action,Preventive,Προληπτικός
 DocType: Support Settings,Forum URL,Διεύθυνση URL φόρουμ
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Υπάλληλος και Συμμετοχή
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Προκαθορισμένοι φόροι και χρεώσεις
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,"Αυτό βασίζεται σε συναλλαγές κατά αυτού του Προμηθευτή. Για λεπτομέρειες, δείτε την παρακάτω χρονολογική σειρά"
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Εισαγάγετε την ημερομηνία έναρξης και λήξης της συμφωνίας.
 DocType: Delivery Note Item,Against Sales Invoice,Ενάντια στο τιμολόγιο πωλήσεων
 DocType: Loyalty Point Entry,Purchase Amount,Ποσό αγοράς
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Δεν μπορεί να οριστεί ως Απώλεια ως εντολή πωλήσεων.
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,Όνομα Οργανισμού
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Ισχύει από και ισχύει για τα πεδία είναι υποχρεωτικά για το σωρευτικό
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Γραμμή # {0}: Ο αριθμός παρτίδας δεν πρέπει να είναι ίδιος με τον αριθμό {1} {2}
-DocType: Employee,Leave Details,Αφήστε τα στοιχεία
+DocType: Employee Checkin,Shift Start,Μετακίνηση εκκίνησης
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Οι συναλλαγές μετοχών πριν από το {0} είναι κατεψυγμένες
 DocType: Driver,Issuing Date,Ημερομηνία έκδοσης
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Αιτών
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Λεπτομέρειες προτύπου χαρτογράφησης ταμειακών ροών
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Προσλήψεις και κατάρτιση
 DocType: Drug Prescription,Interval UOM,Διαστήματα UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Ρυθμίσεις περιόδου χάριτος για αυτόματη συμμετοχή
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Από το νόμισμα και το νόμισμα δεν μπορεί να είναι το ίδιο
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Φαρμακευτικά προϊόντα
 DocType: Employee,HR-EMP-,HR-ΕΜΡ-
+DocType: Service Level,Support Hours,Ώρες Υποστήριξης
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} ακυρώνεται ή κλείνει
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Σειρά {0}: Η προσφορά έναντι του Πελάτη πρέπει να είναι πιστωτική
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Ομάδα με κουπόνι (Ενοποιημένο)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,Διευθυντής περιοχής
 DocType: Lab Test,Sample ID,Αναγνωριστικό δείγματος
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Το καλάθι είναι κενό
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Η συμμετοχή έχει επισημανθεί ως check-in υπαλλήλων
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Το στοιχείο {0} πρέπει να υποβληθεί
 ,Absent Student Report,Απουσία αναφοράς σπουδαστών
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Περιλαμβάνεται στο Ακαθάριστο Κέρδος
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,Χρηματοδοτούμενο ποσό
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} δεν έχει υποβληθεί, οπότε η ενέργεια δεν μπορεί να ολοκληρωθεί"
 DocType: Subscription,Trial Period End Date,Ημερομηνία λήξης της δοκιμαστικής περιόδου
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Εναλλασσόμενες καταχωρήσεις ως IN και OUT κατά την ίδια μετατόπιση
 DocType: BOM Update Tool,The new BOM after replacement,Το νέο BOM μετά την αντικατάσταση
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Σημείο 5
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Προσωρινό άνοιγμα
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Πιθανός προμηθευτής
 ,Issued Items Against Work Order,Εκδίδονται αντικείμενα κατά της εντολής εργασίας
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Δημιουργία τιμολογίου {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 DocType: Student,Joining Date,Ημερομηνία σύνδεσης
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Αιτούσα τοποθεσία
 DocType: Purchase Invoice,Against Expense Account,Λογαριασμός εξόδων
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
 ,Point of Sale,Σημείο πώλησης
 DocType: Authorization Rule,Approving User  (above authorized value),Έγκριση χρήστη (πάνω από την εγκεκριμένη τιμή)
+DocType: Service Level Agreement,Entity,Οντότητα
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Το ποσό {0} {1} μεταφέρθηκε από {2} σε {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο πρόγραμμα {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Από το Όνομα του Κόμματος
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),Σύνθεση άμμου (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Εισαγωγή δεδομένων βιβλίου ημέρας
+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
 DocType: Asset,Asset Owner Company,Εταιρεία ιδιοκτήτη περιουσιακών στοιχείων
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Το κέντρο κόστους απαιτείται για την κράτηση αίτησης εξόδου
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} έγκυρος σειριακός αριθμός για το στοιχείο {1}
@@ -3399,7 +3432,6 @@
 DocType: Asset,Asset Owner,Ιδιοκτήτης περιουσιακών στοιχείων
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Η αποθήκη είναι υποχρεωτική για το απόθεμα Στοιχείο {0} στη σειρά {1}
 DocType: Stock Entry,Total Additional Costs,Συνολικά πρόσθετα έξοδα
-DocType: Marketplace Settings,Last Sync On,Ο τελευταίος συγχρονισμός είναι ενεργοποιημένος
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Ρυθμίστε τουλάχιστον μία σειρά στον Πίνακα φόρων και χρεώσεων
 DocType: Asset Maintenance Team,Maintenance Team Name,Όνομα ομάδας συντήρησης
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Διάγραμμα Κέντρων Κόστους
@@ -3415,12 +3447,12 @@
 DocType: Job Card,WIP Warehouse,WIP Αποθήκη
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Το αναγνωριστικό χρήστη δεν έχει οριστεί για τον υπάλληλο {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Οι διαθέσιμες ποσότητες είναι {0}, χρειάζεστε {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Ο χρήστης {0} δημιουργήθηκε
 DocType: Stock Settings,Item Naming By,Ονομασία στοιχείου από
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Διέταξε
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Αυτή είναι μια ριζική ομάδα πελατών και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Το αίτημα υλικού {0} ακυρώνεται ή διακόπτεται
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Βασίζεται αυστηρά στον τύπο καταγραφής στο Έλεγχος Εργαζομένων
 DocType: Purchase Order Item Supplied,Supplied Qty,Παρεχόμενες ποσότητες
 DocType: Cash Flow Mapper,Cash Flow Mapper,Χάρτης χαρτονομισμάτων
 DocType: Soil Texture,Sand,Αμμος
@@ -3479,6 +3511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Διπλή ομάδα αντικειμένων που βρέθηκε στον πίνακα ομάδας στοιχείων
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Ετήσιος μισθός
 DocType: Supplier Scorecard,Weighting Function,Λειτουργία ζύγισης
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Σφάλμα κατά την αξιολόγηση του τύπου κριτηρίων
 ,Lab Test Report,Αναφορά δοκιμών εργαστηρίου
 DocType: BOM,With Operations,Με λειτουργίες
@@ -3492,6 +3525,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Δεν υπάρχουν διαθέσιμες επιστροφές για την καταχώριση εισερχομένων
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} είναι ανενεργός φοιτητής
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Κάντε καταχώρηση αποθέματος
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Bum recursion: {0} δεν μπορεί να είναι γονέας ή παιδί {1}
 DocType: Employee Onboarding,Activities,Δραστηριότητες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Τουλάχιστον μία αποθήκη είναι υποχρεωτική
 ,Customer Credit Balance,Πιστωτικό υπόλοιπο πελατών
@@ -3504,9 +3538,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Πολλαπλό πρόγραμμα αφοσίωσης που βρέθηκε για τον Πελάτη. Επιλέξτε μη αυτόματα.
 DocType: Patient,Medication,φαρμακευτική αγωγή
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Επιλέξτε πρόγραμμα αφοσίωσης
+DocType: Employee Checkin,Attendance Marked,Συμμετοχή Επισημαίνεται
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Πρώτες ύλες
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Παρακαλείστε να ορίσετε την τιμή δωματίου στην {{
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Επιλέξτε μόνο μία προτεραιότητα ως προεπιλογή.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Προσδιορίστε / δημιουργήστε λογαριασμό (Ledger) για τον τύπο - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Το συνολικό ποσό πίστωσης / χρέωσης θα πρέπει να είναι ίδιο με το συνδεδεμένο εισερχόμενο ημερολογίου
 DocType: Purchase Invoice Item,Is Fixed Asset,Είναι πάγια περιουσιακά στοιχεία
@@ -3527,6 +3563,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Επιβεβαίωση συνάντησης
 DocType: Shopping Cart Settings,Orders,Παραγγελίες
 DocType: HR Settings,Retirement Age,Ηλικία συνταξιοδότησης
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,Προβλεπόμενος αριθμός
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Η διαγραφή δεν επιτρέπεται για τη χώρα {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Το στοιχείο {1} είναι ήδη {2}
@@ -3610,11 +3647,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Λογιστής
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Το κουπόνι έκλειψης POS alreday υπάρχει για {0} μεταξύ ημερομηνίας {1} και {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Πλοήγηση
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Δεν υπάρχουν εκκρεμή τιμολόγια που απαιτούν αναπροσαρμογή της ισοτιμίας
 DocType: Authorization Rule,Customer / Item Name,Όνομα πελάτη / στοιχείου
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ο νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να οριστεί με την καταχώρηση στο Χρηματιστήριο ή την Παραλαβή Αγοράς
 DocType: Issue,Via Customer Portal,Μέσω της πύλης πελατών
 DocType: Work Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} είναι {2}
+DocType: Service Level Priority,Service Level Priority,Προτεραιότητα επιπέδου υπηρεσιών
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ο αριθμός των αποσβέσεων που κρατήθηκαν δεν μπορεί να είναι μεγαλύτερος από τον συνολικό αριθμό των αποσβέσεων
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Λογαριασμός μετοχών
 DocType: Journal Entry,Accounts Payable,Πληρωτέοι λογαριασμοί
@@ -3725,7 +3764,6 @@
 DocType: Delivery Note,Delivery To,Παράδοση σε
 DocType: Bank Statement Transaction Settings Item,Bank Data,Στοιχεία τράπεζας
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Προγραμματισμένη μέχρι
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Διατηρήστε τις ώρες χρέωσης και τις ώρες εργασίας ίδιες με το φύλλο εργασίας
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Το κομμάτι οδηγεί από την κύρια πηγή.
 DocType: Clinical Procedure,Nursing User,Χρήστης νοσηλευτικής
 DocType: Support Settings,Response Key List,Λίστα κλειδιών απάντησης
@@ -3893,6 +3931,7 @@
 DocType: Work Order Operation,Actual Start Time,Πραγματικός χρόνος έναρξης
 DocType: Antibiotic,Laboratory User,Εργαστηριακός χρήστης
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online δημοπρασίες
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Η προτεραιότητα {0} έχει επαναληφθεί.
 DocType: Fee Schedule,Fee Creation Status,Κατάσταση δημιουργίας τέλους
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Λογισμικά
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Εντολή πωλήσεων προς πληρωμή
@@ -3959,6 +3998,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Δεν ήταν δυνατή η ανάκτηση πληροφοριών για το {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Το νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα της προεπιλεγμένης εταιρείας ή το νόμισμα του λογαριασμού μέρους
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Εισαγάγετε το αναγνωριστικό υπαλλήλου αυτού του πωλητή
+DocType: Shift Type,Early Exit Consequence after,Πρόωρη έξοδος μετά από
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Δημιουργία αρχικών τιμολογίων πωλήσεων και αγορών
 DocType: Disease,Treatment Period,Περίοδος θεραπείας
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Ρύθμιση ηλεκτρονικού ταχυδρομείου
@@ -3976,7 +4016,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Ονομα μαθητή:
 DocType: SMS Log,Sent On,Στάλθηκε στις
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Τιμολόγιο πωλήσεων
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Ο χρόνος απόκρισης δεν μπορεί να είναι μεγαλύτερος από τον Χρόνο ανάλυσης
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Για την Ομάδα μαθητών με βάση τα μαθήματα, το μάθημα θα επικυρωθεί για κάθε φοιτητή από τα εγγεγραμμένα μαθήματα στην εγγραφή του προγράμματος."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Ενδοκράτους
 DocType: Employee,Create User Permission,Δημιουργία άδειας χρήστη
@@ -4015,6 +4054,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Τυποποιημένοι συμβατικοί όροι για πωλήσεις ή αγορές.
 DocType: Sales Invoice,Customer PO Details,Στοιχεία PO Πελατών
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Ο ασθενής δεν βρέθηκε
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Επιλέξτε μια προεπιλεγμένη προτεραιότητα.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Κατάργηση στοιχείου εάν δεν ισχύουν χρεώσεις σε αυτό το στοιχείο
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Μια ομάδα πελατών υπάρχει με το ίδιο όνομα, αλλάξτε το όνομα του πελάτη ή μετονομάστε την ομάδα πελατών"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4054,6 +4094,7 @@
 DocType: Support Settings,Support Portal,Υποστήριξη πύλης
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Η ημερομηνία λήξης της εργασίας <b>{0}</b> δεν μπορεί να είναι μικρότερη από την <b>{1}</b> αναμενόμενη ημερομηνία έναρξης <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Ο υπάλληλος {0} είναι ανοιχτός στο {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Αυτή η συμφωνία επιπέδου υπηρεσιών είναι συγκεκριμένη για τον πελάτη {0}
 DocType: Employee,Held On,Που πραγματοποιήθηκε στις
 DocType: Healthcare Practitioner,Practitioner Schedules,Πρόγραμμα πρακτικής
 DocType: Project Template Task,Begin On (Days),Έναρξη στις (ημέρες)
@@ -4061,6 +4102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Η εντολή εργασίας ήταν {0}
 DocType: Inpatient Record,Admission Schedule Date,Ημερομηνία προγραμματισμού εισδοχής
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Προσαρμογή αξίας περιουσιακού στοιχείου
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Σημειώστε συμμετοχή με βάση το &#39;Έλεγχος Εργαζομένων&#39; για Εργαζόμενους που έχουν ανατεθεί σε αυτή τη βάρδια.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Προμήθειες που καταβάλλονται σε μη εγγεγραμμένα άτομα
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Όλες οι εργασίες
 DocType: Appointment Type,Appointment Type,Τύπος συνάντησης
@@ -4174,7 +4216,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το συνολικό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (για εκτύπωση)
 DocType: Plant Analysis,Laboratory Testing Datetime,Εργαστηριακός έλεγχος
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Το στοιχείο {0} δεν μπορεί να έχει Παρτίδα
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Πωλήσεις αγωγών ανά στάδιο
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Δύναμη ομάδας σπουδαστών
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Καταχώρηση συναλλαγής τραπεζικής δήλωσης
 DocType: Purchase Order,Get Items from Open Material Requests,Λάβετε στοιχεία από ανοιχτά αιτήματα υλικού
@@ -4256,7 +4297,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Εμφάνιση Γήρανση αποθήκη
 DocType: Sales Invoice,Write Off Outstanding Amount,Αποσβέση του εξερχόμενου ποσού
 DocType: Payroll Entry,Employee Details,Λεπτομέρειες εργαζομένων
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Η ώρα έναρξης δεν μπορεί να είναι μεγαλύτερη από την ώρα λήξης για {0}.
 DocType: Pricing Rule,Discount Amount,Ποσό έκπτωσης
 DocType: Healthcare Service Unit Type,Item Details,Στοιχεία στοιχείου
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Διπλή Δήλωση Φορολογίας {0} για την περίοδο {1}
@@ -4309,7 +4349,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Η καθαρή αμοιβή δεν μπορεί να είναι αρνητική
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Αριθ. Αλληλεπιδράσεων
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Η σειρά {0} # Στοιχείο {1} δεν μπορεί να μεταφερθεί περισσότερο από {2} έναντι εντολής αγοράς {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Βάρδια
+DocType: Attendance,Shift,Βάρδια
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Επεξεργασία Λογαριασμών και Συμβαλλόμενων Μερών
 DocType: Stock Settings,Convert Item Description to Clean HTML,Μετατρέψτε την περιγραφή στοιχείου για να καθαρίσετε το HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Όλες οι ομάδες προμηθευτών
@@ -4380,6 +4420,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Μονάδα μητρικής υπηρεσίας
 DocType: Sales Invoice,Include Payment (POS),Συμπεριλάβετε Πληρωμή (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Ιδιωτικό Equity
+DocType: Shift Type,First Check-in and Last Check-out,Πρώτο check-in και τελευταίο check-out
 DocType: Landed Cost Item,Receipt Document,Έγγραφο παραλαβής
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Περίοδος Scorecard Προμηθευτή
 DocType: Employee Grade,Default Salary Structure,Προκαθορισμένη δομή μισθοδοσίας
@@ -4462,6 +4503,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Δημιουργία εντολής αγοράς
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Ορίστε τον προϋπολογισμό για ένα οικονομικό έτος.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Ο πίνακας λογαριασμών δεν μπορεί να είναι κενός.
+DocType: Employee Checkin,Entry Grace Period Consequence,Εισαγωγή περίοδος χάριτος συνέπεια
 ,Payment Period Based On Invoice Date,Περίοδος πληρωμής με βάση την ημερομηνία του τιμολογίου
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Η ημερομηνία εγκατάστασης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για το στοιχείο {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Σύνδεσμος προς την αίτηση υλικού
@@ -4470,6 +4512,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Σειρά {0}: Υπάρχει ήδη μια καταχώρηση αναδιάταξης για αυτήν την αποθήκη {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Ημερομηνία εγγράφου
 DocType: Monthly Distribution,Distribution Name,Όνομα διανομής
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Η εργασία {0} επαναλήφθηκε.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Ομάδα προς μη ομάδα
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Αναβάθμιση σε εξέλιξη. Μπορεί να πάρει λίγο χρόνο.
 DocType: Item,"Example: ABCD.#####
@@ -4482,6 +4525,7 @@
 DocType: Vehicle Log,Fuel Qty,Ποσότητα καυσίμου
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Εκταμιεύτηκε
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Ώρα μετά το τέλος της βάρδιας κατά την οποία το check-out θεωρείται για συμμετοχή.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Καθαρή μεταβολή στους πληρωτέους λογαριασμούς
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Μη διαθέσιμος
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Μερικής απασχόλησης
@@ -4495,7 +4539,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Εμφάνιση του PDC στην εκτύπωση
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Εξαγορά προμηθευτή
 DocType: POS Profile User,POS Profile User,Χρήστης προφίλ POS
-DocType: Student,Middle Name,Μεσαίο όνομα
 DocType: Sales Person,Sales Person Name,Όνομα ατόμου πωλήσεων
 DocType: Packing Slip,Gross Weight,Μεικτό βάρος
 DocType: Journal Entry,Bill No,Αριθ. Λογαριασμού
@@ -4504,7 +4547,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Συμφωνία σε επίπεδο υπηρεσιών
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Επιλέξτε πρώτα τον υπάλληλο και την ημερομηνία
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Ο συντελεστής αποτίμησης του στοιχείου υπολογίζεται εκ νέου λαμβάνοντας υπόψη το ποσό του κουπονιού κόστους εκφόρτωσης
 DocType: Timesheet,Employee Detail,Λεπτομέρειες εργαζομένων
 DocType: Tally Migration,Vouchers,Κουπόνια
@@ -4539,7 +4581,7 @@
 DocType: Additional Salary,Date on which this component is applied,Ημερομηνία κατά την οποία εφαρμόζεται αυτό το στοιχείο
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Κατάλογος διαθέσιμων Μετόχων με αριθμούς folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Δημιουργία λογαριασμών πύλης.
-DocType: Service Level,Response Time Period,Περίοδος απόκρισης
+DocType: Service Level Priority,Response Time Period,Περίοδος απόκρισης
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι αγοράς και χρεώσεις
 DocType: Course Activity,Activity Date,Ημερομηνία δραστηριότητας
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
@@ -4564,6 +4606,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Οικονομικό έτος
 DocType: Sales Invoice Item,Deferred Revenue,Αναβαλλόμενα έσοδα
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις πωλήσεις ή την αγορά
+DocType: Shift Type,Working Hours Threshold for Half Day,Όριο ωρών εργασίας για μισή μέρα
 ,Item-wise Purchase History,Ιστορικό αγορών βάσει στοιχείων
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Δεν είναι δυνατή η αλλαγή της ημερομηνίας λήξης υπηρεσίας για στοιχείο στη σειρά {0}
 DocType: Production Plan,Include Subcontracted Items,Συμπεριλάβετε αντικείμενα με υπεργολαβία
@@ -4596,6 +4639,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Επιτρέψτε στο ίδιο στοιχείο πολλαπλούς χρόνους
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Δημιουργία BOM
 DocType: Healthcare Practitioner,Charges,Ταρίφα
+DocType: Employee,Attendance and Leave Details,Συμμετοχή και Αφήστε τις λεπτομέρειες
 DocType: Student,Personal Details,Προσωπικές λεπτομέρειες
 DocType: Sales Order,Billing and Delivery Status,Κατάσταση χρέωσης και παράδοσης
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Σειρά {0}: Για τον προμηθευτή {0} διεύθυνση ηλεκτρονικού ταχυδρομείου απαιτείται για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου
@@ -4647,7 +4691,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Εισαγάγετε αξία μεταξύ {0} και {1}
 DocType: Purchase Order,Order Confirmation Date,Ημερομηνία επιβεβαίωσης παραγγελίας
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Υπολογίστε τους εκτιμώμενους χρόνους άφιξης
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Καταναλώσιμος
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Ημερομηνία Έναρξης Συνδρομής
@@ -4670,7 +4713,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Λογαριασμός εισόδου στο ημερολόγιο
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Παραλαγή
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Δραστηριότητα Forum
-DocType: Service Level,Resolution Time Period,Χρονική περίοδος ανάλυσης
+DocType: Service Level Priority,Resolution Time Period,Χρονική περίοδος ανάλυσης
 DocType: Request for Quotation,Supplier Detail,Λεπτομέρεια προμηθευτή
 DocType: Project Task,View Task,Προβολή εργασίας
 DocType: Serial No,Purchase / Manufacture Details,Λεπτομέρειες αγοράς / κατασκευής
@@ -4737,6 +4780,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Η αποθήκη μπορεί να αλλάξει μόνο μέσω του Παραστατικού Εισαγωγής / Παραλαβής / Παραλαβής Αγοράς
 DocType: Support Settings,Close Issue After Days,Κλείσιμο τεύχος μετά από ημέρες
 DocType: Payment Schedule,Payment Schedule,ΠΡΟΓΡΑΜΜΑ ΠΛΗΡΩΜΩΝ
+DocType: Shift Type,Enable Entry Grace Period,Ενεργοποίηση περιόδου χάριτος εισόδου
 DocType: Patient Relation,Spouse,Σύζυγος
 DocType: Purchase Invoice,Reason For Putting On Hold,Λόγος για την αναμονή
 DocType: Item Attribute,Increment,Αύξηση
@@ -4876,6 +4920,7 @@
 DocType: Vehicle Log,Invoice Ref,Τιμολόγιο Αναφ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},Η φόρμα C δεν ισχύει για το Τιμολόγιο: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Δημιουργήθηκε τιμολόγιο
+DocType: Shift Type,Early Exit Grace Period,Πρώτη περίοδος χάριτος εξόδου
 DocType: Patient Encounter,Review Details,Λεπτομέρειες αναθεώρησης
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Η τιμή των ωρών πρέπει να είναι μεγαλύτερη από μηδέν.
 DocType: Account,Account Number,Αριθμός λογαριασμού
@@ -4887,7 +4932,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Ισχύει εάν η εταιρεία είναι SpA, SApA ή SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Οι επικαλυπτόμενες συνθήκες βρέθηκαν μεταξύ:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Πληρωμή και μη παράδοση
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Ο κωδικός στοιχείου είναι υποχρεωτικός, επειδή το στοιχείο δεν αριθμείται αυτόματα"
 DocType: GST HSN Code,HSN Code,Κωδικός HSN
 DocType: GSTR 3B Report,September,Σεπτέμβριος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Εξοδα διοικητικής λειτουργίας
@@ -4923,6 +4967,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Λογαριασμός CWIP
 DocType: SMS Log,Sender Name,Ονομα αποστολέα
 DocType: Pricing Rule,Supplier Group,Ομάδα προμηθευτών
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Ρυθμίστε την ώρα έναρξης και την ώρα λήξης για \ Ημέρα υποστήριξης {0} στο ευρετήριο {1}.
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
 ,Requested Items To Be Transferred,Τα ζητούμενα στοιχεία που πρέπει να μεταφερθούν
 DocType: Employee,Contract End Date,Ημερομηνία λήξης της σύμβασης
@@ -4933,6 +4979,7 @@
 DocType: Opportunity,Sales Stage,Στάδιο πωλήσεων
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Οι λέξεις θα είναι ορατές μόλις αποθηκεύσετε την εντολή πωλήσεων.
 DocType: Item Reorder,Re-order Level,Επανατοποθετήστε το επίπεδο
+DocType: Shift Type,Enable Auto Attendance,Ενεργοποίηση αυτόματης παρακολούθησης
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Προτίμηση
 ,Department Analytics,Τμήμα Analytics
 DocType: Crop,Scientific Name,Επιστημονικό όνομα
@@ -4945,6 +4992,7 @@
 DocType: Quiz Activity,Quiz Activity,Δραστηριότητα κουίζ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,Το {0} δεν είναι σε έγκυρη περίοδο μισθοδοσίας
 DocType: Timesheet,Billed,Χρεώνεται
+apps/erpnext/erpnext/config/support.py,Issue Type.,Τύπος έκδοσης.
 DocType: Restaurant Order Entry,Last Sales Invoice,Τελευταίο τιμολόγιο πωλήσεων
 DocType: Payment Terms Template,Payment Terms,Οροι πληρωμής
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Δεσμευμένο Ποσότητα: Ποσότητα που παραγγέλθηκε για πώληση, αλλά δεν παραδόθηκε."
@@ -5040,6 +5088,7 @@
 DocType: Account,Asset,Περιουσιακό στοιχείο
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,Το {0} δεν διαθέτει Πρόγραμμα Παροχής Ιατροφαρμακευτικής περίθαλψης. Προσθέστε το στο Master of Healthcare Practitioner
 DocType: Vehicle,Chassis No,Αριθμός πλαισίου
+DocType: Employee,Default Shift,Προεπιλεγμένη μετατόπιση
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Σύντμηση εταιρείας
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Δέντρο του καταλόγου των υλικών
 DocType: Article,LMS User,Χρήστης LMS
@@ -5088,6 +5137,7 @@
 DocType: Sales Person,Parent Sales Person,Γονικό άτομο πωλήσεων
 DocType: Student Group Creation Tool,Get Courses,Πάρτε Μαθήματα
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Γραμμή # {0}: Η ποσότητα πρέπει να είναι 1, καθώς το στοιχείο είναι ένα πάγιο στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητες."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Ώρες εργασίας κάτω από τις οποίες σημειώνεται η απουσία. (Μηδέν για απενεργοποίηση)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Μόνο οι κόμβοι φύλλων επιτρέπονται στη συναλλαγή
 DocType: Grant Application,Organization,Οργάνωση
 DocType: Fee Category,Fee Category,Κατηγορία κατηγοριών
@@ -5100,6 +5150,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Ενημερώστε την κατάστασή σας για αυτό το εκπαιδευτικό γεγονός
 DocType: Volunteer,Morning,Πρωί
 DocType: Quotation Item,Quotation Item,Στοιχείο προσφοράς
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Προτεραιότητα έκδοσης.
 DocType: Journal Entry,Credit Card Entry,Εισαγωγή Πιστωτικής Κάρτας
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Η χρονική θέση ξεπεράστηκε, η υποδοχή {0} έως {1} επικαλύπτει την υπάρχουσα υποδοχή {2} έως {3}"
 DocType: Journal Entry Account,If Income or Expense,Αν εισόδημα ή δαπάνη
@@ -5150,11 +5201,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Εισαγωγή δεδομένων και ρυθμίσεις
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Εάν είναι επιλεγμένο το Auto Opt In, οι πελάτες θα συνδεθούν αυτόματα με το σχετικό Πρόγραμμα Επιβράβευσης (κατά την αποθήκευση)"
 DocType: Account,Expense Account,Λογαριασμός εξόδών
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Ο χρόνος πριν από την ώρα έναρξης της αλλαγής ταχυτήτων κατά τη διάρκεια της οποίας εξετάζεται η συμμετοχή του υπαλλήλου για συμμετοχή.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Σχέση με τον Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Δημιουργία τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Η αίτηση πληρωμής υπάρχει ήδη {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Ο υπάλληλος που ανακουφίστηκε στο {0} πρέπει να οριστεί ως &quot;αριστερά&quot;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Πληρώστε {0} {1}
+DocType: Company,Sales Settings,Ρυθμίσεις πωλήσεων
 DocType: Sales Order Item,Produced Quantity,Παραγόμενη ποσότητα
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Μπορείτε να έχετε πρόσβαση στην αίτηση για προσφορά κάνοντας κλικ στον παρακάτω σύνδεσμο
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα μηνιαίας διανομής
@@ -5233,6 +5286,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Προεπιλεγμένα πρότυπα φόρου για τις πωλήσεις και την αγορά δημιουργούνται.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Ο τύπος άδειας {0} δεν μπορεί να μεταφερθεί
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Χρεωστικός λογαριασμός πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Η ημερομηνία λήξης της συμφωνίας δεν μπορεί να είναι μικρότερη από σήμερα.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Ορίστε τον λογαριασμό στην αποθήκη {0} ή τον προεπιλεγμένο λογαριασμό αποθέματος στην εταιρεία {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Ορίσετε ως προεπιλογή
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Το καθαρό βάρος αυτού του πακέτου. (που υπολογίζεται αυτόματα ως άθροισμα του καθαρού βάρους των ειδών)
@@ -5259,8 +5313,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Έληξε παρτίδες
 DocType: Shipping Rule,Shipping Rule Type,Τύπος κανόνα αποστολής
 DocType: Job Offer,Accepted,Αποδεκτό
-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> \ για να ακυρώσετε αυτό το έγγραφο"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Έχετε ήδη αξιολογήσει τα κριτήρια αξιολόγησης {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Επιλέξτε αριθμούς παρτίδας
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Ηλικία (ημέρες)
@@ -5287,6 +5339,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Επιλέξτε τους τομείς σας
 DocType: Agriculture Task,Task Name,Ονομα εργασίας
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Καταχωρήσεις αποθέματος που έχουν ήδη δημιουργηθεί για παραγγελία εργασίας
+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> \ για να ακυρώσετε αυτό το έγγραφο"
 ,Amount to Deliver,Ποσό προς παράδοση
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Η εταιρεία {0} δεν υπάρχει
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Δεν εκκρεμούσαν αιτήσεις υλικού που βρέθηκαν να συνδέονται για τα συγκεκριμένα στοιχεία.
@@ -5336,6 +5390,7 @@
 DocType: Lab Prescription,Test Code,Κωδικός δοκιμής
 DocType: Purchase Taxes and Charges,On Previous Row Total,Στο προηγούμενο σύνολο γραμμών
 DocType: Student,Student Email Address,Διεύθυνση ηλεκτρονικού ταχυδρομείου σπουδαστών
+,Delayed Item Report,Αναφορά καθυστερημένου στοιχείου
 DocType: Academic Term,Education,Εκπαίδευση
 DocType: Supplier Quotation,Supplier Address,Διεύθυνση προμηθευτή
 DocType: Salary Detail,Do not include in total,Μην συμπεριλάβετε συνολικά
@@ -5343,7 +5398,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 DocType: Purchase Receipt Item,Rejected Quantity,Απόρριψη ποσότητας
 DocType: Cashier Closing,To TIme,Για το TIme
-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: Daily Work Summary Group User,Daily Work Summary Group User,Καθημερινός χρήστης ομάδας σύνοψης εργασίας
 DocType: Fiscal Year Company,Fiscal Year Company,Εταιρεία οικονομικών ετών
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Το εναλλακτικό στοιχείο δεν πρέπει να είναι ίδιο με τον κωδικό είδους
@@ -5395,6 +5449,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Καθυστέρηση μεταξύ των σταθμών παράδοσης
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Παγώστε τα αποθέματα παλαιότερα από [ημέρες]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Προγράμματα προώθησης προϊόντων Έκπτωση προϊόντος
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Η προτεραιότητα ζήτησης υπάρχει ήδη
 DocType: Account,Asset Received But Not Billed,Ενεργητικό που λαμβάνεται αλλά δεν χρεώνεται
 DocType: POS Closing Voucher,Total Collected Amount,Συνολικό ποσό που έχει συγκεντρωθεί
 DocType: Course,Default Grading Scale,Προεπιλεγμένη κλίμακα ταξινόμησης
@@ -5437,6 +5492,7 @@
 DocType: Contract,Fulfilment Terms,Όροι εκπλήρωσης
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ομάδα εκτός Ομάδας
 DocType: Student Guardian,Mother,Μητέρα
+DocType: Issue,Service Level Agreement Fulfilled,Συμφωνία επιπέδου υπηρεσιών που εκπληρώθηκε
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Αποκτήστε φόρο για μη ζητηθέντα οφέλη εργαζομένων
 DocType: Travel Request,Travel Funding,Ταξιδιωτική χρηματοδότηση
 DocType: Shipping Rule,Fixed,Σταθερός
@@ -5466,10 +5522,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Δεν βρέθηκαν αντικείμενα.
 DocType: Item Attribute,From Range,Από την περιοχή
 DocType: Clinical Procedure,Consumables,Αναλώσιμα
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; και &#39;timestamp&#39; απαιτείται.
 DocType: Purchase Taxes and Charges,Reference Row #,Γραμμή αναφοράς #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Ορίστε το Κέντρο κόστους απομείωσης περιουσιακών στοιχείων στην εταιρεία {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Γραμμή # {0}: Απαιτείται το έγγραφο πληρωμής για την ολοκλήρωση της συναλλαγής
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Κάντε κλικ σε αυτό το κουμπί για να τραβήξετε τα στοιχεία της Παραγγελίας Πωλήσεων από το Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Οι ώρες εργασίας κάτω από τις οποίες σημειώνεται η Μισή Ημέρα. (Μηδέν για απενεργοποίηση)
 ,Assessment Plan Status,Κατάσταση προγράμματος αξιολόγησης
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Επιλέξτε πρώτα {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Υποβάλετε αυτό το αρχείο για να δημιουργήσετε την εγγραφή του υπαλλήλου
@@ -5540,6 +5598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Ορίστε Άνοιγμα
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Εναλλαγή φίλτρων
 DocType: Production Plan,Material Request Detail,Λεπτομέρειες αιτήματος υλικού
+DocType: Shift Type,Process Attendance After,Διαδικασία παρακολούθησης μετά
 DocType: Material Request Item,Quantity and Warehouse,Ποσότητα και αποθήκη
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Μεταβείτε στα Προγράμματα
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Σειρά # {0}: Διπλότυπη καταχώρηση στις Αναφορές {1} {2}
@@ -5597,6 +5656,7 @@
 DocType: Pricing Rule,Party Information,Πληροφορίες για τα κόμματα
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Χρεώστες ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Μέχρι σήμερα δεν μπορεί να είναι μεγαλύτερη από την ημερομηνία ανακούφισης των εργαζομένων
+DocType: Shift Type,Enable Exit Grace Period,Ενεργοποίηση περιόδου εξόδου χάριτος
 DocType: Expense Claim,Employees Email Id,Κωδ
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Ενημέρωση τιμής από το Shopify έως το ERPNext Τιμοκατάλογος
 DocType: Healthcare Settings,Default Medical Code Standard,Προεπιλεγμένος πρότυπος ιατρικός κώδικας
@@ -5627,7 +5687,6 @@
 DocType: Budget,Applicable on Material Request,Ισχύει για Αίτηση υλικού
 DocType: Support Settings,Search APIs,API αναζήτησης
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Ποσοστό υπερπαραγωγής για εντολή πωλήσεων
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,ΠΡΟΔΙΑΓΡΑΦΕΣ
 DocType: Purchase Invoice,Supplied Items,Παροχή αντικειμένων
 DocType: Leave Control Panel,Select Employees,Επιλέξτε Υπάλληλοι
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Επιλέξτε το λογαριασμό εσόδων από τόκους στο δάνειο {0}
@@ -5653,7 +5712,7 @@
 ,Supplier-Wise Sales Analytics,Προμηθευτής-Wise Analytics Sales
 DocType: GSTR 3B Report,February,Φεβρουάριος
 DocType: Appraisal,For Employee,Για τον υπάλληλο
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Πραγματική ημερομηνία παράδοσης
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Πραγματική ημερομηνία παράδοσης
 DocType: Sales Partner,Sales Partner Name,Όνομα συνεργάτη πωλήσεων
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Γραμμή απόσβεσης {0}: Η ημερομηνία έναρξης απόσβεσης καταχωρείται ως ημερομηνία λήξης
 DocType: GST HSN Code,Regional,Περιφερειακό
@@ -5692,6 +5751,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Βαθμολογία προμηθευτή
 DocType: Travel Itinerary,Travel To,Ταξιδεύω στο
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Μαρτυρία Συμμετοχής
+DocType: Shift Type,Determine Check-in and Check-out,Προσδιορίστε το Check-in και Check-out
 DocType: POS Closing Voucher,Difference,Διαφορά
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Μικρό
 DocType: Work Order Item,Work Order Item,Στοιχείο Παραγγελίας Εργασίας
@@ -5725,6 +5785,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Φάρμακο
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} είναι κλειστό
 DocType: Patient,Medical History,Ιατρικό ιστορικό
+DocType: Expense Claim,Expense Taxes and Charges,Φόροι και χρεώσεις εξόδων
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Ο αριθμός ημερών μετά την παρέλευση της ημερομηνίας λήξης του τιμολογίου πριν την ακύρωση της συνδρομής ή της εγγραφής της εγγραφής ως μη καταβληθείσας
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Η σημείωση εγκατάστασης {0} έχει ήδη υποβληθεί
 DocType: Patient Relation,Family,Οικογένεια
@@ -5757,7 +5818,6 @@
 DocType: Dosage Strength,Strength,Δύναμη
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} μονάδες {1} που χρειάζονται στο {2} για να ολοκληρωθεί αυτή η συναλλαγή.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush Πρώτες ύλες της υπεργολαβίας με βάση
-DocType: Bank Guarantee,Customer,Πελάτης
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Αν είναι ενεργοποιημένη, ο τομέας Ακαδημαϊκός όρος θα είναι υποχρεωτικός στο εργαλείο εγγραφής προγραμμάτων."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Για την Ομάδα Φοιτητών με Βάση Δεδομένων, η Παρτίδα Φοιτητών θα επικυρωθεί για κάθε Φοιτητή από την Εγγραφή του Προγράμματος."
 DocType: Course,Topics,Θέματα
@@ -5837,6 +5897,7 @@
 DocType: Chapter,Chapter Members,Κεφάλαιο Μέλη
 DocType: Warranty Claim,Service Address,Διεύθυνση υπηρεσίας
 DocType: Journal Entry,Remark,Παρατήρηση
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Η ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} κατά την ώρα αποστολής της καταχώρισης ({2} {3})
 DocType: Patient Encounter,Encounter Time,Ώρα συνάντησης
 DocType: Serial No,Invoice Details,Λεπτομέρειες τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Μπορούν να γίνουν και άλλοι λογαριασμοί κάτω από τους Ομάδες, αλλά μπορούν να γίνουν καταχωρίσεις σε μη Ομάδες"
@@ -5917,6 +5978,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Κλείσιμο (Άνοιγμα + Σύνολο)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Κριτήρια Φόρμουλα
 apps/erpnext/erpnext/config/support.py,Support Analytics,Υποστήριξη Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Αναγνωριστικό συσκευής παρακολούθησης (αναγνωριστικό βιομετρικής ετικέτας / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Ανασκόπηση και δράση
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Εάν ο λογαριασμός είναι παγωμένος, οι καταχωρήσεις επιτρέπονται σε περιορισμένους χρήστες."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Ποσό μετά από αποσβέσεις
@@ -5938,6 +6000,7 @@
 DocType: Salary Slip,Loan Repayment,Αποπληρωμή δανείου
 DocType: Employee Education,Major/Optional Subjects,Κύρια / Προαιρετικά Θέματα
 DocType: Soil Texture,Silt,Λάσπη
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Διευθύνσεις προμηθευτών και επαφές
 DocType: Bank Guarantee,Bank Guarantee Type,Είδος τραπεζικής εγγύησης
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Εάν απενεργοποιηθεί, το πεδίο &quot;Στρογγυλεμένο Σύνολο&quot; δεν θα είναι ορατό σε καμία συναλλαγή"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5976,6 +6039,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Άνοιγμα στοιχείου εργαλείου δημιουργίας τιμολογίου
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / Κ
 DocType: Bank Reconciliation,Include POS Transactions,Συμπεριλάβετε τις συναλλαγές POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Κανένας υπάλληλος δεν βρέθηκε για την δεδομένη αξία τομέα των εργαζομένων. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Ποσό που ελήφθη (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","Το LocalStorage είναι πλήρες, δεν το έσωσε"
 DocType: Chapter Member,Chapter Member,Μέλος του κεφαλαίου
@@ -6008,6 +6072,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Δεν δημιουργήθηκαν ομάδες σπουδαστών.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Διπλή σειρά {0} με ίδια {1}
 DocType: Employee,Salary Details,Λεπτομέρειες μισθοδοσίας
+DocType: Employee Checkin,Exit Grace Period Consequence,Περίοδος περιόδου χάριτος εξόδου
 DocType: Bank Statement Transaction Invoice Item,Invoice,Τιμολόγιο
 DocType: Special Test Items,Particulars,Λεπτομέρειες
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Ρυθμίστε το φίλτρο βάσει στοιχείου ή αποθήκης
@@ -6109,6 +6174,7 @@
 DocType: Serial No,Out of AMC,Από το AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Προφίλ εργασίας, απαιτούμενα προσόντα κ.λπ."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Πλοίο προς κράτος
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Θέλετε να υποβάλετε το αίτημα υλικού
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: Compensatory Leave Request,Work End Date,Ημερομηνία λήξης εργασίας
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Αίτηση για Πρώτες Ύλες
@@ -6294,6 +6360,7 @@
 DocType: Sales Order Item,Gross Profit,Μικτό κέρδος
 DocType: Quality Inspection,Item Serial No,Στοιχείο Σειριακός αριθμός
 DocType: Asset,Insurer,Ασφαλιστικός φορέας
+DocType: Employee Checkin,OUT,ΕΞΩ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Ποσό αγοράς
 DocType: Asset Maintenance Task,Certificate Required,Απαιτείται πιστοποιητικό
 DocType: Retention Bonus,Retention Bonus,Μπόνους διατήρησης
@@ -6409,6 +6476,8 @@
 DocType: Invoice Discounting,Sanctioned,Καθιερωμένος
 DocType: Course Enrollment,Course Enrollment,Εγγραφή μαθήματος
 DocType: Item,Supplier Items,Στοιχεία προμηθευτή
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Η ώρα έναρξης δεν μπορεί να είναι μεγαλύτερη ή ίση με την ώρα λήξης \ για {0}.
 DocType: Sales Order,Not Applicable,Δεν εφαρμόζεται
 DocType: Support Search Source,Response Options,Επιλογές απόκρισης
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} θα πρέπει να είναι μια τιμή μεταξύ 0 και 100
@@ -6495,7 +6564,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Πάγιο ενεργητικό
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Συνολικά κέρδη
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Share Balance,From No,Από τον αριθμό
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Τιμολόγιο Συμφιλίωσης Πληρωμών
 DocType: Purchase Invoice,Taxes and Charges Added,Φόροι και χρεώσεις προστέθηκαν
@@ -6603,6 +6671,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Αγνόηση του κανόνα τιμολόγησης
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Φαγητό
 DocType: Lost Reason Detail,Lost Reason Detail,Χαμένος Λεπτομέρεια Λόγου
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Οι ακόλουθοι σειριακοί αριθμοί δημιουργήθηκαν: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Σχόλια Πελατών
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / AMC
 DocType: Issue,Opening Time,Ωρα ανοιγματος
@@ -6652,6 +6721,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Το όνομα της εταιρείας δεν είναι το ίδιο
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Η Προώθηση Προσωπικού δεν μπορεί να υποβληθεί πριν από την Ημερομηνία Προβολής
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται η ενημέρωση συναλλαγών αποθεμάτων μεγαλύτερων από {0}
+DocType: Employee Checkin,Employee Checkin,Έλεγχος προσωπικού
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης για το στοιχείο {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Δημιουργήστε προσφορές πελατών
 DocType: Buying Settings,Buying Settings,Ρυθμίσεις αγοράς
@@ -6673,6 +6743,7 @@
 DocType: Patient,Patient Demographics,Δημογραφικά στοιχεία ασθενών
 DocType: Share Transfer,To Folio No,Στο No Folio
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Ταμειακή ροή από πράξεις
+DocType: Employee Checkin,Log Type,Τύπος αρχείου καταγραφής
 DocType: Stock Settings,Allow Negative Stock,Επιτρέψτε το αρνητικό απόθεμα
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία δεν έχει καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Asset,Purchase Date,Ημερομηνία αγοράς
@@ -6717,6 +6788,7 @@
 DocType: Vital Signs,Very Hyper,Πολύ Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Επιλέξτε τη φύση της επιχείρησής σας.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Επιλέξτε μήνα και έτος
+DocType: Service Level,Default Priority,Προεπιλεγμένη προτεραιότητα
 DocType: Student Log,Student Log,Εγγραφή μαθητών
 DocType: Shopping Cart Settings,Enable Checkout,Ενεργοποίηση Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Ανθρώπινο δυναμικό
@@ -6745,7 +6817,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Συνδέστε το Shopify με το ERPNext
 DocType: Homepage Section Card,Subtitle,Υπότιτλος
 DocType: Soil Texture,Loam,Παχύ χώμα
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: BOM,Scrap Material Cost(Company Currency),Κόστος παλαιοσιδήρου (νόμισμα εταιρείας)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Δεν πρέπει να υποβληθεί η παραλαβή {0}
 DocType: Task,Actual Start Date (via Time Sheet),Ημερομηνία πραγματικής έναρξης (μέσω του φύλλου εργασίας)
@@ -6801,6 +6872,7 @@
 DocType: Drug Prescription,Dosage,Δοσολογία
 DocType: Cheque Print Template,Starting position from top edge,Θέση εκκίνησης από την πάνω άκρη
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Διάρκεια Συνάντησης (λεπτά)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Αυτός ο υπάλληλος έχει ήδη ένα αρχείο καταγραφής με την ίδια χρονική σήμανση. {0}
 DocType: Accounting Dimension,Disable,Καθιστώ ανίκανο
 DocType: Email Digest,Purchase Orders to Receive,Παραγγελίες αγοράς για λήψη
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Οι παραγγελίες παραγωγής δεν μπορούν να δημιουργηθούν για:
@@ -6816,7 +6888,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Μεταφερόμενο υλικό για υπεργολαβία
 DocType: Job Card,Timing Detail,Λεπτομέρειες συγχρονισμού
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Απαιτείται ενεργοποιημένη
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Εισαγωγή {0} από {1}
 DocType: Job Offer Term,Job Offer Term,Περίοδος προσφοράς εργασίας
 DocType: SMS Center,All Contact,Όλες οι επαφές
 DocType: Project Task,Project Task,Εργασία έργου
@@ -6867,7 +6938,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Το στοιχείο {0} δεν έχει ρυθμιστεί για τους σειριακούς αριθμούς
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Από το κράτος
 DocType: Leave Type,Maximum Continuous Days Applicable,Ισχύουν οι μέγιστες συνεχείς ημέρες
-apps/erpnext/erpnext/config/support.py,Support Team.,Ομάδα υποστήριξης.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Εισαγάγετε πρώτα το όνομα της εταιρείας
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Εισαγωγή επιτυχής
 DocType: Guardian,Alternate Number,Αναπληρωματικός αριθμός
@@ -6959,6 +7029,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Σειρά # {0}: Προστέθηκε στοιχείο
 DocType: Student Admission,Eligibility and Details,Επιλεξιμότητα και Λεπτομέρειες
 DocType: Staffing Plan,Staffing Plan Detail,Λεπτομέρειες σχεδίου προσωπικού
+DocType: Shift Type,Late Entry Grace Period,Ύστερη περίοδος χάριτος εισόδου
 DocType: Email Digest,Annual Income,Ετήσιο εισόδημα
 DocType: Journal Entry,Subscription Section,Τμήμα συνδρομής
 DocType: Salary Slip,Payment Days,Ημέρες πληρωμής
@@ -7009,6 +7080,7 @@
 DocType: Journal Entry Account,Account Balance,Υπόλοιπο λογαριασμού
 DocType: Asset Maintenance Log,Periodicity,Περιοδικότης
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Ιατρικό αρχείο
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Απαιτείται τύπος καταγραφής για τα check-in που εμπίπτουν στην αλλαγή: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Εκτέλεση
 DocType: Item,Valuation Method,Μέθοδος αποτίμησης
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} έναντι Τιμολογίου Πωλήσεων {1}
@@ -7093,6 +7165,7 @@
 DocType: Loan Type,Loan Name,Όνομα δανείου
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Ορίστε την προεπιλεγμένη μέθοδο πληρωμής
 DocType: Quality Goal,Revision,Αναθεώρηση
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Ο χρόνος πριν από τη λήξη της διαδρομής όταν το check-out θεωρείται νωρίς (σε λεπτά).
 DocType: Healthcare Service Unit,Service Unit Type,Τύπος μονάδας υπηρεσίας
 DocType: Purchase Invoice,Return Against Purchase Invoice,Επιστροφή κατά του τιμολογίου αγοράς
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Δημιουργία μυστικού
@@ -7248,12 +7321,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Καλλυντικά
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Ελέγξτε αν θέλετε να αναγκάσετε τον χρήστη να επιλέξει μια σειρά πριν από την αποθήκευση. Δεν θα υπάρξει προεπιλογή αν το κάνετε αυτό.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτόν τον ρόλο επιτρέπεται να ορίσουν δεσμευμένους λογαριασμούς και να δημιουργήσουν / τροποποιήσουν τις καταχωρήσεις λογιστικής έναντι των δεσμευμένων λογαριασμών
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Expense Claim,Total Claimed Amount,Συνολικό Ποσό Απαιτήσεων
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Δεν είναι δυνατή η εύρεση της χρονικής αυλάκωσης στις επόμενες {0} ημέρες για τη λειτουργία {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Τυλίγοντας
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Μπορείτε να το ανανεώσετε μόνο αν λήξει η ιδιότητά σας εντός 30 ημερών
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Η τιμή πρέπει να είναι μεταξύ {0} και {1}
 DocType: Quality Feedback,Parameters,Παράμετροι
+DocType: Shift Type,Auto Attendance Settings,Ρυθμίσεις αυτόματης παρακολούθησης
 ,Sales Partner Transaction Summary,Περίληψη συναλλαγών συνεργάτη πωλήσεων
 DocType: Asset Maintenance,Maintenance Manager Name,Όνομα διαχειριστή συντήρησης
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Απαιτείται η λήψη στοιχείων στοιχείου.
@@ -7345,10 +7420,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Επικύρωση του εφαρμοσμένου κανόνα
 DocType: Job Card Item,Job Card Item,Στοιχείο κάρτας εργασίας
 DocType: Homepage,Company Tagline for website homepage,Γραμμή Εταιρείας για την αρχική σελίδα του ιστότοπου
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Ορίστε το χρόνο απόκρισης και την ανάλυση για την προτεραιότητα {0} στο ευρετήριο {1}.
 DocType: Company,Round Off Cost Center,Γύρω από το κέντρο κόστους
 DocType: Supplier Scorecard Criteria,Criteria Weight,Κριτήρια Βάρος
 DocType: Asset,Depreciation Schedules,Προγράμματα αποσβέσεων
-DocType: Expense Claim Detail,Claim Amount,Ποσό απαιτήσεων
 DocType: Subscription,Discounts,Εκπτώσεις
 DocType: Shipping Rule,Shipping Rule Conditions,Προϋποθέσεις Κανονισμού αποστολής
 DocType: Subscription,Cancelation Date,Ημερομηνία ακύρωσης
@@ -7376,7 +7451,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Εμφάνιση μηδενικών τιμών
 DocType: Employee Onboarding,Employee Onboarding,Υπάλληλος επιβίβασης
 DocType: POS Closing Voucher,Period End Date,Ημερομηνία λήξης περιόδου
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Ευκαιρίες πωλήσεων ανά πηγή
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Η πρώτη προσέγγιση προσέγγισης αδείας στη λίστα θα οριστεί ως η προεπιλεγμένη άδεια προσέγγισης αδείας.
 DocType: POS Settings,POS Settings,Ρυθμίσεις POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Όλοι οι λογαριασμοί
@@ -7397,7 +7471,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Σειρά # {0}: Η τιμή πρέπει να είναι ίδια με {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Στοιχεία Υπηρεσίας Υγείας
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Δεν βρέθηκαν καταγραφές
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Εύρος γήρανσης 3
 DocType: Vital Signs,Blood Pressure,Πίεση αίματος
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Στοχεύστε
@@ -7444,6 +7517,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Παρτίδες
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Αμυνα
 DocType: Item,Has Batch No,Έχει παρτίδα αριθ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Καθυστερημένες ημέρες
 DocType: Lead,Person Name,Όνομα ατόμου
 DocType: Item Variant,Item Variant,Παραλλαγή στοιχείου
 DocType: Training Event Employee,Invited,Καλεσμένος
@@ -7465,7 +7539,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Οι ημερομηνίες έναρξης και λήξης που δεν ισχύουν σε μια έγκυρη περίοδο μισθοδοσίας, δεν μπορούν να υπολογίσουν το {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Να εμφανίζεται μόνο ο Πελάτης αυτών των Ομάδων Πελατών
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Επιλέξτε στοιχεία για να αποθηκεύσετε το τιμολόγιο
-DocType: Service Level,Resolution Time,Χρόνος ανάλυσης
+DocType: Service Level Priority,Resolution Time,Χρόνος ανάλυσης
 DocType: Grading Scale Interval,Grade Description,Βαθμός Περιγραφή
 DocType: Homepage Section,Cards,Καρτέλλες
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Πρακτικά πρακτικά συνάντησης
@@ -7492,6 +7566,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Ισοζύγιο Τραπεζικής Κατάστασης σύμφωνα με το Γενικό Λογιστήριο
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Υγειονομική περίθαλψη (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Προεπιλεγμένη αποθήκη για να δημιουργήσετε μια παραγγελία πώλησης και μια παραλαβή
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Ο χρόνος απόκρισης για {0} στο ευρετήριο {1} δεν μπορεί να είναι μεγαλύτερος από τον Χρόνο ανάλυσης.
 DocType: Opportunity,Customer / Lead Name,Πελάτης / Επικεφαλής όνομα
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Ανεπιθύμητο ποσό
@@ -7538,7 +7613,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Εισαγωγή μερών και διευθύνσεων
 DocType: Item,List this Item in multiple groups on the website.,Καταχωρίστε αυτό το στοιχείο σε πολλές ομάδες στον ιστότοπο.
 DocType: Request for Quotation,Message for Supplier,Μήνυμα για τον προμηθευτή
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Δεν είναι δυνατή η αλλαγή του στοιχείου {0} καθώς υπάρχει συναλλαγή στο Χρηματιστήριο για το στοιχείο {1}.
 DocType: Healthcare Practitioner,Phone (R),Τηλέφωνο (R)
 DocType: Maintenance Team Member,Team Member,Μέλος της ομάδας
 DocType: Asset Category Account,Asset Category Account,Λογαριασμός κατηγορίας περιουσιακών στοιχείων
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index eceab13..712fdab 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Cita {0} y factura de ventas {1} cancelada
 DocType: Purchase Receipt,Vehicle Number,Número de vehículo
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Tu correo electrónico...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Incluir entradas de libros predeterminadas
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Incluir entradas de libros predeterminadas
 DocType: Activity Cost,Activity Type,Tipo de actividad
 DocType: Purchase Invoice,Get Advances Paid,Obtener Avances Pagados
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta de ganancias / pérdidas en la disposición de activos
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Entradas de pago
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
 ,Electronic Invoice Register,Registro de factura electrónica
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,El número de ocurrencia después de la cual se ejecuta la consecuencia.
 DocType: Sales Invoice,Is Return (Credit Note),Es Retorno (Nota De Crédito)
+DocType: Price List,Price Not UOM Dependent,Precio no dependiente de la UOM
 DocType: Lab Test Sample,Lab Test Sample,Muestra de prueba de laboratorio
 DocType: Shopify Settings,status html,estado html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Salario neto
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Cantidad Total Facturada
 DocType: Clinical Procedure,Consumables Invoice Separately,Factura de consumibles por separado
+DocType: Shift Type,Working Hours Threshold for Absent,Umbral de horas de trabajo para ausente
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar a la cuenta de grupo {0}
 DocType: Purchase Receipt Item,Rate and Amount,Tarifa y Cantidad
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Fuera de la configuración del paciente
 DocType: Asset,Insurance End Date,Fecha de finalización del seguro
 DocType: Bank Account,Branch Code,Código de sucursal
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Tiempo para responder
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Foro de usuarios
 DocType: Landed Cost Item,Landed Cost Item,Artículo de coste de aterrizaje
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,El vendedor y el comprador no pueden ser los mismos.
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Transferir
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Buscar elemento (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Resultado enviado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Desde fecha no puede ser mayor que Hasta fecha
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Bienes o Servicios.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Nombre de la nueva cuenta. Nota: Por favor, no cree cuentas para clientes y proveedores."
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,El grupo de estudiantes o el horario del curso es obligatorio
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,nombre de la habilidad
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Imprimir la tarjeta de informe
 DocType: Soil Texture,Ternary Plot,Parcela ternaria
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure la serie de nombres para {0} a través de Configuración&gt; Configuración&gt; Series de nombres
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Entradas de apoyo
 DocType: Asset Category Account,Fixed Asset Account,Cuenta de Activos Fijos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Último
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obligatorio para el balance
 DocType: Payment Entry,Total Allocated Amount,Cantidad total asignada
 DocType: Sales Invoice,Get Advances Received,Obtener los anticipos recibidos
+DocType: Shift Type,Last Sync of Checkin,Última sincronización de registro
 DocType: Student,B-,SEGUNDO-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Artículo Cantidad de impuestos incluida en el valor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Grupo sanguíneo
 apps/erpnext/erpnext/config/healthcare.py,Masters,Maestros
 DocType: Crop,Crop Spacing UOM,Espaciado de cultivos UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,El tiempo después de la hora de inicio del turno cuando el check-in se considera tarde (en minutos).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Explorar
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,No se han encontrado facturas pendientes.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",Las vacantes de {0} y el presupuesto de {1} para {2} ya se planificaron para las compañías subsidiarias de {3}. \ Solo puede planificar hasta {4} vacantes y un presupuesto {5} según el plan de personal {6} para la empresa matriz {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Descuento de producto losas
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Media móvil
 DocType: Employee Attendance Tool,Unmarked Attendance,Asistencia sin marcar
 DocType: Homepage Section,Number of Columns,Número de columnas
+DocType: Issue Priority,Issue Priority,Prioridad de emisión
 DocType: Holiday List,Add Weekly Holidays,Añadir vacaciones semanales
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Crear un Salario
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Fecha de asunto
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Por favor seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla con este requisito
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,No se puede crear un bono de retención para los empleados de la izquierda
+DocType: Employee Checkin,Location / Device ID,Ubicación / ID del dispositivo
 DocType: Purchase Order,To Receive,Para recibir
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Estás en modo fuera de línea. No podrás recargar hasta que tengas red.
 DocType: Course Activity,Enrollment,Inscripción
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Falta información de facturación electrónica
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,No se ha creado ninguna solicitud de material.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 DocType: Loan,Total Amount Paid,Cantidad total pagada
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Todos estos artículos ya han sido facturados.
 DocType: Training Event,Trainer Name,Nombre del entrenador
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Por favor, mencione el nombre principal en plomo {0}"
 DocType: Employee,You can enter any date manually,Puedes ingresar cualquier fecha manualmente
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Artículo de Reconciliación
+DocType: Shift Type,Early Exit Consequence,Consecuencia de salida temprana
 DocType: Item Group,General Settings,Configuración general
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización / factura del proveedor
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Ingrese el nombre del Beneficiario antes de enviarlo.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Confirmación de pago
 ,Available Stock for Packing Items,Stock disponible para artículos de embalaje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+DocType: Shift Type,Every Valid Check-in and Check-out,Cada entrada y salida válidas
 DocType: Support Search Source,Query Route String,Cadena de ruta de consulta
 DocType: Customer Feedback Template,Customer Feedback Template,Plantilla de comentarios del cliente
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Cotizaciones a clientes potenciales o clientes.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,Control de autorizaciones
 ,Daily Work Summary Replies,Respuestas de resumen de trabajo diario
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Te han invitado a colaborar en el proyecto: {0}
+DocType: Issue,Response By Variance,Respuesta por variación
 DocType: Item,Sales Details,Detalles de ventas
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Cabezales de letras para plantillas de impresión.
 DocType: Salary Detail,Tax on additional salary,Impuesto sobre el salario adicional
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Progreso de la tarea
 DocType: Journal Entry,Opening Entry,Entrada de apertura
 DocType: Bank Guarantee,Charges Incurred,Cargos incurridos
+DocType: Shift Type,Working Hours Calculation Based On,Cálculo de horas de trabajo basado en
 DocType: Work Order,Material Transferred for Manufacturing,Material transferido para la fabricación
 DocType: Products Settings,Hide Variants,Ocultar variantes
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Deshabilitar la planificación de la capacidad y el seguimiento del tiempo
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,Intereses
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida
 DocType: Education Settings,Education Manager,Gerente de educacion
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifique los registros de tiempo fuera de las horas de trabajo de la estación de trabajo.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Puntos de fidelidad: {0}
 DocType: Healthcare Settings,Registration Message,Mensaje de registro
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Factura ya creada para todas las horas de facturación.
 DocType: Sales Partner,Contact Desc,Contactar Desc
 DocType: Purchase Invoice,Pricing Rules,Reglas de precios
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el artículo {0}, no puede cambiar el valor de {1}"
 DocType: Hub Tracked Item,Image List,Lista de imágenes
 DocType: Item Variant Settings,Allow Rename Attribute Value,Permitir Renombrar Valor de Atributo
-DocType: Price List,Price Not UOM Dependant,Precio no dependiente de la UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Tiempo (en minutos)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,BASIC
 DocType: Loan,Interest Income Account,Cuenta de ingresos por intereses
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Seleccione Perfil POS
 DocType: Support Settings,Get Latest Query,Obtener la última consulta
 DocType: Employee Incentive,Employee Incentive,Incentivo para empleados
+DocType: Service Level,Priorities,Prioridades
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Añadir tarjetas o secciones personalizadas en la página de inicio
 DocType: Homepage,Hero Section Based On,Sección de héroe basada en
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo de compra total (a través de la factura de compra)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Cantidad ordenada
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: el almacén rechazado es obligatorio contra el artículo rechazado {1}
 ,Received Items To Be Billed,Artículos recibidos para ser facturados
-DocType: Salary Slip Timesheet,Working Hours,Horas laborales
+DocType: Attendance,Working Hours,Horas laborales
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Modo de pago
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Artículos de orden de compra no recibidos a tiempo
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Duración en Días
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general sobre su Proveedor
 DocType: Item Default,Default Selling Cost Center,Centro de coste de venta predeterminado
 DocType: Sales Partner,Address & Contacts,Dirección y Contactos
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Series de numeración
 DocType: Subscriber,Subscriber,Abonado
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Formulario / Artículo / {0}) está agotado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,"Por favor, seleccione la fecha de publicación primero"
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,Tareas creadas
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,La lista de materiales predeterminada ({0}) debe estar activa para este elemento o su plantilla
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Porcentaje de comision %
-DocType: Service Level,Response Time,Tiempo de respuesta
+DocType: Service Level Priority,Response Time,Tiempo de respuesta
 DocType: Woocommerce Settings,Woocommerce Settings,Configuraciones de Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,La cantidad debe ser positiva
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Mapeo de datos de transacción
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Un líder requiere el nombre de una persona o el nombre de una organización
 DocType: Student,Guardians,Guardianes
-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/public/js/stock_analytics.js,Select Brand...,Seleccione la marca ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Ingreso medio
 DocType: Shipping Rule,Calculate Based On,Calcular basado en
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},El registro de asistencia {0} existe contra el estudiante {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Fecha de Transacción
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Cancelar suscripción
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,No se pudo establecer el acuerdo de nivel de servicio {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Cantidad Salarial Neta
 DocType: Account,Liability,Responsabilidad
 DocType: Employee,Bank A/C No.,Banco A / C No.
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de artículo de materia prima
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,La factura de compra {0} ya está enviada
 DocType: Fees,Student Email,Email del estudiante
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Recursión de la lista de materiales: {0} no puede ser padre o hijo de {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Obtener artículos de los servicios de salud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,La entrada de stock {0} no se ha enviado
 DocType: Item Attribute Value,Item Attribute Value,Valor del atributo del artículo
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,Seleccione los artículos para la fabricación
 DocType: Leave Application,Leave Approver Name,Dejar el nombre del aprobador
 DocType: Shareholder,Shareholder,Accionista
-DocType: Issue,Agreement Status,Estado del Acuerdo
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Ajustes predeterminados para la venta de transacciones.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Por favor, seleccione la admisión de estudiantes que es obligatoria para el estudiante pagado solicitante"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Seleccione BOM
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,Cuenta de ingresos
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Todos los almacenes
 DocType: Contract,Signee Details,Detalles del Signatario
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Permitir el check-out después de la hora de finalización del turno (en minutos)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Obtención
 DocType: Item Group,Check this if you want to show in website,Marque esto si desea mostrar en el sitio web
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Año fiscal {0} no encontrado
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,Tarifa de facturación
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: existe otro {0} # {1} contra la entrada de stock {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Habilita la configuración de Google Maps para estimar y optimizar rutas
+DocType: Purchase Invoice Item,Page Break,Salto de página
 DocType: Supplier Scorecard Criteria,Max Score,Maximo puntaje
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,La fecha de inicio del reembolso no puede ser anterior a la fecha de desembolso.
 DocType: Support Search Source,Support Search Source,Fuente de búsqueda de soporte
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,Transferencia de empleados
 ,Sales Funnel,Embudo de ventas
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisis de agua
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Comenzar el registro antes de la hora de inicio del turno (en minutos)
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,No hay nada que editar.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} más larga que cualquier horario de trabajo disponible en la estación de trabajo {1}, divide la operación en múltiples operaciones"
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},La orden de venta {0} es {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Retraso en el pago (Días)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Ingrese los detalles de la depreciación
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Cliente PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La fecha de entrega prevista debe ser posterior a la fecha de la orden de venta
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Cantidad de artículos no puede ser cero
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Atributo no válido
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},"Por favor, seleccione BOM contra el artículo {0}"
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipo de factura
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,Tarde
 DocType: Vital Signs,Nutrition Values,Valores nutricionales
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Presencia de fiebre (temperatura&gt; 38.5 ° C / 101.3 ° F o temperatura sostenida&gt; 38 ° C / 100.4 ° F)
+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
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC invertido
 DocType: Project,Collect Progress,Recoger el progreso
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energía
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,Artículos ordenados para ser facturados
 DocType: Taxable Salary Slab,To Amount,Al monto
 DocType: Purchase Invoice,Is Return (Debit Note),Es Retorno (Nota De Débito)
+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/config/desktop.py,Getting Started,Empezando
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Unir
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la fecha de inicio del año fiscal y la fecha de finalización del año fiscal una vez que se guarda el año fiscal.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior a la fecha de entrega para el número de serie {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Fila {0}: el tipo de cambio es obligatorio
 DocType: Purchase Invoice,Select Supplier Address,Seleccione la dirección del proveedor
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","La cantidad disponible es {0}, necesita {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Por favor ingrese API Consumer Secret
 DocType: Program Enrollment Fee,Program Enrollment Fee,Cuota de inscripción del programa
+DocType: Employee Checkin,Shift Actual End,Desplazar fin real
 DocType: Serial No,Warranty Expiry Date,Fecha de vencimiento de la garantía
 DocType: Hotel Room Pricing,Hotel Room Pricing,Precio de la habitación del hotel
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Suministros imponibles al exterior (distintos de cero, cero y exentos)"
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 DocType: Shopping Cart Settings,Display Settings,Configuraciones de pantalla
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,"Por favor, establezca Número de Depreciaciones Reservadas"
+DocType: Shift Type,Consequence after,Consecuencia despues
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Con qué necesitas ayuda?
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bancario
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Dirección de facturación es la misma que la dirección de envío
 DocType: Account,Cash,Efectivo
 DocType: Employee,Leave Policy,Política de dejar
+DocType: Shift Type,Consequence,Consecuencia
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Dirección del estudiante
 DocType: GST Account,CESS Account,Cuenta CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: el Centro de costos es necesario para la cuenta de &#39;Pérdidas y Ganancias&#39; {2}. Configure un centro de costos predeterminado para la compañía.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Bono de cierre de período
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Nombre Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Por favor ingrese la cuenta de gastos
+DocType: Issue,Resolution By Variance,Resolución por variación
 DocType: Employee,Resignation Letter Date,Fecha de la carta de renuncia
 DocType: Soil Texture,Sandy Clay,Arcilla arenosa
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Ver ahora
 DocType: Item Price,Valid Upto,Válida hasta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},El Doctype de referencia debe ser uno de {0}
+DocType: Employee Checkin,Skip Auto Attendance,Omitir asistencia automática
 DocType: Payment Request,Transaction Currency,Moneda de transacción
 DocType: Loan,Repayment Schedule,Horario de reembolso
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Crear entrada de stock de retención de muestra
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Impuestos de Vales de Cierre de POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Acción inicializada
 DocType: POS Profile,Applicable for Users,Aplicable para usuarios
+,Delayed Order Report,Informe de pedido retrasado
 DocType: Training Event,Exam,Examen
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Se ha encontrado un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta incorrecta en la transacción.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Flujo de ventas
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Las condiciones se aplicarán en todos los elementos seleccionados combinados.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configurar
 DocType: Hotel Room,Capacity,Capacidad
+DocType: Employee Checkin,Shift End,Cambio de fin
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,El lote {0} del artículo {1} está deshabilitado.
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuario de reserva de hotel
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,La jornada laboral se ha repetido dos veces.
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,El acuerdo de nivel de servicio con el tipo de entidad {0} y la entidad {1} ya existe.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Grupo de artículos no mencionado en el artículo maestro para el artículo {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Error de nombre: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Se requiere territorio en el perfil de POS
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,Fecha de programacion
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 DocType: Job Applicant,Job Opening,Apertura de trabajo
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Última sincronización exitosa conocida del registro de empleados. Restablece esto solo si estás seguro de que todos los registros están sincronizados desde todas las ubicaciones. Por favor, no modifiques esto si no estás seguro."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Costo real
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),El avance total ({0}) contra la orden {1} no puede ser mayor que el total general ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Variantes de artículo actualizadas
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Obtener invocies
 DocType: Tally Migration,Is Day Book Data Imported,Se importan los datos del libro de día
 ,Sales Partners Commission,Comisión de Socios de Ventas
+DocType: Shift Type,Enable Different Consequence for Early Exit,Habilitar diferentes consecuencias para la salida temprana
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Legal
 DocType: Loan Application,Required by Date,Requerido por Fecha
 DocType: Quiz Result,Quiz Result,Resultado de la prueba
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,Regla de precios
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Lista de vacaciones opcional no establecida para el período de licencia {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Configure el campo ID de usuario en un registro de empleado para establecer el rol de empleado
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Tiempo para resolver
 DocType: Training Event,Training Event,Evento de entrenamiento
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La presión arterial normal en reposo en un adulto es aproximadamente 120 mmHg sistólica, y 80 mmHg diastólica, abreviada &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,El sistema buscará todas las entradas si el valor límite es cero.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,Aprobado
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},A partir de la fecha debe estar dentro del año fiscal. Suponiendo desde la fecha = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,"Por favor, establezca el grupo de proveedores en la configuración de compra."
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} es un estado de asistencia no válido.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Cuenta de apertura temporal
 DocType: Purchase Invoice,Cash/Bank Account,Efectivo / cuenta bancaria
 DocType: Quality Meeting Table,Quality Meeting Table,Mesa de reuniones de calidad
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Calendario de cursos
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artículo Sabio detalle de impuestos
+DocType: Shift Type,Attendance will be marked automatically only after this date.,La asistencia se marcará automáticamente solo después de esta fecha.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Suministros hechos a titulares de UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Solicitud de cotizaciones
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,La moneda no se puede cambiar después de realizar entradas con otra moneda
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,Es un artículo de Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Procedimiento de calidad.
 DocType: Share Balance,No of Shares,No de Acciones
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no disponible para {4} en el almacén {1} en el momento de publicación de la entrada ({2} {3})
 DocType: Quality Action,Preventive,Preventivo
 DocType: Support Settings,Forum URL,URL del foro
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Empleado y asistencia
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Impuestos y cargos predeterminados
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Esto se basa en transacciones contra este Proveedor. Ver la línea de tiempo a continuación para más detalles
 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 beneficio del empleado {0} excede de {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Introduzca la fecha de inicio y finalización del acuerdo.
 DocType: Delivery Note Item,Against Sales Invoice,Contra factura de ventas
 DocType: Loyalty Point Entry,Purchase Amount,Monto de la compra
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,No se puede establecer como Perdida ya que se realiza un pedido de venta
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,Nombre de la Organización
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Los campos válidos desde y hasta válidos son obligatorios para el acumulado
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: el Lote No debe ser igual que {1} {2}
-DocType: Employee,Leave Details,Dejar detalles
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Las transacciones de acciones antes de {0} se congelan
 DocType: Driver,Issuing Date,Fecha de emisión
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Solicitante
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalles de la plantilla de asignación de flujo de efectivo
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Reclutamiento y Capacitación
 DocType: Drug Prescription,Interval UOM,Intervalo UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Configuración del período de gracia para la asistencia automática
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Desde moneda y hasta moneda no puede ser igual
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Productos farmacéuticos
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Horas de apoyo
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} está cancelado o cerrado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el cliente debe ser crédito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grupo por Vale (Consolidado)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,gerente territorial
 DocType: Lab Test,Sample ID,ejemplo de identificacion
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,El carrito esta vacío
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,La asistencia ha sido marcada según los registros de empleados.
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,El activo {0} debe ser enviado
 ,Absent Student Report,Informe del estudiante ausente
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Incluido en el beneficio bruto
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,Cantidad financiada
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} no se ha enviado, por lo que no se puede completar la acción"
 DocType: Subscription,Trial Period End Date,Fecha de finalización del período de prueba
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Entradas alternas como IN y OUT durante el mismo turno
 DocType: BOM Update Tool,The new BOM after replacement,La nueva lista de materiales después de la sustitución
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Ítem 5
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Apertura temporal
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Posible proveedor
 ,Issued Items Against Work Order,Artículos emitidos contra orden de trabajo
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creando {0} Factura
+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
 DocType: Student,Joining Date,Dia de ingreso
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Sitio de solicitud
 DocType: Purchase Invoice,Against Expense Account,Contra Cuenta de Gastos
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,Cargos aplicables
 ,Point of Sale,Punto de venta
 DocType: Authorization Rule,Approving User  (above authorized value),Usuario Aprobado (por encima del valor autorizado)
+DocType: Service Level Agreement,Entity,Entidad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Cantidad {0} {1} transferida de {2} a {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},El cliente {0} no pertenece al proyecto {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Nombre de la fiesta
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),Composición de la arena (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Importar datos del libro del día
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure la serie de nombres para {0} a través de Configuración&gt; Configuración&gt; Series de nombres
 DocType: Asset,Asset Owner Company,Empresa propietaria del activo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Se requiere centro de costo para reservar un reclamo de gastos
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} números de serie válidos para el artículo {1}
@@ -3399,7 +3432,6 @@
 DocType: Asset,Asset Owner,Propietario del activo
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},El almacén es obligatorio para el artículo de stock {0} en la fila {1}
 DocType: Stock Entry,Total Additional Costs,Costos Adicionales Totales
-DocType: Marketplace Settings,Last Sync On,Última sincronización en
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,"Por favor, establezca al menos una fila en la Tabla de Impuestos y Cargos"
 DocType: Asset Maintenance Team,Maintenance Team Name,Nombre del equipo de mantenimiento
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Cuadro de Centros de Coste
@@ -3415,12 +3447,12 @@
 DocType: Job Card,WIP Warehouse,Almacén WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID de usuario no establecida para el empleado {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","La cantidad disponible es {0}, necesita {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Usuario {0} creado
 DocType: Stock Settings,Item Naming By,Nombre del artículo por
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Ordenado
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Este es un grupo de clientes raíz y no se puede editar.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,La solicitud de material {0} se cancela o se detiene
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Estrictamente basado en el tipo de registro en el registro de empleados
 DocType: Purchase Order Item Supplied,Supplied Qty,Cantidad suministrada
 DocType: Cash Flow Mapper,Cash Flow Mapper,Asignador de flujo de efectivo
 DocType: Soil Texture,Sand,Arena
@@ -3479,6 +3511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Grupo de elementos duplicados encontrado en la tabla de grupos de artículos
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Salario anual
 DocType: Supplier Scorecard,Weighting Function,Función de ponderación
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Error al evaluar la fórmula de criterios
 ,Lab Test Report,Informe de prueba de laboratorio
 DocType: BOM,With Operations,Con operaciones
@@ -3492,6 +3525,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,No hay reembolsos disponibles para la entrada de diario
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} es un estudiante inactivo
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Hacer entrada de stock
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Recursión de la lista de materiales: {0} no puede ser padre o hijo de {1}
 DocType: Employee Onboarding,Activities,Ocupaciones
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Por lo menos una bodega es obligatoria.
 ,Customer Credit Balance,Saldo de crédito del cliente
@@ -3504,9 +3538,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,"Programa de lealtad múltiple encontrado para el cliente. Por favor, seleccione manualmente."
 DocType: Patient,Medication,Medicación
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Seleccione el programa de lealtad
+DocType: Employee Checkin,Attendance Marked,Asistencia marcada
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Materias primas
 DocType: Sales Order,Fully Billed,Completamente facturado
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Por favor, establezca la tarifa de habitación de hotel en {}"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Seleccione solo una prioridad como predeterminada.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Por favor identifique / cree una cuenta (libro mayor) para el tipo - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,La cantidad total de crédito / débito debe ser igual a la entrada de diario vinculada
 DocType: Purchase Invoice Item,Is Fixed Asset,Es activo fijo
@@ -3527,6 +3563,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Confirmación de la cita
 DocType: Shopping Cart Settings,Orders,Pedidos
 DocType: HR Settings,Retirement Age,Edad de retiro
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia a través de Configuración&gt; Series de numeración
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Cantidad proyectada
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La eliminación no está permitida para el país {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Fila # {0}: El activo {1} ya está {2}
@@ -3610,11 +3647,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contador
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},El cupón de cierre de POS ya existe para {0} entre la fecha {1} y {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navegando
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Ninguna factura pendiente requiere revalorización del tipo de cambio.
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre del artículo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El nuevo número de serie no puede tener Almacén. El almacén debe ser establecido por Entrada de inventario o Recibo de compra
 DocType: Issue,Via Customer Portal,A través del Portal del Cliente
 DocType: Work Order Operation,Planned Start Time,Hora de inicio planificada
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} es {2}
+DocType: Service Level Priority,Service Level Priority,Prioridad de nivel de servicio
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,El número de depreciaciones registradas no puede ser mayor que el número total de depreciaciones
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Compartir libro mayor
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
@@ -3725,7 +3764,6 @@
 DocType: Delivery Note,Delivery To,Entregar a
 DocType: Bank Statement Transaction Settings Item,Bank Data,Datos bancarios
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Programado hasta
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantenga las horas de facturación y las horas de trabajo iguales en la hoja de horas
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Seguimiento de pistas por fuente de plomo.
 DocType: Clinical Procedure,Nursing User,Usuario de enfermería
 DocType: Support Settings,Response Key List,Lista de claves de respuesta
@@ -3893,6 +3931,7 @@
 DocType: Work Order Operation,Actual Start Time,Hora de inicio real
 DocType: Antibiotic,Laboratory User,Usuario de laboratorio
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Subastas en línea
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,La prioridad {0} se ha repetido.
 DocType: Fee Schedule,Fee Creation Status,Estado de creación de tarifa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Softwares
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Pedido de venta a pago
@@ -3959,6 +3998,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,No se pudo recuperar la información de {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturación debe ser igual a la moneda de la empresa predeterminada o la moneda de la cuenta de la parte
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Por favor ingrese la identificación del empleado de este vendedor
+DocType: Shift Type,Early Exit Consequence after,Consecuencia temprana de salida después
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Crear apertura de ventas y facturas de compra
 DocType: Disease,Treatment Period,Periodo de tratamiento
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Configuración de correo electrónico
@@ -3976,7 +4016,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Nombre del estudiante:
 DocType: SMS Log,Sent On,Enviado
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Factura de venta
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,El tiempo de respuesta no puede ser mayor que el tiempo de resolución
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Para el grupo de estudiantes basado en el curso, el curso se validará para cada estudiante de los cursos inscritos en la inscripción del programa."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Suministros intraestatales
 DocType: Employee,Create User Permission,Crear permiso de usuario
@@ -4015,6 +4054,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Términos de contrato estándar para ventas o compras.
 DocType: Sales Invoice,Customer PO Details,Detalles del pedido del cliente
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Paciente no encontrado
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Seleccione una prioridad predeterminada.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Eliminar artículo si los cargos no son aplicables a ese artículo
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe un grupo de clientes con el mismo nombre, cambie el nombre del cliente o cambie el nombre del grupo de clientes"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4054,6 +4094,7 @@
 DocType: Support Settings,Support Portal,Portal de soporte
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,La fecha de finalización de la tarea <b>{0}</b> no puede ser menor que <b>{1}</b> fecha de inicio esperada <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},El empleado {0} está en licencia en {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Este Acuerdo de Nivel de Servicio es específico para el Cliente {0}
 DocType: Employee,Held On,Celebrada el
 DocType: Healthcare Practitioner,Practitioner Schedules,Horarios de practicante
 DocType: Project Template Task,Begin On (Days),Comenzar en (Días)
@@ -4061,6 +4102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},La orden de trabajo ha sido {0}
 DocType: Inpatient Record,Admission Schedule Date,Fecha de Admisión
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Ajuste del valor del activo
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Marque la asistencia según el &#39;Registro de empleados&#39; para los empleados asignados a este turno.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Suministros hechos a personas no registradas
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Todos los trabajos
 DocType: Appointment Type,Appointment Type,Tipo de cita
@@ -4174,7 +4216,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Generalmente peso neto + peso del material de embalaje. (para imprimir)
 DocType: Plant Analysis,Laboratory Testing Datetime,Pruebas de laboratorio de hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,El artículo {0} no puede tener lote
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Pipeline de ventas por etapa
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Fuerza del grupo de estudiantes
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Entrada de transacciones del extracto bancario
 DocType: Purchase Order,Get Items from Open Material Requests,Obtener artículos de solicitudes de material abierto
@@ -4256,7 +4297,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Mostrar envejecimiento en el almacén
 DocType: Sales Invoice,Write Off Outstanding Amount,Anotar la cantidad pendiente
 DocType: Payroll Entry,Employee Details,Detalles sobre empleados
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,La hora de inicio no puede ser mayor que la hora de finalización para {0}.
 DocType: Pricing Rule,Discount Amount,Importe de descuento
 DocType: Healthcare Service Unit Type,Item Details,detalles del artículo
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Declaración fiscal duplicada de {0} para el período {1}
@@ -4309,7 +4349,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,La paga neta no puede ser negativa
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,No de interacciones
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},La fila {0} # Artículo {1} no se puede transferir más de {2} a la orden de compra {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Cambio
+DocType: Attendance,Shift,Cambio
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Tramitación del Plan de Cuentas y Partes
 DocType: Stock Settings,Convert Item Description to Clean HTML,Convertir la descripción del artículo a HTML limpio
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Todos los grupos de proveedores
@@ -4380,6 +4420,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Unidad de Servicio para Padres
 DocType: Sales Invoice,Include Payment (POS),Incluir pago (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Capital privado
+DocType: Shift Type,First Check-in and Last Check-out,Primer check-in y último check-out
 DocType: Landed Cost Item,Receipt Document,Documento de recibo
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Período de puntuación del proveedor
 DocType: Employee Grade,Default Salary Structure,Estructura salarial por defecto
@@ -4462,6 +4503,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Crear orden de compra
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definir presupuesto para un ejercicio.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco.
+DocType: Employee Checkin,Entry Grace Period Consequence,Ingreso Período de gracia Consecuencia
 ,Payment Period Based On Invoice Date,Período de pago basado en la fecha de la factura
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},La fecha de instalación no puede ser anterior a la fecha de entrega del artículo {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Enlace a la solicitud de material
@@ -4470,6 +4512,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: ya existe una entrada de pedido para este almacén {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 DocType: Monthly Distribution,Distribution Name,Nombre de la distribución
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,La jornada laboral {0} se ha repetido.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Grupo a no grupo
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Actualización en progreso. Podría tomar un tiempo.
 DocType: Item,"Example: ABCD.#####
@@ -4482,6 +4525,7 @@
 DocType: Vehicle Log,Fuel Qty,Cantidad de combustible
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Desembolsado
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Tiempo después del final del turno durante el cual el registro de salida se considera para la asistencia.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,No disponible
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Medio tiempo
@@ -4495,7 +4539,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Mostrar PDC en Imprimir
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Proveedor Shopify
 DocType: POS Profile User,POS Profile User,Usuario de perfil POS
-DocType: Student,Middle Name,Segundo nombre
 DocType: Sales Person,Sales Person Name,Nombre de la persona de ventas
 DocType: Packing Slip,Gross Weight,Peso bruto
 DocType: Journal Entry,Bill No,Proyecto de ley no
@@ -4504,7 +4547,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Acuerdo de nivel de servicio
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,"Por favor, seleccione empleado y fecha primero"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valuación de artículos se recalcula considerando el monto del comprobante de costo de envío
 DocType: Timesheet,Employee Detail,Detalle del empleado
 DocType: Tally Migration,Vouchers,Vales
@@ -4539,7 +4581,7 @@
 DocType: Additional Salary,Date on which this component is applied,Fecha en que se aplica este componente
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Lista de Accionistas disponibles con números de folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Configurar cuentas de Gateway.
-DocType: Service Level,Response Time Period,Periodo de tiempo de respuesta
+DocType: Service Level Priority,Response Time Period,Periodo de tiempo de respuesta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y Cargos de Compra
 DocType: Course Activity,Activity Date,Fecha de actividad
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Seleccione o agregue nuevo cliente
@@ -4564,6 +4606,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Año financiero
 DocType: Sales Invoice Item,Deferred Revenue,Ingresos diferidos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Al menos uno de los de venta o compra debe ser seleccionado
+DocType: Shift Type,Working Hours Threshold for Half Day,Umbral de horas de trabajo para medio día
 ,Item-wise Purchase History,Historial de compra de artículos sabios
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},No se puede cambiar la Fecha de finalización del servicio para el elemento en la fila {0}
 DocType: Production Plan,Include Subcontracted Items,Incluir artículos subcontratados
@@ -4596,6 +4639,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Permitir el mismo artículo varias veces
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Crear lista de materiales
 DocType: Healthcare Practitioner,Charges,Los cargos
+DocType: Employee,Attendance and Leave Details,Detalles de Asistencia y Licencia
 DocType: Student,Personal Details,Detalles personales
 DocType: Sales Order,Billing and Delivery Status,Estado de facturación y entrega
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Para el proveedor {0} La dirección de correo electrónico se requiere para enviar correo electrónico
@@ -4647,7 +4691,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Ingrese el valor entre {0} y {1}
 DocType: Purchase Order,Order Confirmation Date,Fecha de confirmación del pedido
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcular los tiempos de llegada estimados
-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
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumible
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Fecha de inicio de la suscripción
@@ -4670,7 +4713,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de entrada de diario
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variante
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Actividad del foro
-DocType: Service Level,Resolution Time Period,Periodo de tiempo de resolución
+DocType: Service Level Priority,Resolution Time Period,Periodo de tiempo de resolución
 DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
 DocType: Project Task,View Task,Ver tarea
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / fabricación
@@ -4737,6 +4780,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El almacén solo se puede cambiar a través de Entrada de stock / Nota de entrega / Recibo de compra
 DocType: Support Settings,Close Issue After Days,Cerrar problema después de días
 DocType: Payment Schedule,Payment Schedule,Calendario de pago
+DocType: Shift Type,Enable Entry Grace Period,Habilitar período de gracia de entrada
 DocType: Patient Relation,Spouse,Esposa
 DocType: Purchase Invoice,Reason For Putting On Hold,Razón para poner en espera
 DocType: Item Attribute,Increment,Incremento
@@ -4876,6 +4920,7 @@
 DocType: Vehicle Log,Invoice Ref,Factura Ref.
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},El formulario C no es aplicable para la factura: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Factura creada
+DocType: Shift Type,Early Exit Grace Period,Período de gracia de salida temprana
 DocType: Patient Encounter,Review Details,Detalles de la revisión
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Fila {0}: El valor de las horas debe ser mayor que cero.
 DocType: Account,Account Number,Número de cuenta
@@ -4887,7 +4932,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Aplicable si la empresa es SpA, SApA o SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Condiciones superpuestas encontradas entre:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Pagado y no entregado
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,El código del artículo es obligatorio porque el artículo no se numera automáticamente
 DocType: GST HSN Code,HSN Code,Código HSN
 DocType: GSTR 3B Report,September,septiembre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Gastos administrativos
@@ -4923,6 +4967,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Cuenta CWIP
 DocType: SMS Log,Sender Name,Nombre del remitente
 DocType: Pricing Rule,Supplier Group,Grupo de proveedores
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Establezca la hora de inicio y la hora de finalización del día de asistencia técnica {0} en el índice {1}.
 DocType: Employee,Date of Issue,Fecha de emisión
 ,Requested Items To Be Transferred,Artículos solicitados para ser transferidos
 DocType: Employee,Contract End Date,Fecha de finalización del contrato
@@ -4933,6 +4979,7 @@
 DocType: Opportunity,Sales Stage,Etapa de ventas
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En Palabras estará visible una vez que guarde el Pedido de venta.
 DocType: Item Reorder,Re-order Level,Reordenar nivel
+DocType: Shift Type,Enable Auto Attendance,Habilitar asistencia automática
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Preferencia
 ,Department Analytics,Departamento de Analítica
 DocType: Crop,Scientific Name,Nombre científico
@@ -4945,6 +4992,7 @@
 DocType: Quiz Activity,Quiz Activity,Actividad de prueba
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} no está en un período de nómina válido
 DocType: Timesheet,Billed,Facturado
+apps/erpnext/erpnext/config/support.py,Issue Type.,Tipo de problema.
 DocType: Restaurant Order Entry,Last Sales Invoice,Factura de ultima venta
 DocType: Payment Terms Template,Payment Terms,Términos de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Cantidad reservada: Cantidad pedida para la venta, pero no entregada."
@@ -5040,6 +5088,7 @@
 DocType: Account,Asset,Activo
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} no tiene un horario para profesionales de la salud. Añádelo en el maestro de la salud.
 DocType: Vehicle,Chassis No,Chasis no
+DocType: Employee,Default Shift,Cambio predeterminado
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Abreviatura de la empresa
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Árbol de la lista de materiales
 DocType: Article,LMS User,Usuario LMS
@@ -5088,6 +5137,7 @@
 DocType: Sales Person,Parent Sales Person,Persona de ventas para padres
 DocType: Student Group Creation Tool,Get Courses,Obtener cursos
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: la cantidad debe ser 1, ya que el artículo es un activo fijo. Por favor, use la fila separada para cantidad múltiple."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Horas de trabajo por debajo de las cuales se marca Ausente. (Cero para deshabilitar)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo se permiten nodos de hoja en la transacción.
 DocType: Grant Application,Organization,Organización
 DocType: Fee Category,Fee Category,Categoría de tarifa
@@ -5100,6 +5150,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Por favor actualice su estado para este evento de entrenamiento
 DocType: Volunteer,Morning,Mañana
 DocType: Quotation Item,Quotation Item,Artículo de cotización
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Prioridad de emisión.
 DocType: Journal Entry,Credit Card Entry,Entrada de tarjeta de crédito
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Ranura de tiempo omitida, la ranura {0} a {1} se superpone a la ranura existente {2} a {3}"
 DocType: Journal Entry Account,If Income or Expense,Si Ingresos o Gastos
@@ -5150,11 +5201,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Importación y configuración de datos
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Si se marca Auto Opt In, los clientes se vincularán automáticamente con el Programa de lealtad en cuestión (al guardar)"
 DocType: Account,Expense Account,Cuenta de gastos
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,El tiempo antes de la hora de inicio del turno durante el cual el Registro de empleados se considera para la asistencia.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Relación con Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Crear factura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},La solicitud de pago ya existe {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',El empleado relevado en {0} debe configurarse como &#39;Izquierda&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Pagar {0} {1}
+DocType: Company,Sales Settings,Ajustes de ventas
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Se puede acceder a la solicitud de cotización haciendo clic en el siguiente enlace.
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
@@ -5233,6 +5286,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Se crean plantillas de impuestos predeterminadas para ventas y compras.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,El tipo de licencia {0} no puede ser transferido
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,La cuenta de débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,La fecha de finalización del contrato no puede ser inferior a la de hoy.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Configure la cuenta en el almacén {0} o la cuenta de inventario predeterminada en la empresa {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Establecer por defecto
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente como la suma del peso neto de los artículos)
@@ -5259,8 +5313,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Lotes caducados
 DocType: Shipping Rule,Shipping Rule Type,Tipo de regla de envío
 DocType: Job Offer,Accepted,Aceptado
-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 borre el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Ya has evaluado los criterios de evaluación {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Seleccionar números de lote
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Edad (Días)
@@ -5287,6 +5339,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Seleccione sus dominios
 DocType: Agriculture Task,Task Name,Nombre de la tarea
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entradas de stock ya creadas para Orden de trabajo
+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 borre el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 ,Amount to Deliver,Cantidad a entregar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,La empresa {0} no existe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,No se encontraron solicitudes de material pendientes de vincular para los artículos dados.
@@ -5336,6 +5390,7 @@
 DocType: Lab Prescription,Test Code,Código de prueba
 DocType: Purchase Taxes and Charges,On Previous Row Total,En la fila anterior Total
 DocType: Student,Student Email Address,Dirección de correo electrónico del estudiante
+,Delayed Item Report,Informe de artículo retrasado
 DocType: Academic Term,Education,Educación
 DocType: Supplier Quotation,Supplier Address,Dirección del proveedor
 DocType: Salary Detail,Do not include in total,No incluir en total.
@@ -5343,7 +5398,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} no existe
 DocType: Purchase Receipt Item,Rejected Quantity,Cantidad Rechazada
 DocType: Cashier Closing,To TIme,A tiempo
-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: Daily Work Summary Group User,Daily Work Summary Group User,Resumen de trabajo diario Grupo de usuarios
 DocType: Fiscal Year Company,Fiscal Year Company,Empresa del año fiscal
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,El artículo alternativo no debe ser el mismo que el código del artículo
@@ -5395,6 +5449,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Retraso entre paradas de entrega
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar acciones más antiguas que [días]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Esquema promocional de descuento de producto
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,La prioridad de emisión ya existe
 DocType: Account,Asset Received But Not Billed,Activo recibido pero no facturado
 DocType: POS Closing Voucher,Total Collected Amount,Cantidad total recaudada
 DocType: Course,Default Grading Scale,Escala de calificación predeterminada
@@ -5437,6 +5492,7 @@
 DocType: Contract,Fulfilment Terms,Términos de cumplimiento
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,No Grupo a Grupo
 DocType: Student Guardian,Mother,Madre
+DocType: Issue,Service Level Agreement Fulfilled,Acuerdo de nivel de servicio cumplido
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Impuesto de deducción para beneficios de empleados no reclamados
 DocType: Travel Request,Travel Funding,Financiación de viajes
 DocType: Shipping Rule,Fixed,Fijo
@@ -5466,10 +5522,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,No se encontraron artículos.
 DocType: Item Attribute,From Range,De rango
 DocType: Clinical Procedure,Consumables,Consumibles
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,Se requieren &#39;employee_field_value&#39; y &#39;timestamp&#39;.
 DocType: Purchase Taxes and Charges,Reference Row #,Fila de referencia #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Establezca &#39;Centro de costo de depreciación de activos&#39; en la compañía {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: Se requiere el documento de pago para completar la transacción
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Haga clic en este botón para extraer los datos de su orden de venta de Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Horas de trabajo por debajo de las cuales se marca el medio día. (Cero para deshabilitar)
 ,Assessment Plan Status,Estado del plan de evaluación
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Por favor seleccione {0} primero
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Presentar esto para crear el registro de empleado
@@ -5540,6 +5598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Conjunto abierto
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Alternar filtros
 DocType: Production Plan,Material Request Detail,Detalle de solicitud de material
+DocType: Shift Type,Process Attendance After,Proceso de asistencia despues
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Ir a programas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Fila # {0}: entrada duplicada en las referencias {1} {2}
@@ -5597,6 +5656,7 @@
 DocType: Pricing Rule,Party Information,Información del partido
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Deudores ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Hasta la fecha no puede ser mayor que la fecha de relevo del empleado.
+DocType: Shift Type,Enable Exit Grace Period,Habilitar el período de gracia de salida
 DocType: Expense Claim,Employees Email Id,Identificación del correo electrónico de los empleados
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Precio de actualización de Shopify a la lista de precios de ERPNext
 DocType: Healthcare Settings,Default Medical Code Standard,Estándar de código médico predeterminado
@@ -5627,7 +5687,6 @@
 DocType: Budget,Applicable on Material Request,Aplicable a solicitud de material
 DocType: Support Settings,Search APIs,APIs de búsqueda
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Porcentaje de sobreproducción para pedido de cliente
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Presupuesto
 DocType: Purchase Invoice,Supplied Items,Artículos suministrados
 DocType: Leave Control Panel,Select Employees,Seleccione empleados
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Seleccionar cuenta de ingresos por intereses en préstamo {0}
@@ -5653,7 +5712,7 @@
 ,Supplier-Wise Sales Analytics,Analista de ventas sabio proveedor
 DocType: GSTR 3B Report,February,febrero
 DocType: Appraisal,For Employee,Para empleado
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Fecha de entrega real
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Fecha de entrega real
 DocType: Sales Partner,Sales Partner Name,Nombre del socio de ventas
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Fila de depreciación {0}: La fecha de inicio de la depreciación se ingresa como fecha pasada
 DocType: GST HSN Code,Regional,Regional
@@ -5692,6 +5751,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Tarjeta de puntuación del proveedor
 DocType: Travel Itinerary,Travel To,Viajar a
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Marca asistencia
+DocType: Shift Type,Determine Check-in and Check-out,Determinar el check-in y check-out
 DocType: POS Closing Voucher,Difference,Diferencia
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Pequeña
 DocType: Work Order Item,Work Order Item,Artículo de orden de trabajo
@@ -5725,6 +5785,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Fármaco
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} está cerrado
 DocType: Patient,Medical History,Historial médico
+DocType: Expense Claim,Expense Taxes and Charges,Gastos e Impuestos
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Número de días después de que haya transcurrido la fecha de la factura antes de cancelar la suscripción o marcar la suscripción como no pagada
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Nota de instalación {0} ya ha sido enviada
 DocType: Patient Relation,Family,Familia
@@ -5757,7 +5818,6 @@
 DocType: Dosage Strength,Strength,Fuerza
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} unidades de {1} necesarias en {2} para completar esta transacción.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush Raw Materials of Subcontract Based On
-DocType: Bank Guarantee,Customer,Cliente
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Si está habilitado, el Término Académico será obligatorio en la Herramienta de Inscripción del Programa."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Para el grupo de estudiantes basado en lotes, el lote de estudiantes se validará para cada estudiante de la inscripción del programa."
 DocType: Course,Topics,Los temas
@@ -5837,6 +5897,7 @@
 DocType: Chapter,Chapter Members,Miembros del Capítulo
 DocType: Warranty Claim,Service Address,Dirección de Servicio
 DocType: Journal Entry,Remark,Observación
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no disponible para {4} en el almacén {1} en el momento de publicación de la entrada ({2} {3})
 DocType: Patient Encounter,Encounter Time,Tiempo de encuentro
 DocType: Serial No,Invoice Details,Detalles de la factura
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Se pueden hacer cuentas adicionales en Grupos, pero se pueden hacer entradas contra grupos que no son Grupos."
@@ -5917,6 +5978,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Cierre (Apertura + Total)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Fórmula de Criterios
 apps/erpnext/erpnext/config/support.py,Support Analytics,Analítica de soporte
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Identificación del dispositivo de asistencia (identificación de etiqueta biométrica / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisión y Acción
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada, se permiten entradas a usuarios restringidos."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Importe después de la depreciación
@@ -5938,6 +6000,7 @@
 DocType: Salary Slip,Loan Repayment,Pago de prestamo
 DocType: Employee Education,Major/Optional Subjects,Temas principales / opcionales
 DocType: Soil Texture,Silt,Limo
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Direcciones y contactos de proveedores
 DocType: Bank Guarantee,Bank Guarantee Type,Tipo de garantía bancaria
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si está deshabilitado, el campo &#39;Total redondeado&#39; no será visible en ninguna transacción"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5976,6 +6039,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Apertura de elemento de herramienta de creación de facturas
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Incluir transacciones POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Ningún empleado encontrado para el valor de campo del empleado dado. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (moneda de la empresa)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","Almacenamiento local está lleno, no se guardó"
 DocType: Chapter Member,Chapter Member,Miembro del Capítulo
@@ -6008,6 +6072,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,No se crearon grupos de estudiantes.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 DocType: Employee,Salary Details,Detalles de salario
+DocType: Employee Checkin,Exit Grace Period Consequence,Consecuencia del período de gracia de salida
 DocType: Bank Statement Transaction Invoice Item,Invoice,Factura
 DocType: Special Test Items,Particulars,Informe detallado
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,"Por favor, establece el filtro basado en el artículo o almacén"
@@ -6109,6 +6174,7 @@
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil de trabajo, calificaciones requeridas etc."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Enviar a estado
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,¿Quieres enviar la solicitud de material?
 DocType: Opportunity Item,Basic Rate,Tasa básica
 DocType: Compensatory Leave Request,Work End Date,Fecha de finalización del trabajo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Solicitud de materias primas
@@ -6294,6 +6360,7 @@
 DocType: Sales Order Item,Gross Profit,Beneficio bruto
 DocType: Quality Inspection,Item Serial No,Número de serie del artículo
 DocType: Asset,Insurer,Asegurador
+DocType: Employee Checkin,OUT,AFUERA
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Cantidad de compra
 DocType: Asset Maintenance Task,Certificate Required,Certificado requerido
 DocType: Retention Bonus,Retention Bonus,Bonificación de Retención
@@ -6409,6 +6476,8 @@
 DocType: Invoice Discounting,Sanctioned,Sancionada
 DocType: Course Enrollment,Course Enrollment,Inscripción al curso
 DocType: Item,Supplier Items,Artículos del proveedor
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",La hora de inicio no puede ser mayor o igual que la hora de finalización \ para {0}.
 DocType: Sales Order,Not Applicable,No aplica
 DocType: Support Search Source,Response Options,Opciones de respuesta
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} debe ser un valor entre 0 y 100
@@ -6495,7 +6564,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Activos fijos
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Ganancia total
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Share Balance,From No,De no
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura de Reconciliación de Pagos
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos añadidos
@@ -6603,6 +6671,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignorar regla de precios
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Comida
 DocType: Lost Reason Detail,Lost Reason Detail,Detalle de la razón perdida
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Se crearon los siguientes números de serie: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Comentarios de los clientes
 DocType: Serial No,Warranty / AMC Details,Detalles de la garantía / AMC
 DocType: Issue,Opening Time,Hora de apertura
@@ -6652,6 +6721,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,El nombre de la empresa no es el mismo
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,La promoción del empleado no se puede enviar antes de la fecha de la promoción
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},No permitido actualizar transacciones de stock anteriores a {0}
+DocType: Employee Checkin,Employee Checkin,Registro de empleados
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización del artículo {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Crear cotizaciones de clientes
 DocType: Buying Settings,Buying Settings,Configuraciones de compra
@@ -6673,6 +6743,7 @@
 DocType: Patient,Patient Demographics,Datos demográficos del paciente
 DocType: Share Transfer,To Folio No,Al folio no
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Flujo de efectivo de operaciones
+DocType: Employee Checkin,Log Type,Tipo de registro
 DocType: Stock Settings,Allow Negative Stock,Permitir acciones negativas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Ninguno de los artículos tiene ningún cambio en cantidad o valor.
 DocType: Asset,Purchase Date,Fecha de compra
@@ -6717,6 +6788,7 @@
 DocType: Vital Signs,Very Hyper,Muy hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Seleccione la naturaleza de su negocio.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Por favor seleccione mes y año
+DocType: Service Level,Default Priority,Prioridad predeterminada
 DocType: Student Log,Student Log,Registro de estudiante
 DocType: Shopping Cart Settings,Enable Checkout,Habilitar Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Recursos humanos
@@ -6745,7 +6817,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Conecta Shopify con ERPNext
 DocType: Homepage Section Card,Subtitle,Subtitular
 DocType: Soil Texture,Loam,Marga
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: BOM,Scrap Material Cost(Company Currency),Costo del material de desecho (moneda de la empresa)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Nota de entrega {0} no debe ser enviada
 DocType: Task,Actual Start Date (via Time Sheet),Fecha de inicio real (a través de la hoja de tiempo)
@@ -6801,6 +6872,7 @@
 DocType: Drug Prescription,Dosage,Dosificación
 DocType: Cheque Print Template,Starting position from top edge,Posición inicial desde el borde superior.
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Duración de la cita (minutos)
+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}
 DocType: Accounting Dimension,Disable,Inhabilitar
 DocType: Email Digest,Purchase Orders to Receive,Órdenes de compra para recibir
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Las órdenes de producción no pueden ser levantadas para:
@@ -6816,7 +6888,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Material transferido para el subcontrato
 DocType: Job Card,Timing Detail,Detalle de tiempo
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Requerido en
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Importando {0} de {1}
 DocType: Job Offer Term,Job Offer Term,Plazo de oferta de trabajo
 DocType: SMS Center,All Contact,Todo Contacto
 DocType: Project Task,Project Task,Tarea de proyecto
@@ -6867,7 +6938,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,El artículo {0} no está configurado para los números de serie.
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Del estado
 DocType: Leave Type,Maximum Continuous Days Applicable,Días Continuos Máximos Aplicables
-apps/erpnext/erpnext/config/support.py,Support Team.,Equipo de apoyo.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Por favor ingrese primero el nombre de la compañía
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importación exitosa
 DocType: Guardian,Alternate Number,Número Alternativo
@@ -6959,6 +7029,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Fila # {0}: Artículo agregado
 DocType: Student Admission,Eligibility and Details,Elegibilidad y detalles
 DocType: Staffing Plan,Staffing Plan Detail,Detalle del plan de personal
+DocType: Shift Type,Late Entry Grace Period,Período de gracia de entrada tardía
 DocType: Email Digest,Annual Income,Ingresos anuales
 DocType: Journal Entry,Subscription Section,Seccion de suscripcion
 DocType: Salary Slip,Payment Days,Días de pago
@@ -7009,6 +7080,7 @@
 DocType: Journal Entry Account,Account Balance,Saldo de la cuenta
 DocType: Asset Maintenance Log,Periodicity,Periodicidad
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Historial médico
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Se requiere el tipo de registro para los registros que caen en el turno: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Ejecución
 DocType: Item,Valuation Method,Método de valoración
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} contra factura de ventas {1}
@@ -7093,6 +7165,7 @@
 DocType: Loan Type,Loan Name,Nombre del prestamo
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Establecer el modo de pago predeterminado
 DocType: Quality Goal,Revision,Revisión
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,El tiempo antes de la hora de finalización del turno cuando se considera el check-out como temprano (en minutos).
 DocType: Healthcare Service Unit,Service Unit Type,Tipo de unidad de servicio
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución Contra Factura De Compra
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Generar secreto
@@ -7248,12 +7321,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Productos cosméticos
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Marque esto si desea forzar al usuario a seleccionar una serie antes de guardar. No habrá defecto si marca esto.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden configurar cuentas congeladas y crear / modificar registros contables contra cuentas congeladas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 DocType: Expense Claim,Total Claimed Amount,Cantidad total reclamada
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},No se puede encontrar el intervalo de tiempo en los próximos {0} días para la Operación {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Terminando
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Solo puede renovar si su membresía expira dentro de los 30 días
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},El valor debe estar entre {0} y {1}
 DocType: Quality Feedback,Parameters,Parámetros
+DocType: Shift Type,Auto Attendance Settings,Ajustes de asistencia automática
 ,Sales Partner Transaction Summary,Resumen de transacciones del socio de ventas
 DocType: Asset Maintenance,Maintenance Manager Name,Nombre del gerente de mantenimiento
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Es necesario para obtener detalles del artículo.
@@ -7345,10 +7420,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Validar la regla aplicada
 DocType: Job Card Item,Job Card Item,Ficha de trabajo
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página web
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Establezca el tiempo de respuesta y la resolución para la prioridad {0} en el índice {1}.
 DocType: Company,Round Off Cost Center,Centro de coste de redondeo
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criterio de peso
 DocType: Asset,Depreciation Schedules,Horarios de depreciación
-DocType: Expense Claim Detail,Claim Amount,Reclamar cantidad
 DocType: Subscription,Discounts,Descuentos
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de la regla de envío
 DocType: Subscription,Cancelation Date,Fecha de cancelación
@@ -7376,7 +7451,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Mostrar valores cero
 DocType: Employee Onboarding,Employee Onboarding,Embarque de empleados
 DocType: POS Closing Voucher,Period End Date,Fecha de finalización del período
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Oportunidades de ventas por fuente
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,El primer Leave Approver en la lista se establecerá como el valor predeterminado de Leave Approver.
 DocType: POS Settings,POS Settings,Configuraciones POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Todas las cuentas
@@ -7397,7 +7471,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: la tasa debe ser la misma que {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Artículos de servicios de salud
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,No se encontrarón archivos
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Rango de envejecimiento 3
 DocType: Vital Signs,Blood Pressure,Presión sanguínea
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Objetivo en
@@ -7444,6 +7517,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Lotes
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Defensa
 DocType: Item,Has Batch No,Tiene lote no
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Días retrasados
 DocType: Lead,Person Name,Nombre de la persona
 DocType: Item Variant,Item Variant,Variante de artículo
 DocType: Training Event Employee,Invited,Invitado
@@ -7465,7 +7539,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Las fechas de inicio y finalización no están en un período de nómina válido, no se puede calcular {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Mostrar solo al cliente de estos grupos de clientes
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Seleccionar artículos para guardar la factura
-DocType: Service Level,Resolution Time,Tiempo de resolucion
+DocType: Service Level Priority,Resolution Time,Tiempo de resolucion
 DocType: Grading Scale Interval,Grade Description,Descripción del grado
 DocType: Homepage Section,Cards,Tarjetas
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Minutos de reuniones de calidad
@@ -7492,6 +7566,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Saldo del extracto bancario según el libro mayor
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Salud (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Almacén predeterminado para crear pedido de cliente y nota de entrega
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,El tiempo de respuesta para {0} en el índice {1} no puede ser mayor que el tiempo de resolución.
 DocType: Opportunity,Customer / Lead Name,Nombre del cliente / cliente potencial
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Cantidad no reclamada
@@ -7538,7 +7613,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Importando Partes y Direcciones
 DocType: Item,List this Item in multiple groups on the website.,Enumere este artículo en varios grupos en el sitio web.
 DocType: Request for Quotation,Message for Supplier,Mensaje para el proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,No se puede cambiar {0} porque existe una transacción de stock para el artículo {1}.
 DocType: Healthcare Practitioner,Phone (R),Teléfono (R)
 DocType: Maintenance Team Member,Team Member,Miembro del equipo
 DocType: Asset Category Account,Asset Category Account,Cuenta de Categoría de Activos
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index bcf9800..759ac64 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Kohtumine {0} ja müügiarve {1} tühistati
 DocType: Purchase Receipt,Vehicle Number,Sõiduki number
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Sinu emaili aadress...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Lisage vaikimisi kirjed
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Lisage vaikimisi kirjed
 DocType: Activity Cost,Activity Type,Aktiivsuse tüüp
 DocType: Purchase Invoice,Get Advances Paid,Saada ettemaksed
 DocType: Company,Gain/Loss Account on Asset Disposal,Kasumi / kahjumi konto vara käsutuses
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Makse kirjed
 DocType: Employee Education,Class / Percentage,Klass / protsent
 ,Electronic Invoice Register,Elektroonilise arve register
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Sündmuste arv, mille järel tagajärjed täidetakse."
 DocType: Sales Invoice,Is Return (Credit Note),Kas tagastamine (krediidi märkus)
+DocType: Price List,Price Not UOM Dependent,Hind ei ole UOM sõltuv
 DocType: Lab Test Sample,Lab Test Sample,Lab-testi proov
 DocType: Shopify Settings,status html,olek html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Näiteks 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Netomaks
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Arve kogusumma kokku
 DocType: Clinical Procedure,Consumables Invoice Separately,Kulumaterjalide arve eraldi
+DocType: Shift Type,Working Hours Threshold for Absent,Puudub tööaeg
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Eelarvet ei saa määrata grupikonto {0} vastu
 DocType: Purchase Receipt Item,Rate and Amount,Hind ja summa
@@ -379,7 +382,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Väljas patsiendi sätted
 DocType: Asset,Insurance End Date,Kindlustuse lõppkuupäev
 DocType: Bank Account,Branch Code,Filiaali kood
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Vastamise aeg
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Kasutajafoorum
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Müüja ja ostja ei saa olla samad
@@ -597,6 +599,7 @@
 DocType: Share Transfer,Transfer,Ülekanne
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Otsingu üksus (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Tulemus esitatakse
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Alates kuupäevast ei tohi olla suurem kui siiani
 DocType: Supplier,Supplier of Goods or Services.,Kaupade või teenuste tarnija.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Uue konto nimi. Märkus. Ärge looge klientidele ja tarnijatele kontosid
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Üliõpilaste rühm või kursuste ajakava on kohustuslik
@@ -879,7 +882,6 @@
 DocType: Skill,Skill Name,Oskuse nimi
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Trüki aruande kaart
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun seadistage Naming Series {0} seadistuseks&gt; Seadistused&gt; Nimetamise seeria
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Tugipiletid
 DocType: Asset Category Account,Fixed Asset Account,Fikseeritud varade konto
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Viimati
@@ -892,6 +894,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Kohustuslik bilansi jaoks
 DocType: Payment Entry,Total Allocated Amount,Kokku eraldatud summa
 DocType: Sales Invoice,Get Advances Received,Saage ettemakseid
+DocType: Shift Type,Last Sync of Checkin,Checkini viimane sünkroonimine
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Väärtusena sisalduv maksusumma
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -900,7 +903,9 @@
 DocType: Student,Blood Group,Veregrupp
 apps/erpnext/erpnext/config/healthcare.py,Masters,Meistrid
 DocType: Crop,Crop Spacing UOM,Kärbi vahe UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Vahetamise algusaja möödumise aeg pärast sisseregistreerimist loetakse hiljaks (minutites).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Avasta
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Ühtegi tasumata arvet ei leitud
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vabade töökohtade ja {1} eelarve {2} jaoks on juba planeeritud {3} tütarettevõtetele. Emaettevõtte {3} jaoks on võimalik ette näha ainult kuni {4} vabade töökohtade ja eelarve {5} personali plaani {6} kohta.
 DocType: Promotional Scheme,Product Discount Slabs,Toote allahindlusplaadid
@@ -1002,6 +1007,7 @@
 DocType: Item,Moving Average,Liikuv keskmine
 DocType: Employee Attendance Tool,Unmarked Attendance,Märkimata kohalolek
 DocType: Homepage Section,Number of Columns,Veerude arv
+DocType: Issue Priority,Issue Priority,Probleemi prioriteet
 DocType: Holiday List,Add Weekly Holidays,Lisage iganädalased puhkused
 DocType: Shopify Log,Shopify Log,Shopify Logi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Loo palgatõend
@@ -1010,6 +1016,7 @@
 DocType: Warranty Claim,Issue Date,Väljaandmise kuupäev
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valige üksus {0}. Ei ole võimalik leida ühte partiid, mis vastab sellele nõudele"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Vasakule töötajale ei saa luua säilitamisboonust
+DocType: Employee Checkin,Location / Device ID,Asukoha / seadme ID
 DocType: Purchase Order,To Receive,Saama
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Olete vallasrežiimis. Te ei saa uuesti laadida enne, kui teil on võrk."
 DocType: Course Activity,Enrollment,Registreerimine
@@ -1018,7 +1025,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maksimaalne: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-arvete teave puudub
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Materiaalset taotlust ei loodud
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Üksuse kood&gt; Punktirühm&gt; Bränd
 DocType: Loan,Total Amount Paid,Tasutud kogusumma
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Kõik need esemed on juba arvestatud
 DocType: Training Event,Trainer Name,Treeneri nimi
@@ -1128,6 +1134,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Palun mainige plii nime Lead {0}
 DocType: Employee,You can enter any date manually,Iga kuupäeva saate sisestada käsitsi
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Varude ühitamise punkt
+DocType: Shift Type,Early Exit Consequence,Varajase väljumise tagajärg
 DocType: Item Group,General Settings,üldised seaded
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Tähtaeg ei tohi olla enne postitamist / tarnija arve kuupäeva
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Sisestage saaja nimi enne saatmist.
@@ -1166,6 +1173,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Maksekinnitus
 ,Available Stock for Packing Items,Pakkimisobjektide saadaval olev varu
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Palun eemaldage see arve {0} C-vormist {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Iga kehtiv registreerimine ja väljaregistreerimine
 DocType: Support Search Source,Query Route String,Päringu marsruudi string
 DocType: Customer Feedback Template,Customer Feedback Template,Kliendi tagasiside mall
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Tsitaadid juhtidele või klientidele.
@@ -1200,6 +1208,7 @@
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 ,Daily Work Summary Replies,Vastused igapäevasele tööle
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Teid on kutsutud projektis koostööd tegema: {0}
+DocType: Issue,Response By Variance,Vastus variandile
 DocType: Item,Sales Details,Müügiandmed
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Trükimallide tähed.
 DocType: Salary Detail,Tax on additional salary,Täiendava palga maks
@@ -1323,6 +1332,7 @@
 DocType: Project,Task Progress,Ülesande edenemine
 DocType: Journal Entry,Opening Entry,Avamise kirje
 DocType: Bank Guarantee,Charges Incurred,Maksud on tekkinud
+DocType: Shift Type,Working Hours Calculation Based On,Töötundide arvutamine põhineb
 DocType: Work Order,Material Transferred for Manufacturing,Tootmisele üle kantud materjal
 DocType: Products Settings,Hide Variants,Peida variandid
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Keela võimsuse planeerimine ja aja jälgimine
@@ -1352,6 +1362,7 @@
 DocType: Guardian,Interests,Huvid
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Tarbitud kogus
 DocType: Education Settings,Education Manager,Haridusjuht
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planeerige aja logisid väljaspool tööjaama töötunde.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Lojaalsuspunktid: {0}
 DocType: Healthcare Settings,Registration Message,Registreerimissõnum
@@ -1376,9 +1387,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Arve on juba loodud kõigi arveldustundide jaoks
 DocType: Sales Partner,Contact Desc,Kontakt Desc
 DocType: Purchase Invoice,Pricing Rules,Hinnakujunduse reeglid
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Kuna üksuse {0} vastu on olemasolevaid tehinguid, ei saa te {1} väärtust muuta"
 DocType: Hub Tracked Item,Image List,Pildiloend
 DocType: Item Variant Settings,Allow Rename Attribute Value,Luba atribuudi väärtuse ümbernimetamine
-DocType: Price List,Price Not UOM Dependant,Hind ei ole UOM sõltuv
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Aeg (minutites)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Põhiline
 DocType: Loan,Interest Income Account,Intressitulu konto
@@ -1388,6 +1399,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Valige POS profiil
 DocType: Support Settings,Get Latest Query,Hankige uusim päring
 DocType: Employee Incentive,Employee Incentive,Töötajate stiimul
+DocType: Service Level,Priorities,Prioriteedid
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Lisage avalehele kaarte või kohandatud sektsioone
 DocType: Homepage,Hero Section Based On,Hero jaotis põhineb
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ostumaksumus kokku (ostuarvega)
@@ -1447,7 +1459,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Tellitud kogus
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rida # {0}: tagasilükatud ladu on kohustusliku {1} tagasi lükatud
 ,Received Items To Be Billed,"Saadud kirjed, mida tuleb arveldada"
-DocType: Salary Slip Timesheet,Working Hours,Töötunnid
+DocType: Attendance,Working Hours,Töötunnid
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Makseviis
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,"Ostutellimuse objektid, mida ei laekunud õigeaegselt"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Kestus päevades
@@ -1567,7 +1579,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Kohustuslik teave ja muu üldine teave teie tarnija kohta
 DocType: Item Default,Default Selling Cost Center,Vaikemüügikulu keskus
 DocType: Sales Partner,Address & Contacts,Aadress ja kontaktid
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage nummerdamise seeria osalemiseks seadistamise&gt; Nummerdamise seeria kaudu
 DocType: Subscriber,Subscriber,Abonent
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# vorm / üksus / {0}) on laos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Valige kõigepealt postitamise kuupäev
@@ -1578,7 +1589,7 @@
 DocType: Detected Disease,Tasks Created,Loodud ülesanded
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Vaikimisi BOM ({0}) peab selle elemendi või selle malli jaoks olema aktiivne
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Komisjoni määr%
-DocType: Service Level,Response Time,Reaktsiooniaeg
+DocType: Service Level Priority,Response Time,Reaktsiooniaeg
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce seaded
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Kogus peab olema positiivne
 DocType: Contract,CRM,CRM
@@ -1595,7 +1606,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Tehingute andmete kaardistamine
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Plii vajab kas isiku nime või organisatsiooni nime
 DocType: Student,Guardians,Valvurid
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Palun seadistage õpetaja nimetamise süsteem hariduses&gt; hariduse seaded
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Valige bränd ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Keskmine sissetulek
 DocType: Shipping Rule,Calculate Based On,Arvuta põhjal
@@ -1632,6 +1642,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Õpilase {1} vastu on kohaloleku kirje {0}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Tehingu kuupäev
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Tühista tellimus
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Teenustaseme kokkulepet {0} ei õnnestunud määrata.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Netopalga summa
 DocType: Account,Liability,Vastutus
 DocType: Employee,Bank A/C No.,Panga A / C number
@@ -1697,7 +1708,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Toormaterjali kood
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Ostutarve {0} on juba esitatud
 DocType: Fees,Student Email,Õpilaste e-post
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM rekursioon: {0} ei saa olla {2} vanem või laps
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Hangi tervishoiuteenuste üksused
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Varude kirjet {0} ei esitata
 DocType: Item Attribute Value,Item Attribute Value,Üksuse atribuudi väärtus
@@ -1722,7 +1732,6 @@
 DocType: Production Plan,Select Items to Manufacture,Valige üksused tootmiseks
 DocType: Leave Application,Leave Approver Name,Jäta kinnitaja nimi
 DocType: Shareholder,Shareholder,Aktsionär
-DocType: Issue,Agreement Status,Lepingu staatus
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Tehingute müügi vaikesätted.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Palun valige õpilase sissepääs, mis on tasuline üliõpilase taotleja jaoks kohustuslik"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Valige BOM
@@ -1983,6 +1992,7 @@
 DocType: Account,Income Account,Tulukonto
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Kõik laod
 DocType: Contract,Signee Details,Signee üksikasjad
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Luba väljaregistreerimine pärast vahetuse lõppu (minutites)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Hanked
 DocType: Item Group,Check this if you want to show in website,"Kontrollige seda, kui soovite veebisaidil näidata"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Eelarveaastat {0} ei leitud
@@ -2049,6 +2059,7 @@
 DocType: Activity Cost,Billing Rate,Arvelduse määr
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Hoiatus: teine {0} # {1} eksisteerib stock kirje {2} vastu
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Marsruutide hindamiseks ja optimeerimiseks lubage Google Mapsi seaded
+DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Supplier Scorecard Criteria,Max Score,Maksimaalne skoor
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Tagasimaksmise alguskuupäev ei tohi olla enne väljamakse kuupäeva.
 DocType: Support Search Source,Support Search Source,Toetage otsingu allikat
@@ -2116,6 +2127,7 @@
 DocType: Employee Transfer,Employee Transfer,Töötajate üleminek
 ,Sales Funnel,Müügikanal
 DocType: Agriculture Analysis Criteria,Water Analysis,Vee analüüs
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Alustage registreerimist enne vahetuse algusaega (minutites)
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod külmutati Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Ei ole midagi muuta.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operatsioon {0} kauem kui tööjaamas {1} kasutatav tööaeg, lõhkuge operatsioon mitmeks operatsiooniks"
@@ -2129,7 +2141,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Müügitellimus {0} on {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Makseviivitused (päeva)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Sisestage amortisatsiooni üksikasjad
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Kliendi PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Oodatav tarnekuupäev peaks olema pärast müügitellimuse kuupäeva
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Üksuse kogus ei saa olla null
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Kehtetu atribuut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Palun vali üksus {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Arve tüüp
@@ -2139,6 +2153,7 @@
 DocType: Volunteer,Afternoon,Pärastlõunal
 DocType: Vital Signs,Nutrition Values,Toiteväärtused
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Palavik (temp&gt; 38,5 ° C / 101,3 ° F või püsiv temp&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate allikate süsteem inimressurssides&gt; HR seaded
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC pöördus
 DocType: Project,Collect Progress,Koguge edu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energia
@@ -2189,6 +2204,7 @@
 ,Ordered Items To Be Billed,"Tellitud kirjed, mida tuleb arveldada"
 DocType: Taxable Salary Slab,To Amount,Summa
 DocType: Purchase Invoice,Is Return (Debit Note),Kas tagastamine (deebet Märkus)
+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/config/desktop.py,Getting Started,Alustamine
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Ühenda
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Eelarveaasta alguskuupäeva ja eelarveaasta lõppkuupäeva ei saa muuta pärast eelarveaasta salvestamist.
@@ -2207,8 +2223,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Hoolduse alguskuupäev ei tohi olla enne järjekorranumbri {0} kohaletoimetamise kuupäeva
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Rida {0}: vahetuskurss on kohustuslik
 DocType: Purchase Invoice,Select Supplier Address,Valige tarnija aadress
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Olemasolev kogus on {0}, peate {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Palun sisestage API tarbija saladus
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programmi registreerimise tasu
+DocType: Employee Checkin,Shift Actual End,Tõstke tegelik lõpp
 DocType: Serial No,Warranty Expiry Date,Garantii lõppemise kuupäev
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotelli tubade hind
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Väljaspool maksustatavaid tarneid (va nulliga arvutatud, nullitud ja vabastatud)"
@@ -2268,6 +2286,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lugemine 5
 DocType: Shopping Cart Settings,Display Settings,Ekraani seaded
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Palun määrake broneeritud amortisatsioonide arv
+DocType: Shift Type,Consequence after,Järeldus pärast
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Millega sa abi vajad?
 DocType: Journal Entry,Printing Settings,Printimise sätted
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Pangandus
@@ -2277,6 +2296,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,"Arvelduse aadress on sama, mis postiaadress"
 DocType: Account,Cash,Raha
 DocType: Employee,Leave Policy,Lahkumise poliitika
+DocType: Shift Type,Consequence,Tagajärg
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Õpilase aadress
 DocType: GST Account,CESS Account,CESS konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kulude keskus on vajalik kasumi ja kahjumi konto {2} jaoks. Looge ettevõttele vaikekulude keskus.
@@ -2341,6 +2361,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Perioodi sulgemiskupong
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 nimi
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Palun sisesta kulude konto
+DocType: Issue,Resolution By Variance,Eraldusvõime resolutsioon
 DocType: Employee,Resignation Letter Date,Lahkumise kiri kuupäev
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Kuupäev
@@ -2353,6 +2374,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Kuva nüüd
 DocType: Item Price,Valid Upto,Kehtiv Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Viide Doctype peab olema üks {0}
+DocType: Employee Checkin,Skip Auto Attendance,Jäta Auto osalemine vahele
 DocType: Payment Request,Transaction Currency,Tehingu valuuta
 DocType: Loan,Repayment Schedule,Tagasimaksegraafik
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Loo proovi säilitamise varude kirje
@@ -2424,6 +2446,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS sulgemiskupongid
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Toiming algatatud
 DocType: POS Profile,Applicable for Users,Kasutatav kasutajatele
+,Delayed Order Report,Viivitatud tellimuse aruanne
 DocType: Training Event,Exam,Eksam
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Leitud on vale arv pearaamatu kirjeid. Võib-olla olete valinud tehingus vale konto.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Müügitoru
@@ -2438,10 +2461,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Tingimusi kohaldatakse kõigi valitud üksuste suhtes.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Seadista
 DocType: Hotel Room,Capacity,Võimsus
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Paigaldatud kogus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Üksuse {1} partii {0} on keelatud.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelli broneeringu kasutaja
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Tööpäeva on korratud kaks korda
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Teenusetaseme kokkulepe üksuse tüübiga {0} ja üksus {1} on juba olemas.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},"Üksuse rühm, mida ei ole üksuse {0} üksuse kaptenis mainitud"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Nimi viga: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Territoorium on POS-profiilis nõutav
@@ -2489,6 +2513,7 @@
 DocType: Depreciation Schedule,Schedule Date,Ajakava kuupäev
 DocType: Packing Slip,Package Weight Details,Pakendi kaal üksikasjad
 DocType: Job Applicant,Job Opening,Tööpakkumine
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Viimane teadaolev edukas sünkroon töötaja kohta Lähtesta see ainult siis, kui olete kindel, et kõik logid sünkroonitakse kõigist asukohtadest. Palun ärge muutke seda, kui te pole kindel."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tegelik maksumus
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kogusumma ({0}) tellimuse {1} vastu ei saa olla suurem kui Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Üksuse variandid on uuendatud
@@ -2533,6 +2558,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Võta Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Kas päeva raamatu andmed imporditakse
 ,Sales Partners Commission,Müügipartnerite komisjon
+DocType: Shift Type,Enable Different Consequence for Early Exit,Võimaldage varajase väljumise jaoks erinevaid tagajärgi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Legal
 DocType: Loan Application,Required by Date,Nõutav kuupäevaga
 DocType: Quiz Result,Quiz Result,Viktoriini tulemus
@@ -2592,7 +2618,6 @@
 DocType: Pricing Rule,Pricing Rule,Hinnakujunduse reegel
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Vabatahtlik puhkusenimekiri ei ole määratud puhkeperioodiks {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Töötajate rolli seadmiseks määrake Töötajate kirje kasutaja ID väli
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Aeg lahendada
 DocType: Training Event,Training Event,Koolitusüritus
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Tavaline vererõhk täiskasvanutel on umbes 120 mmHg süstoolne ja 80 mmHg diastoolne, lühendatult &quot;120/80 mmHg&quot;."
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Süsteem tõmbab kõik kirjed, kui piirväärtus on null."
@@ -2636,6 +2661,7 @@
 DocType: Student Applicant,Approved,Kinnitatud
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Alates kuupäevast peaks kuuluma eelarveaasta. Eeldades kuupäeva = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Palun määrake tarnija grupp ostu seadetes.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} on kehtetu osalejaolek.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Ajutine avamiskonto
 DocType: Purchase Invoice,Cash/Bank Account,Raha / pangakonto
 DocType: Quality Meeting Table,Quality Meeting Table,Kvaliteedi koosoleku tabel
@@ -2671,6 +2697,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Toit, jook ja tubakas"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Kursuse ajakava
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Üksus Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Osavõtt märgitakse automaatselt alles pärast seda kuupäeva.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,UIN-hoidikutele tehtud tarvikud
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Tsitaatide taotlus
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Valuuta ei saa pärast kirjete tegemist mõnda muud valuutat muuta
@@ -2719,7 +2746,6 @@
 DocType: Item,Is Item from Hub,Kas üksus Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Kvaliteedimenetlus.
 DocType: Share Balance,No of Shares,Aktsiate arv
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rida {0}: Kogus {4} laos {1} pole saadaval kirje postitamise ajal ({2} {3})
 DocType: Quality Action,Preventive,Ennetav
 DocType: Support Settings,Forum URL,Foorumi URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Töötaja ja osalemine
@@ -2941,7 +2967,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Vaikemaksud ja -maksud
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,See põhineb tehingutel selle Tarnijaga. Täpsemat teavet vt allpool toodud ajastusest
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Töötaja {0} maksimaalne hüvitise summa ületab {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Sisestage lepingu algus- ja lõppkuupäev.
 DocType: Delivery Note Item,Against Sales Invoice,Müügiarve vastu
 DocType: Loyalty Point Entry,Purchase Amount,Ostu summa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Müügikorralduse tegemisel ei saa seadet kaotada.
@@ -2965,7 +2990,7 @@
 DocType: Lead,Organization Name,Organisatsiooni nimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Kehtiv ja kehtiv väljad on kohustuslikud kumulatiivsete väljade jaoks
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Rida # {0}: partii nr peab olema sama nagu {1} {2}
-DocType: Employee,Leave Details,Andmete lahkumine
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Varu tehingud enne {0} on külmutatud
 DocType: Driver,Issuing Date,Väljaandmiskuupäev
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Taotleja
@@ -3010,9 +3035,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Rahavoogude kaardistamise malli üksikasjad
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Värbamine ja koolitus
 DocType: Drug Prescription,Interval UOM,Intervall UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Ajapikenduse seadistused Auto osalemiseks
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Valuutast ja valuuta ei saa olla sama
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Farmaatsiatooted
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Toetundid
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} tühistatakse või suletakse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rida {0}: ettemaks Kliendi vastu peab olema krediit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grupi maksekviitung (konsolideeritud)
@@ -3122,6 +3149,7 @@
 DocType: Territory,Territory Manager,Territooriumihaldur
 DocType: Lab Test,Sample ID,Proovi ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Ostukorv on tühi
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Osavõtt on märgitud töötaja registreerimise kohta
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Vara {0} tuleb esitada
 ,Absent Student Report,Puudub õpilaste aruanne
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Sisaldab brutokasumit
@@ -3129,7 +3157,9 @@
 DocType: Travel Request Costing,Funded Amount,Rahastatav summa
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} ei ole esitatud, nii et tegevust ei saa lõpetada"
 DocType: Subscription,Trial Period End Date,Prooviperioodi lõppkuupäev
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Sama vahetuse ajal sisestatakse kirjeid IN ja OUT
 DocType: BOM Update Tool,The new BOM after replacement,Uus BOM pärast asendamist
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Punkt 5
 DocType: Employee,Passport Number,Passi number
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Ajutine avamine
@@ -3244,6 +3274,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Võimalik tarnija
 ,Issued Items Against Work Order,Välja antud artiklid töökorralduse vastu
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} Arve loomine
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Palun seadistage õpetaja nimetamise süsteem hariduses&gt; hariduse seaded
 DocType: Student,Joining Date,Liitumise kuupäev
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Taotlev sait
 DocType: Purchase Invoice,Against Expense Account,Kulukonto vastu
@@ -3283,6 +3314,7 @@
 DocType: Landed Cost Item,Applicable Charges,Kohaldatavad tasud
 ,Point of Sale,Müügipunkt
 DocType: Authorization Rule,Approving User  (above authorized value),Kasutaja kinnitamine (üle lubatud väärtuse)
+DocType: Service Level Agreement,Entity,Üksus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} ülekantud summa {2} -st {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Klient {0} ei kuulu projekti {1} juurde
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Partei nimi
@@ -3329,6 +3361,7 @@
 DocType: Soil Texture,Sand Composition (%),Liiva koostis (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Importige päeva raamatuandmeid
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Palun seadistage Naming Series {0} seadistuseks&gt; Seadistused&gt; Nimetamise seeria
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Kulukeskuse broneerimiseks on vaja kulukeskust
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Cannot promote Employee with status Left,"Töötajat, kellel on staatus vasakul, ei saa edendada"
@@ -3386,7 +3419,6 @@
 DocType: Asset,Asset Owner,Varahaldur
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Laos on {1} laos {0} kohustuslik.
 DocType: Stock Entry,Total Additional Costs,Täiendavad lisakulud
-DocType: Marketplace Settings,Last Sync On,Viimane sünkroonimine
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Palun määrake tabelis Maksud ja tasud vähemalt üks rida
 DocType: Asset Maintenance Team,Maintenance Team Name,Hooldusmeeskonna nimi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Kulukeskuste diagramm
@@ -3402,12 +3434,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Töötaja {0} kasutaja ID puudub
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Saadaval on {0} kogus, peate {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Kasutaja {0} loodud
 DocType: Stock Settings,Item Naming By,Üksuse nimetamine
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Tellitud
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,See on root kliendirühm ja seda ei saa muuta.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materjali päring {0} tühistatakse või peatatakse
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Rangelt põhineb logi tüübil töötaja kontrollis
 DocType: Purchase Order Item Supplied,Supplied Qty,Tarnitud kogus
 DocType: Cash Flow Mapper,Cash Flow Mapper,Rahavoogude kaardistaja
 DocType: Soil Texture,Sand,Liiv
@@ -3466,6 +3498,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Objektirühma tabelis on duplikaadirühm
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Aasta palk
 DocType: Supplier Scorecard,Weighting Function,Kaalumisfunktsioon
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Konversioonitegur ({0} -&gt; {1}) üksusele: {2} ei leitud
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Viga kriteeriumide valemi hindamisel
 ,Lab Test Report,Labi testiaruanne
 DocType: BOM,With Operations,Operatsioonidega
@@ -3479,6 +3512,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Journal Entry jaoks tagasimaksed puuduvad
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} on passiivne õpilane
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Tehke laoseisu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM rekursioon: {0} ei saa olla {1} vanem või laps
 DocType: Employee Onboarding,Activities,Tegevused
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Atleast üks ladu on kohustuslik
 ,Customer Credit Balance,Kliendi krediidi saldo
@@ -3491,9 +3525,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Kliendile on leitud mitu lojaalsusprogrammi. Palun valige käsitsi.
 DocType: Patient,Medication,Ravimid
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Valige Lojaalsusprogramm
+DocType: Employee Checkin,Attendance Marked,Märkimisväärne osalemine
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Toored materjalid
 DocType: Sales Order,Fully Billed,Täielikult täidetud
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Palun määrake hotelli tubade hind {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Valige vaikimisi ainult üks prioriteet.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Palun identifitseerige / looge konto tüüp (Ledger) - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Krediidi / deebeti kogusumma peaks olema samasugune kui seotud ajakirja sissekandega
 DocType: Purchase Invoice Item,Is Fixed Asset,Kas püsivara on
@@ -3514,6 +3550,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Kohtumise kinnitamine
 DocType: Shopping Cart Settings,Orders,Tellimused
 DocType: HR Settings,Retirement Age,Pensioniiga
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage nummerdamise seeria osalemiseks seadistamise&gt; Nummerdamise seeria kaudu
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Prognoositav kogus
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Kustutamine ei ole riigis {0} lubatud
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Rida # {0}: vara {1} on juba {2}
@@ -3596,11 +3633,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Raamatupidaja
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS sulgemise kviitung alreday on {0} vahel kuupäeva {1} ja {2} vahel
 apps/erpnext/erpnext/config/help.py,Navigating,Navigeerimine
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Ühtegi tasumata arvet ei nõua vahetuskursi ümberhindamist
 DocType: Authorization Rule,Customer / Item Name,Kliendi / objekti nimi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Uuel seerianumbril ei ole ladu. Ladu tuleb seada varude laoseisu või ostukviitungiga
 DocType: Issue,Via Customer Portal,Kliendiportaali kaudu
 DocType: Work Order Operation,Planned Start Time,Planeeritud algusaeg
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} on {2}
+DocType: Service Level Priority,Service Level Priority,Teenuse taseme prioriteet
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broneeritud amortisatsioonide arv ei tohi olla suurem kui amortisatsioonide koguarv
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Jaga Ledgerit
 DocType: Journal Entry,Accounts Payable,Võlgnevused
@@ -3710,7 +3749,6 @@
 DocType: Delivery Note,Delivery To,Kohaletoimetamine
 DocType: Bank Statement Transaction Settings Item,Bank Data,Pangaandmed
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Planeeritud Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Säilitage arveldusaeg ja töötundide arv töögraafikus
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Plii allikate jälgimine.
 DocType: Clinical Procedure,Nursing User,Õendusabi kasutaja
 DocType: Support Settings,Response Key List,Vastuse võtmete loend
@@ -3877,6 +3915,7 @@
 DocType: Work Order Operation,Actual Start Time,Tegelik algusaeg
 DocType: Antibiotic,Laboratory User,Laboratoorne kasutaja
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online-oksjonid
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Prioriteet {0} on korratud.
 DocType: Fee Schedule,Fee Creation Status,Tasu loomise staatus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Tarkvara
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Müügikorraldus maksmiseks
@@ -3943,6 +3982,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} kohta teavet ei saanud.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Arveldusvaluuta peab olema võrdne kas ettevõtte vaikimisi valuuta või kontoga
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Palun sisestage selle müügipersonali töötaja ID
+DocType: Shift Type,Early Exit Consequence after,Varajane väljumise tagajärg pärast
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Loo avamise müügi ja ostu arveid
 DocType: Disease,Treatment Period,Ravi periood
 apps/erpnext/erpnext/config/settings.py,Setting up Email,E-posti seadistamine
@@ -3960,7 +4000,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Õpilase nimi:
 DocType: SMS Log,Sent On,Saadetud
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Müügiarve
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Reaktsiooniaeg ei tohi olla suurem kui eraldusvõime aeg
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kursusel põhineva üliõpilasgrupi jaoks valitakse kursus iga õpilase jaoks programmis registreerimise kursustest.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Riigisisesed tarned
 DocType: Employee,Create User Permission,Loo kasutajaluba
@@ -3999,6 +4038,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Müügi või ostu tüüptingimused.
 DocType: Sales Invoice,Customer PO Details,Kliendi PO üksikasjad
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patsienti ei leitud
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Valige vaikimisi prioriteet.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Eemaldage üksus, kui selle elemendi puhul ei kohaldata tasusid"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kliendirühm on sama nimega, palun muutke Kliendi nime või muutke Kliendirühm"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4038,6 +4078,7 @@
 DocType: Support Settings,Support Portal,Toetusportaal
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Ülesande <b>{0}</b> lõppkuupäev ei tohi olla väiksem kui <b>{1}</b> eeldatav alguskuupäev <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Töötaja {0} on lahkumisel {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},See teenustaseme leping on spetsiifiline kliendile {0}
 DocType: Employee,Held On,Hoidmine toimub
 DocType: Healthcare Practitioner,Practitioner Schedules,Praktikute graafikud
 DocType: Project Template Task,Begin On (Days),Alustage (päevad)
@@ -4045,6 +4086,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Töörežiim on olnud {0}
 DocType: Inpatient Record,Admission Schedule Date,Sisenemise ajakava
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Vara väärtuse korrigeerimine
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Märkige kohalolek, mis põhineb sellel vahetuses määratud töötajate töötajate kontrollimisel."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Registreerimata isikutele tarnitud tarned
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Kõik töökohad
 DocType: Appointment Type,Appointment Type,Kohtumise tüüp
@@ -4158,7 +4200,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pakendi kogumass. Tavaliselt netokaal + pakkematerjali kaal. (printimiseks)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoorsed testid Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Üksusel {0} ei saa olla partiisidet
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Müügitorustik etapil
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Õpilaste rühma tugevus
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Panga väljavõtte tehingute kanne
 DocType: Purchase Order,Get Items from Open Material Requests,Saage elemendid avatud materjali taotlustest
@@ -4239,7 +4280,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Näita vananemise laost
 DocType: Sales Invoice,Write Off Outstanding Amount,Kirjutage välja silmapaistev summa
 DocType: Payroll Entry,Employee Details,Töötaja andmed
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Start Time ei saa olla suurem kui {0} lõpp-aeg.
 DocType: Pricing Rule,Discount Amount,Soodus
 DocType: Healthcare Service Unit Type,Item Details,Üksuse üksikasjad
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Korduv {0} maksudeklaratsioon perioodi {1} kohta
@@ -4292,7 +4332,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Netopalk ei tohi olla negatiivne
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Interaktsioonide arv
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Rida {0} # Üksust {1} ei saa üle {2} osta tellimuse {3} vastu
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Kontode ja poolte töötlemise graafik
 DocType: Stock Settings,Convert Item Description to Clean HTML,Teisenda elemendi kirjeldus puhtaks HTML-ks
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Kõik tarnijagrupid
@@ -4363,6 +4403,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Vanemate teenindusüksus
 DocType: Sales Invoice,Include Payment (POS),Kaasa makse (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Erakapital
+DocType: Shift Type,First Check-in and Last Check-out,Esimene sisseregistreerimine ja viimane väljaregistreerimine
 DocType: Landed Cost Item,Receipt Document,Kviitungi dokument
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Tarnija tulemustaseme periood
 DocType: Employee Grade,Default Salary Structure,Palga vaikimisi struktuur
@@ -4445,6 +4486,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Loo ostutellimus
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Määrake eelarveaasta eelarve.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Kontode tabel ei saa olla tühi.
+DocType: Employee Checkin,Entry Grace Period Consequence,Sisenemise ajapikendus
 ,Payment Period Based On Invoice Date,Arvelduspäeval põhinev makseperiood
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Paigaldamise kuupäev ei tohi olla enne {0} kirje kohaletoimetamise kuupäeva
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Link materjali päringule
@@ -4453,6 +4495,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Rida {0}: selle lao jaoks on juba ümberkorralduste kanne {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dokumendi kuupäev
 DocType: Monthly Distribution,Distribution Name,Jaotuse nimi
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Tööpäeva {0} on korratud.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Grupp mitte-gruppi
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Käimas on värskendus. See võib võtta aega.
 DocType: Item,"Example: ABCD.#####
@@ -4465,6 +4508,7 @@
 DocType: Vehicle Log,Fuel Qty,Kütusekogus
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 mobiil nr
 DocType: Invoice Discounting,Disbursed,Väljamakse
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Aeg pärast vahetuse lõppu, mille jooksul vaadatakse väljaregistreerimist."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Võlgnevuste netosumma
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Pole saadaval
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Poole kohaga
@@ -4478,7 +4522,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Näita PDC printimisel
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Tarnija
 DocType: POS Profile User,POS Profile User,POS-profiili kasutaja
-DocType: Student,Middle Name,Keskmine nimi
 DocType: Sales Person,Sales Person Name,Müügipersonali nimi
 DocType: Packing Slip,Gross Weight,Kogumass
 DocType: Journal Entry,Bill No,Bill nr
@@ -4487,7 +4530,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Teenustaseme kokkulepe
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Valige esmalt Töötaja ja Kuupäev
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,"Punkti hindamise määr arvutatakse ümber, võttes arvesse lossitud maksumuse summat"
 DocType: Timesheet,Employee Detail,Töötaja üksikasjad
 DocType: Tally Migration,Vouchers,Kupongid
@@ -4522,7 +4564,7 @@
 DocType: Additional Salary,Date on which this component is applied,Selle komponendi kohaldamise kuupäev
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,"Kasutatavate aktsionäride nimekiri, kellel on folio numbrid"
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Gateway kontode seadistamine.
-DocType: Service Level,Response Time Period,Reageerimisaja periood
+DocType: Service Level Priority,Response Time Period,Reageerimisaja periood
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostumaksud ja -maksud
 DocType: Course Activity,Activity Date,Tegevuse kuupäev
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Valige või lisage uus klient
@@ -4547,6 +4589,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Majandusaasta
 DocType: Sales Invoice Item,Deferred Revenue,Edasilükatud tulud
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Valik tuleb valida ühe müügi või ostmise kohta
+DocType: Shift Type,Working Hours Threshold for Half Day,Töötundide künnis poolpäevaks
 ,Item-wise Purchase History,Punkti järgi ostmise ajalugu
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},{0} reas asuva elemendi teenuse peatamise kuupäeva ei saa muuta
 DocType: Production Plan,Include Subcontracted Items,Kaasa alltöövõtud kaubad
@@ -4579,6 +4622,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Lubage sama kirje mitu korda
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Loo BOM
 DocType: Healthcare Practitioner,Charges,Süüdistused
+DocType: Employee,Attendance and Leave Details,Osalemine ja üksikasjade lahkumine
 DocType: Student,Personal Details,Isiklikud detailid
 DocType: Sales Order,Billing and Delivery Status,Arvelduse ja kohaletoimetamise staatus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Rida {0}: E-posti saatmiseks on vajalik e-posti aadress {0}
@@ -4630,7 +4674,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Sisestage väärtus {0} ja {1}
 DocType: Purchase Order,Order Confirmation Date,Tellimuse kinnitamise kuupäev
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Arvuta eeldatav saabumisaeg
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate allikate süsteem inimressurssides&gt; HR seaded
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Kulumaterjal
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Tellimuse alguskuupäev
@@ -4653,7 +4696,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Ajakirja sisestuskonto
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Foorumi tegevus
-DocType: Service Level,Resolution Time Period,Lahenduse ajaperiood
+DocType: Service Level Priority,Resolution Time Period,Lahenduse ajaperiood
 DocType: Request for Quotation,Supplier Detail,Tarnija üksikasjad
 DocType: Project Task,View Task,Vaata ülesannet
 DocType: Serial No,Purchase / Manufacture Details,Ostu / tootmise üksikasjad
@@ -4720,6 +4763,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Ladu saab muuta ainult laoseisu / tarnekirja / ostutõendi kaudu
 DocType: Support Settings,Close Issue After Days,Sulge teema pärast päeva
 DocType: Payment Schedule,Payment Schedule,Maksegraafik
+DocType: Shift Type,Enable Entry Grace Period,Luba sissepääsuperioodi
 DocType: Patient Relation,Spouse,Abikaasa
 DocType: Purchase Invoice,Reason For Putting On Hold,Ootele paigutamise põhjus
 DocType: Item Attribute,Increment,Kasv
@@ -4858,6 +4902,7 @@
 DocType: Vehicle Log,Invoice Ref,Arve Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-vorm ei ole arve puhul kohaldatav: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Arve loodud
+DocType: Shift Type,Early Exit Grace Period,Varajase väljumise ajapikendus
 DocType: Patient Encounter,Review Details,Vaadake üksikasjad üle
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Rida {0}: Tundide väärtus peab olema suurem kui null.
 DocType: Account,Account Number,Konto number
@@ -4869,7 +4914,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Kohaldatakse, kui ettevõte on SpA, SApA või SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Kattuvad tingimused on leitud:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Tasutud ja mitte tarnitud
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Üksuse kood on kohustuslik, sest üksus ei ole automaatselt nummerdatud"
 DocType: GST HSN Code,HSN Code,HSN-kood
 DocType: GSTR 3B Report,September,September
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administratiivsed kulud
@@ -4905,6 +4949,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP konto
 DocType: SMS Log,Sender Name,Saatja nimi
 DocType: Pricing Rule,Supplier Group,Tarnijate rühm
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Määra algusaeg ja lõppkuupäev {0} indeksi {1} juures.
 DocType: Employee,Date of Issue,Väljastamise kuupäev
 ,Requested Items To Be Transferred,Edastatavad taotletavad üksused
 DocType: Employee,Contract End Date,Lepingu lõppkuupäev
@@ -4915,6 +4961,7 @@
 DocType: Opportunity,Sales Stage,Müügietapp
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Sõnades on nähtav pärast müügitellimuse salvestamist.
 DocType: Item Reorder,Re-order Level,Korrigeeri tase uuesti
+DocType: Shift Type,Enable Auto Attendance,Luba automaatne osalemine
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Eelistus
 ,Department Analytics,Department Analytics
 DocType: Crop,Scientific Name,Teaduslik nimi
@@ -4927,6 +4974,7 @@
 DocType: Quiz Activity,Quiz Activity,Viktoriinitegevus
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} ei ole kehtivas palgaarvestusperioodis
 DocType: Timesheet,Billed,Arveldatud
+apps/erpnext/erpnext/config/support.py,Issue Type.,Probleemi tüüp.
 DocType: Restaurant Order Entry,Last Sales Invoice,Viimane müügiarve
 DocType: Payment Terms Template,Payment Terms,Maksetingimused
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Reserveeritud Kogus: Müügiks tellitud kogus, mida ei ole tarnitud."
@@ -5022,6 +5070,7 @@
 DocType: Account,Asset,Vara
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} ei ole tervishoiutöötajate ajakava. Lisage see tervishoiutöötaja meistrisse
 DocType: Vehicle,Chassis No,Šassii nr
+DocType: Employee,Default Shift,Vaikimisi vahetamine
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Firma lühend
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Materjaliarv
 DocType: Article,LMS User,LMS kasutaja
@@ -5070,6 +5119,7 @@
 DocType: Sales Person,Parent Sales Person,Emaettevõtja
 DocType: Student Group Creation Tool,Get Courses,Võta kursused
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kuna objekt on põhivara. Palun kasutage mitme rea jaoks eraldi rida."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Tööaeg, millest allpool on märgitud puudumine. (Zero keelamiseks)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tehingus on lubatud ainult lehe sõlmed
 DocType: Grant Application,Organization,Organisatsioon
 DocType: Fee Category,Fee Category,Tasu kategooria
@@ -5082,6 +5132,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Palun uuendage oma treeningute olekut
 DocType: Volunteer,Morning,Hommik
 DocType: Quotation Item,Quotation Item,Tsitaat
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Probleemi prioriteet.
 DocType: Journal Entry,Credit Card Entry,Krediitkaardi sisestamine
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Ajavahemik vahele jäi, pesa {0} kuni {1} kattub olemasoleva piluga {2} kuni {3}"
 DocType: Journal Entry Account,If Income or Expense,Kui tulu või kulu
@@ -5132,11 +5183,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Andmete import ja seaded
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Kui automaatne sisselülitamine on kontrollitud, seotakse kliendid automaatselt vastava lojaalsusprogrammiga (salvestatud)"
 DocType: Account,Expense Account,Kulukonto
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Aeg enne vahetuse algusaega, mille jooksul peetakse töötajate registreerimist."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Seos Guardianiga1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Loo arve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Maksetaotlus on juba olemas {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0} -st vabastatud töötaja peab olema määratud vasakule
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Maksa {0} {1}
+DocType: Company,Sales Settings,Müügi seaded
 DocType: Sales Order Item,Produced Quantity,Toodetud kogus
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Tsiteerimistaotlust saab kasutada klikkides järgmisele lingile
 DocType: Monthly Distribution,Name of the Monthly Distribution,Igakuise jaotuse nimi
@@ -5215,6 +5268,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Müügiks ja ostmiseks luuakse vaikimisi maksumallid.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Jätmistüüpi {0} ei saa edasi kanda
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Konto debiteerimiseks peab olema saadaolev konto
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Lepingu lõppkuupäev ei saa olla väiksem kui täna.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Palun määrake konto {0} laos või vaikevarude konto ettevõttes {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Määra vaikimisi
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Selle pakendi netokaal. (arvutatakse automaatselt kauba netokaalu summana)
@@ -5241,8 +5295,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Aegunud partiid
 DocType: Shipping Rule,Shipping Rule Type,Saatmise reegli tüüp
 DocType: Job Offer,Accepted,Vastu võetud
-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","Palun eemaldage töötaja <a href=""#Form/Employee/{0}"">{0}</a> selle dokumendi tühistamiseks"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Olete hindamiskriteeriume juba hinnanud {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Valige Batch Numbers
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Vanus (päeva)
@@ -5268,6 +5320,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Valige oma domeenid
 DocType: Agriculture Task,Task Name,Ülesande nimi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Varude kirjed on juba loodud töökorralduse jaoks
+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","Palun eemaldage töötaja <a href=""#Form/Employee/{0}"">{0}</a> selle dokumendi tühistamiseks"
 ,Amount to Deliver,Saadav kogus
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Ettevõtet {0} ei eksisteeri
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Ühtegi ootel olevaid materjali puudutavaid taotlusi ei leitud.
@@ -5317,6 +5371,7 @@
 DocType: Lab Prescription,Test Code,Testkood
 DocType: Purchase Taxes and Charges,On Previous Row Total,Eelmisel real kokku
 DocType: Student,Student Email Address,Õpilase e-posti aadress
+,Delayed Item Report,Viivitatud kirje aruanne
 DocType: Academic Term,Education,Haridus
 DocType: Supplier Quotation,Supplier Address,Tarnija aadress
 DocType: Salary Detail,Do not include in total,Ärge lisage kokku
@@ -5324,7 +5379,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ei eksisteeri
 DocType: Purchase Receipt Item,Rejected Quantity,Tagasilükatud kogus
 DocType: Cashier Closing,To TIme,TIme
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Konversioonitegur ({0} -&gt; {1}) üksusele: {2} ei leitud
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Igapäevane töö kokkuvõte Grupi kasutaja
 DocType: Fiscal Year Company,Fiscal Year Company,Eelarveaasta ettevõte
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,"Alternatiivne kirje ei tohi olla sama, mis kirje kood"
@@ -5376,6 +5430,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Edastamise peatamise vaheline viivitus
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Varud varud vanemad kui [päevad]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Reklaamiskeemi toote allahindlus
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Probleemi prioriteet on juba olemas
 DocType: Account,Asset Received But Not Billed,"Vara sai, kuid mitte arveldatud"
 DocType: POS Closing Voucher,Total Collected Amount,Kogutud kogusumma kokku
 DocType: Course,Default Grading Scale,Vaikimisi liigitamise skaala
@@ -5418,6 +5473,7 @@
 DocType: Contract,Fulfilment Terms,Täitmise tingimused
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Mitte gruppi gruppi
 DocType: Student Guardian,Mother,Ema
+DocType: Issue,Service Level Agreement Fulfilled,Teenustaseme kokkulepe on täidetud
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Mahaarvamine palgata töötajate hüvitiste eest
 DocType: Travel Request,Travel Funding,Reiside rahastamine
 DocType: Shipping Rule,Fixed,Fikseeritud
@@ -5447,10 +5503,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Üksusi ei leitud.
 DocType: Item Attribute,From Range,Alates vahemikust
 DocType: Clinical Procedure,Consumables,Tarbekaubad
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,Vajalik on „workers_field_value” ja „timestamp”.
 DocType: Purchase Taxes and Charges,Reference Row #,Viite rida #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Määrake ettevõttes {0} „Varade amortisatsioonikeskus”
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,"Rida # {0}: maksevahend on nõutav, et lõpule viia"
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Klõpsake seda nuppu, et tõmmata oma müügitellimuse andmed Amazon MWS-ist."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Tööaeg, millest allpool on märgitud poolpäev. (Zero keelamiseks)"
 ,Assessment Plan Status,Hindamiskava staatus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Valige kõigepealt {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Esita see, et luua töötajate rekord"
@@ -5521,6 +5579,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Määra avatud
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Lülitage filtrid sisse
 DocType: Production Plan,Material Request Detail,Materjali tellimise üksikasjad
+DocType: Shift Type,Process Attendance After,Protsessi osalemine pärast
 DocType: Material Request Item,Quantity and Warehouse,Kogus ja ladu
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Avage programmid
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Rida # {0}: dubleeriv kirje viites {1} {2}
@@ -5578,6 +5637,7 @@
 DocType: Pricing Rule,Party Information,Partei teave
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Võlgnikud ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Praeguseks ei saa see ületada töötaja vabastamise kuupäeva
+DocType: Shift Type,Enable Exit Grace Period,Luba väljumisperiood
 DocType: Expense Claim,Employees Email Id,Töötajate e-posti ID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Uuenda hinda alates Shopify kuni ERPNext Hinnakiri
 DocType: Healthcare Settings,Default Medical Code Standard,Meditsiinilise koodi vaikimisi standard
@@ -5608,7 +5668,6 @@
 DocType: Budget,Applicable on Material Request,Kohaldatakse materiaalsele taotlusele
 DocType: Support Settings,Search APIs,Otsi API-sid
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Müügitellimuse ületootmine
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Tehnilised andmed
 DocType: Purchase Invoice,Supplied Items,Tarnitud üksused
 DocType: Leave Control Panel,Select Employees,Valige Töötajad
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Vali laenu {0} intressitulu konto
@@ -5634,7 +5693,7 @@
 ,Supplier-Wise Sales Analytics,Tarnija-tark müügi analüüs
 DocType: GSTR 3B Report,February,Veebruar
 DocType: Appraisal,For Employee,Töötaja jaoks
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Tegelik tarnekuupäev
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Tegelik tarnekuupäev
 DocType: Sales Partner,Sales Partner Name,Müügipartneri nimi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Amortisatsioonirida {0}: amortisatsiooni alguskuupäev sisestatakse eelmise kuupäevana
 DocType: GST HSN Code,Regional,Piirkondlik
@@ -5673,6 +5732,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Tarnija tulemustabel
 DocType: Travel Itinerary,Travel To,Reisimine
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark osalemine
+DocType: Shift Type,Determine Check-in and Check-out,Määrake sisse- ja väljaregistreerimine
 DocType: POS Closing Voucher,Difference,Erinevus
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Väike
 DocType: Work Order Item,Work Order Item,Töö tellimuse element
@@ -5706,6 +5766,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Ravim
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} on suletud
 DocType: Patient,Medical History,Meditsiiniline ajalugu
+DocType: Expense Claim,Expense Taxes and Charges,Kulud ja maksud
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Tellimuse tühistamise või märkimise tasumata maksmise päevade arv on möödunud arvete esitamise kuupäevast
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Installimismärkus {0} on juba esitatud
 DocType: Patient Relation,Family,Perekond
@@ -5738,7 +5799,6 @@
 DocType: Dosage Strength,Strength,Tugevus
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,Selle tehingu lõpuleviimiseks oli {2} vajalik {0} ühikut {1}.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Allhankelepingu aluseks olevate toorainete tagasivool
-DocType: Bank Guarantee,Customer,Klient
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Kui see on lubatud, on väljal Academic Term kohustuslik programmi registreerimise tööriistas."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Partii-põhise üliõpilaste rühma puhul kinnitatakse õpilase partii iga õpilase jaoks programmi registreerimisest.
 DocType: Course,Topics,Teemad
@@ -5818,6 +5878,7 @@
 DocType: Chapter,Chapter Members,Peatüki liikmed
 DocType: Warranty Claim,Service Address,Teenuse aadress
 DocType: Journal Entry,Remark,Märkus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rida {0}: Kogus {4} laos {1} ei ole kirje sisestamise ajal ({2} {3}) saadaval
 DocType: Patient Encounter,Encounter Time,Encounter Time
 DocType: Serial No,Invoice Details,Arve andmed
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Täiendavaid kontosid saab teha gruppide all, kuid kirjeid saab teha mitte-gruppide vastu"
@@ -5898,6 +5959,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Sulgemine (avamine + kokku)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriteeriumi valem
 apps/erpnext/erpnext/config/support.py,Support Analytics,Toetage Analyticsit
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Osalemise seadme ID (biomeetrilise / RF-märgise ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Läbivaatamine ja tegevus
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Kui konto on külmutatud, on lubatud piirata kasutajaid."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Summa pärast kulumit
@@ -5919,6 +5981,7 @@
 DocType: Salary Slip,Loan Repayment,Laenu tagasimakse
 DocType: Employee Education,Major/Optional Subjects,Peamised / valikulised õppeained
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Tarnija aadressid ja kontaktid
 DocType: Bank Guarantee,Bank Guarantee Type,Pangagarantii tüüp
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Kui see on keelatud, ei ole „Ümardatud summa” välja näidatud üheski tehingus"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5957,6 +6020,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Arve loomise tööriista kirje avamine
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Kaasa POS tehingud
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Töötajat ei leitud antud töötaja väljale. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Saadud summa (ettevõtte valuuta)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage on täis, ei salvestanud"
 DocType: Chapter Member,Chapter Member,Peatüki liige
@@ -5989,6 +6053,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Ühtegi õpilasgruppi ei loodud.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Dubleerige rida {0} sama {1}
 DocType: Employee,Salary Details,Palk üksikasjad
+DocType: Employee Checkin,Exit Grace Period Consequence,Väljumise aja möödumine
 DocType: Bank Statement Transaction Invoice Item,Invoice,Arve
 DocType: Special Test Items,Particulars,Andmed
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Palun määrake filter elemendi või lao alusel
@@ -6090,6 +6155,7 @@
 DocType: Serial No,Out of AMC,Väljas AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Tööprofiil, nõutavad kvalifikatsioonid jne."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Laev riigile
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Kas soovite esitada materiaalset taotlust
 DocType: Opportunity Item,Basic Rate,Põhihind
 DocType: Compensatory Leave Request,Work End Date,Töö lõppkuupäev
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Tooraine taotlus
@@ -6273,6 +6339,7 @@
 DocType: Sales Order Item,Gross Profit,Brutokasum
 DocType: Quality Inspection,Item Serial No,Tooteseeria nr
 DocType: Asset,Insurer,Kindlustusandja
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Summa ostmine
 DocType: Asset Maintenance Task,Certificate Required,Nõutav sertifikaat
 DocType: Retention Bonus,Retention Bonus,Säilitamise boonus
@@ -6387,6 +6454,8 @@
 DocType: Invoice Discounting,Sanctioned,Karistatud
 DocType: Course Enrollment,Course Enrollment,Kursuse registreerimine
 DocType: Item,Supplier Items,Tarnijate elemendid
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Algusaeg ei tohi olla suurem või võrdne lõpuajaga {0}.
 DocType: Sales Order,Not Applicable,Ei ole kohaldatav
 DocType: Support Search Source,Response Options,Vastuse valikud
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} peaks olema väärtus vahemikus 0 kuni 100
@@ -6472,7 +6541,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Põhivara
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Kokku teenimine
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Kliendirühm&gt; Territoorium
 DocType: Share Balance,From No,Alates nr
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksekorralduse arve
 DocType: Purchase Invoice,Taxes and Charges Added,Lisatud on maksud ja tasud
@@ -6580,6 +6648,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignoreeri hinnakujunduse reeglit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Toit
 DocType: Lost Reason Detail,Lost Reason Detail,Kaotatud põhjus Detail
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Loodi järgmised seerianumbrid: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Kliendi tagasiside
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC üksikasjad
 DocType: Issue,Opening Time,Avamisaeg
@@ -6629,6 +6698,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Ettevõtte nimi ei ole sama
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Töötajate edutamist ei saa esitada enne reklaami kuupäeva
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ei tohi uuendada {0} vanemate varude tehinguid
+DocType: Employee Checkin,Employee Checkin,Töötaja kontroll
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Alguskuupäev peab olema vähem kui lõpp-kuupäev {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Loo kliendi hinnapakkumisi
 DocType: Buying Settings,Buying Settings,Seadete ostmine
@@ -6650,6 +6720,7 @@
 DocType: Patient,Patient Demographics,Patsiendi demograafia
 DocType: Share Transfer,To Folio No,To Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Rahavoog toimingutest
+DocType: Employee Checkin,Log Type,Logi tüüp
 DocType: Stock Settings,Allow Negative Stock,Lubage negatiivne varu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Ühelgi üksusel ei ole koguse või väärtuse muutusi.
 DocType: Asset,Purchase Date,Ostu kuupäev
@@ -6694,6 +6765,7 @@
 DocType: Vital Signs,Very Hyper,Väga hüper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Valige oma ettevõtte olemus.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Palun valige kuu ja aasta
+DocType: Service Level,Default Priority,Vaikimisi prioriteet
 DocType: Student Log,Student Log,Õpilaste logi
 DocType: Shopping Cart Settings,Enable Checkout,Luba Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Inimressursid
@@ -6722,7 +6794,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Ühendage Shopify ERPNext-ga
 DocType: Homepage Section Card,Subtitle,Subtiitrid
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: BOM,Scrap Material Cost(Company Currency),Vanametalli maksumus (ettevõtte valuuta)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Edastamise märkust {0} ei tohi esitada
 DocType: Task,Actual Start Date (via Time Sheet),Tegelik alguskuupäev (ajalehe kaudu)
@@ -6793,7 +6864,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Alltöövõtuks edastatud materjal
 DocType: Job Card,Timing Detail,Ajastuse üksikasjad
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Nõutav On
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} {1} importimine
 DocType: Job Offer Term,Job Offer Term,Tööpakkumise tähtaeg
 DocType: SMS Center,All Contact,Kõik kontaktid
 DocType: Project Task,Project Task,Projekti ülesanne
@@ -6844,7 +6914,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Üksus {0} ei ole seadistatud seerianumbrite kontrollimiseks
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Riik
 DocType: Leave Type,Maximum Continuous Days Applicable,Maksimaalsed pidevad päevad
-apps/erpnext/erpnext/config/support.py,Support Team.,Tugirühm.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Sisestage kõigepealt ettevõtte nimi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importimine on edukas
 DocType: Guardian,Alternate Number,Alternatiivne number
@@ -6936,6 +7005,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Rida # {0}: lisatud üksus
 DocType: Student Admission,Eligibility and Details,Abikõlblikkus ja üksikasjad
 DocType: Staffing Plan,Staffing Plan Detail,Personali plaani detail
+DocType: Shift Type,Late Entry Grace Period,Hilinenud sisenemise ajapikendus
 DocType: Email Digest,Annual Income,Aastane sissetulek
 DocType: Journal Entry,Subscription Section,Tellimuse osa
 DocType: Salary Slip,Payment Days,Maksepäevad
@@ -6985,6 +7055,7 @@
 DocType: Journal Entry Account,Account Balance,Kontojääk
 DocType: Asset Maintenance Log,Periodicity,Perioodilisus
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Meditsiiniline kirje
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Logitüüp on vajalik vahetuses olevate sisselogimiste jaoks: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Täitmine
 DocType: Item,Valuation Method,Hindamismeetod
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} müügiarve {1} vastu
@@ -7069,6 +7140,7 @@
 DocType: Loan Type,Loan Name,Laenu nimi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Määra vaikimisi makseviis
 DocType: Quality Goal,Revision,Läbivaatamine
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Aeg enne vahetuse lõppu, kui check-out loetakse varakult (minutites)."
 DocType: Healthcare Service Unit,Service Unit Type,Teenindusüksuse tüüp
 DocType: Purchase Invoice,Return Against Purchase Invoice,Tagasi ostu arve vastu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Loo saladus
@@ -7224,11 +7296,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmeetika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Kontrollige seda, kui soovite, et kasutaja valiks enne salvestamist seeria. Selle kontrollimisel vaikimisi ei ole."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Selle rolliga kasutajad võivad määrata külmutatud kontosid ning luua / muuta külmutatud kontode raamatupidamisandmeid
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Üksuse kood&gt; Punktirühm&gt; Bränd
 DocType: Expense Claim,Total Claimed Amount,Nõutud summa kokku
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Pakendamine
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Võite uuendada ainult siis, kui teie liikmelisus lõpeb 30 päeva jooksul"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Väärtus peab olema vahemikus {0} kuni {1}
 DocType: Quality Feedback,Parameters,Parameetrid
+DocType: Shift Type,Auto Attendance Settings,Auto osalemise seaded
 ,Sales Partner Transaction Summary,Müügipartnerite tehingute kokkuvõte
 DocType: Asset Maintenance,Maintenance Manager Name,Hooldushalduri nimi
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Üksuse üksikasjad on vaja tõmmata.
@@ -7319,10 +7393,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Valideeri rakendatud reegel
 DocType: Job Card Item,Job Card Item,Töökaardi kirje
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline veebisaidi kodulehele
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Määrake prioriteedi {0} vastuse aeg ja eraldusvõime indeksis {1}.
 DocType: Company,Round Off Cost Center,Kulude vähendamise keskus
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteeriumid Kaal
 DocType: Asset,Depreciation Schedules,Amortisatsioonikavad
-DocType: Expense Claim Detail,Claim Amount,Nõude summa
 DocType: Subscription,Discounts,Soodustused
 DocType: Shipping Rule,Shipping Rule Conditions,Kohaletoimetamise reeglite tingimused
 DocType: Subscription,Cancelation Date,Tühistamise kuupäev
@@ -7350,7 +7424,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Näita nullväärtusi
 DocType: Employee Onboarding,Employee Onboarding,Töötaja onboarding
 DocType: POS Closing Voucher,Period End Date,Perioodi lõppkuupäev
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Müügivõimalused allikate kaupa
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Esimene lahkumise heakskiitja loendis valitakse vaikimisi lahkumiseks.
 DocType: POS Settings,POS Settings,POS seaded
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Kõik kontod
@@ -7371,7 +7444,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rida # {0}: määr peab olema sama kui {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Tervishoiuteenuste üksused
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Ühtegi kirjet ei leitud
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Vananemise vahemik 3
 DocType: Vital Signs,Blood Pressure,Vererõhk
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Sihtpunkt On
@@ -7418,6 +7490,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Partiid
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Kaitse
 DocType: Item,Has Batch No,Kas partii nr
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Viivitatud päevad
 DocType: Lead,Person Name,Isiku nimi
 DocType: Item Variant,Item Variant,Üksus Variant
 DocType: Training Event Employee,Invited,Kutsutud
@@ -7439,7 +7512,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Algus- ja lõppkuupäevad ei ole kehtivas palgaarvestusperioodis, ei saa arvutada {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Näita ainult nende kliendirühmade klienti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Valige arve salvestamiseks üksused
-DocType: Service Level,Resolution Time,Lahenduse aeg
+DocType: Service Level Priority,Resolution Time,Lahenduse aeg
 DocType: Grading Scale Interval,Grade Description,Hinne kirjeldus
 DocType: Homepage Section,Cards,Kaardid
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kvaliteedi koosolekute protokollid
@@ -7466,6 +7539,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Panga väljavõtte saldo vastavalt pearaamatule
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Tervishoid (beeta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,"Vaikimisi ladu, et luua müügitellimus ja tarneteatis"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,{0} vastuse aeg indeksis {1} ei saa olla suurem kui eraldusvõime aeg.
 DocType: Opportunity,Customer / Lead Name,Kliendi / plii nimi
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Taotlemata summa
@@ -7512,7 +7586,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Poolte ja aadresside importimine
 DocType: Item,List this Item in multiple groups on the website.,Märkige see üksus veebisaidil mitmesse rühma.
 DocType: Request for Quotation,Message for Supplier,Sõnum tarnijale
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"{0} ei saa muuta, kuna on olemas kirje {1} tehingutehing."
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Meeskonna liige
 DocType: Asset Category Account,Asset Category Account,Varakategooria konto
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 29caa0c..b9a0823 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,انتصاب {0} و صورتحساب فروش {1} لغو شد
 DocType: Purchase Receipt,Vehicle Number,شماره خودرو
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,آدرس ایمیل شما ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,شامل پیش نویس های کتاب
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,شامل پیش نویس های کتاب
 DocType: Activity Cost,Activity Type,نوع فعالیت
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیش پرداخت شده
 DocType: Company,Gain/Loss Account on Asset Disposal,حساب سود / زیان در دفع دارایی
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,نوشته های پرداختی
 DocType: Employee Education,Class / Percentage,کلاس / درصد
 ,Electronic Invoice Register,ثبت نام صورت حساب الکترونیکی
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,تعداد حوادث پس از آن نتیجه انجام می شود.
 DocType: Sales Invoice,Is Return (Credit Note),آیا بازگشت (اعتبار یادداشت)
+DocType: Price List,Price Not UOM Dependent,قیمت وابسته به UOM نیست
 DocType: Lab Test Sample,Lab Test Sample,آزمایش آزمایشی نمونه
 DocType: Shopify Settings,status html,وضعیت HTML
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",برای مثال 2012، 2012-13
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,پرداخت خالص
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,مجموع مصارف مصوب
 DocType: Clinical Procedure,Consumables Invoice Separately,فاکتور مصرفی جداگانه
+DocType: Shift Type,Working Hours Threshold for Absent,آستانه کار برای ساعات کاری
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR--YY.-MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},بودجه را نمی توان به حساب گروهی اختصاص داد {0}
 DocType: Purchase Receipt Item,Rate and Amount,نرخ و مقدار
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,از تنظیمات بیمار
 DocType: Asset,Insurance End Date,تاریخ پایان بیمه
 DocType: Bank Account,Branch Code,کد شعبه
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,زمان پاسخ دادن
 apps/erpnext/erpnext/public/js/conf.js,User Forum,انجمن کاربر
 DocType: Landed Cost Item,Landed Cost Item,مورد هزینه فرود
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,فروشنده و خریدار نمیتوانند یکسان باشند
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,منتقل کردن
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),مورد جستجو (Ctrl + I)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} نتایج ارسال شده
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,از تاریخ نمی تواند بیشتر از تاریخ باشد
 DocType: Supplier,Supplier of Goods or Services.,تامین کننده کالا یا خدمات.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,نام حساب جدید توجه: لطفا برای مشتریان و تامین کنندگان حساب کاربری ایجاد نکنید
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,گروه دانشجویی یا دوره برنامه اجباری است
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,نام مهارت
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,کارت گزارش چاپ
 DocType: Soil Texture,Ternary Plot,قطعه سه بعدی
-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; نامگذاری سری انتخاب کنید
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,بلیط های پشتیبانی
 DocType: Asset Category Account,Fixed Asset Account,حساب دارایی ثابت
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,آخرین
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,اجباری برای برگه تعادل
 DocType: Payment Entry,Total Allocated Amount,مجموع مبلغ اختصاص داده شده
 DocType: Sales Invoice,Get Advances Received,دریافت پیشرفت دریافت شده
+DocType: Shift Type,Last Sync of Checkin,آخرین همگام سازی چک
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,مورد مالیات شامل مقدار است
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,گروه خونی
 apps/erpnext/erpnext/config/healthcare.py,Masters,کارشناسی ارشد
 DocType: Crop,Crop Spacing UOM,فاصله کاشت UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,زمان پس از تغییر زمان شروع زمانی که ورود به سیستم به عنوان دیر (در دقیقه) در نظر گرفته شده است.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,کاوش
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,فاکتورهای قابل توجهی یافت نشد
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} جایزه ها و {1} بودجه برای {2} برای شرکت های تابعه قبلا {3} برنامه ریزی شده است. شما فقط می توانید تا {4} جای خالی و بودجه {5} را به عنوان برنامۀ کارکنان {6} برای شرکت مادرتان {3} برنامه ریزی کنید.
 DocType: Promotional Scheme,Product Discount Slabs,صفحات تخفیف محصولات
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,میانگین متحرک
 DocType: Employee Attendance Tool,Unmarked Attendance,حضور بدون مارک
 DocType: Homepage Section,Number of Columns,تعداد ستون ها
+DocType: Issue Priority,Issue Priority,اولویت مسئله
 DocType: Holiday List,Add Weekly Holidays,تعطیلات هفتگی اضافه کنید
 DocType: Shopify Log,Shopify Log,Shopify ورود
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,ایجاد لغزش حقوق
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,تاریخ انتشار
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته برای مورد {0} را انتخاب کنید. قادر به یافتن یک دسته ای نیست که این الزام را برآورده کند
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,می توانید Bonus Retention برای کارکنان سمت چپ ایجاد کنید
+DocType: Employee Checkin,Location / Device ID,شناسه مکان / دستگاه
 DocType: Purchase Order,To Receive,برای دریافت
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین هستید شما تا زمانی که شبکه ندارید قادر به بارگیری مجدد نیستید.
 DocType: Course Activity,Enrollment,ثبت نام
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},حداکثر: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-Invoicing اطلاعات گم شده
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,درخواست مادری ایجاد نشد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 DocType: Loan,Total Amount Paid,کل مبلغ پرداخت شده
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,همه این موارد قبلا محاسبه شده اند
 DocType: Training Event,Trainer Name,نام مربی
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},لطفا نام سرب در سرب را ذکر کنید {0}
 DocType: Employee,You can enter any date manually,شما می توانید هر تاریخ را به صورت دستی وارد کنید
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد تقسیم سهام
+DocType: Shift Type,Early Exit Consequence,پس از خروج زودرس
 DocType: Item Group,General Settings,تنظیمات عمومی
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,تاریخ تحویل نمی تواند قبل از ارسال / تامین کننده صورتحساب تاریخ
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,قبل از ارسال نام بنیانگذار را وارد کنید.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,تاییدیه پرداخت
 ,Available Stock for Packing Items,موجودی موجود برای اقلام بسته بندی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} را از C-Form {1} حذف کنید
+DocType: Shift Type,Every Valid Check-in and Check-out,هر Valid Check-in و Check-out
 DocType: Support Search Source,Query Route String,خط مسیر درخواست
 DocType: Customer Feedback Template,Customer Feedback Template,قالب بازخورد مشتری
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,نقل قول به مشتریان یا مشتریان.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 ,Daily Work Summary Replies,روزانه کار خلاصه پاسخ ها
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},شما برای همکاری در پروژه دعوت شده اید: {0}
+DocType: Issue,Response By Variance,پاسخ با اختلاف
 DocType: Item,Sales Details,جزئیات فروش
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,نامه سر برای قالب های چاپ
 DocType: Salary Detail,Tax on additional salary,مالیات بر حقوق و دستمزد اضافی
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,پیشرفت کار
 DocType: Journal Entry,Opening Entry,ورودی افتتاحیه
 DocType: Bank Guarantee,Charges Incurred,اتهامات ناشی شده است
+DocType: Shift Type,Working Hours Calculation Based On,محاسبه ساعات کار بر اساس
 DocType: Work Order,Material Transferred for Manufacturing,ماده انتقال برای ساخت
 DocType: Products Settings,Hide Variants,مخفی کردن گزینه ها
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,غیر فعال کردن برنامه ریزی ظرفیت و ردیابی زمان
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,منافع
 DocType: Purchase Receipt Item Supplied,Consumed Qty,تعداد مصرفی
 DocType: Education Settings,Education Manager,مدیر آموزش
+DocType: Employee Checkin,Shift Actual Start,شروع واقعی جابجایی
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,برنامه زمانبندی زمانبندیهای خارج از ایستگاه کاری ایستگاه کاری.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},امتیازات وفاداری: {0}
 DocType: Healthcare Settings,Registration Message,پیام ثبت نام
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,صورتحساب برای هر ساعت صدور صورت حساب آماده شده است
 DocType: Sales Partner,Contact Desc,تماس با Desc
 DocType: Purchase Invoice,Pricing Rules,قوانین قیمت گذاری
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",همانطور که معاملات موجود در مورد {0} وجود دارد، شما نمی توانید مقدار {1} را تغییر دهید
 DocType: Hub Tracked Item,Image List,لیست تصویر
 DocType: Item Variant Settings,Allow Rename Attribute Value,اجازه ارزش نام متغیر را تغییر دهید
-DocType: Price List,Price Not UOM Dependant,قیمت وابسته به UOM نیست
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),زمان (در دقیقه)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,پایه ای
 DocType: Loan,Interest Income Account,حساب درآمد بهره
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,مشخصات POS را انتخاب کنید
 DocType: Support Settings,Get Latest Query,دریافت آخرین درخواست
 DocType: Employee Incentive,Employee Incentive,مشوق کارمند
+DocType: Service Level,Priorities,اولویت های
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,کارت و یا بخش های سفارشی را در صفحه اصلی اضافه کنید
 DocType: Homepage,Hero Section Based On,بخش قهرمان بر اساس
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید کل (از طریق صورتحساب خرید)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,مقدار سفارش شده
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: انبار رد شده در مورد رد Item {1} اجباری است
 ,Received Items To Be Billed,اقلامی که دریافت کردید باید پرداخت شود
-DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
+DocType: Attendance,Working Hours,ساعات کاری
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,حالت پرداخت
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,اقلام سفارش خرید در زمان دریافت نشده است
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,مدت زمان روز
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و سایر اطلاعات کلی درباره تامین کننده شما
 DocType: Item Default,Default Selling Cost Center,مرکز فروش پیش فروش
 DocType: Sales Partner,Address & Contacts,آدرس و مخاطبین
-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: Subscriber,Subscriber,مشترک
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# فرم / مورد / {0}) موجود نیست
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,لطفا ابتدا تاریخ ارسال را انتخاب کنید
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,وظایف ایجاد شده
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,پیش فرض BOM ({0}) باید برای این آیتم یا قالب آن فعال باشد
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,کمیسیون نرخ٪
-DocType: Service Level,Response Time,زمان پاسخ
+DocType: Service Level Priority,Response Time,زمان پاسخ
 DocType: Woocommerce Settings,Woocommerce Settings,تنظیمات Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,مقدار باید مثبت باشد
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,نقشه برداری داده های تراکنش
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,سرب نیاز به نام فرد یا نام سازمان دارد
 DocType: Student,Guardians,نگهبانان
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفا سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات تحصیلی تنظیم کنید
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,برند را انتخاب کنید ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,درآمد متوسط
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},ضبط حضور {0} علیه دانشجو {1} وجود دارد
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,تاریخ معامله
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,لغو عضویت
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,توافقنامه سطح خدمات تنظیم نمی شود {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,مقدار حقوق خالص
 DocType: Account,Liability,مسئولیت
 DocType: Employee,Bank A/C No.,بانک A / C شماره
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,کد کالا مواد اولیه
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه شده است
 DocType: Fees,Student Email,ایمیل دانشجو
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},بازگشت BOM: {0} نمی تواند والد یا فرزند {2} باشد
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,مواردی را از خدمات بهداشتی دریافت کنید
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,ورودی سهام {0} ارائه نشده است
 DocType: Item Attribute Value,Item Attribute Value,مقدار مشخصه مورد
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,آیتم های انتخاب را انتخاب کنید
 DocType: Leave Application,Leave Approver Name,خروج نام تأیید کننده
 DocType: Shareholder,Shareholder,سهامدار
-DocType: Issue,Agreement Status,وضعیت توافق
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,تنظیمات پیش فرض برای فروش معاملات.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,لطفا پذیرش دانشجویی را انتخاب کنید که برای متقاضی دانشجویی پرداخت می شود
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,انتخاب BOM
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,حساب درآمد
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,تمام انبارها
 DocType: Contract,Signee Details,جزئیات Signee
+DocType: Shift Type,Allow check-out after shift end time (in minutes),اجازه چک کردن پس از پایان زمان تغییر (در دقیقه)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,تدارکات
 DocType: Item Group,Check this if you want to show in website,اگر می خواهید در وب سایت نشان داده شود، این را بررسی کنید
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,سال مالی {0} یافت نشد
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,نرخ بیلبورد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},هشدار: یکی دیگر از {0} # {1} علیه ورود سهام است {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,لطفا تنظیمات Google Maps را برای تخمین و بهینه سازی مسیرها فعال کنید
+DocType: Purchase Invoice Item,Page Break,شکستن صفحه
 DocType: Supplier Scorecard Criteria,Max Score,حداکثر امتیاز
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,تاریخ شروع بازپرداخت نمی تواند قبل از تاریخ پرداخت باشد.
 DocType: Support Search Source,Support Search Source,پشتیبانی از منبع جستجو
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,انتقال کارفرمایان
 ,Sales Funnel,ورقه فروش
 DocType: Agriculture Analysis Criteria,Water Analysis,تجزیه و تحلیل آب
+DocType: Shift Type,Begin check-in before shift start time (in minutes),قبل از شروع تغییر زمان شروع ثبت نام (در دقیقه)
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,چیزی برای ویرایش وجود ندارد.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملیات {0} طولانی تر از هر ساعات کاری در ایستگاه کاری {1}، عملیات را به عملیات چندگانه مختل می کند
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},سفارش فروش {0} {1} است
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),تاخیر در پرداخت (روز)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,جزئیات استهلاک را وارد کنید
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,سفارش خرید مشتری
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,تاریخ تحویل منتخب باید پس از تاریخ سفارش فروش باشد
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,مقدار مورد نمیتواند صفر باشد
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,خصیصه نامعتبر
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},لطفا BOM را در مورد {0} انتخاب کنید
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,نوع فاکتور
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,بعد از ظهر
 DocType: Vital Signs,Nutrition Values,ارزش تغذیه ای
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),وجود تب (دماي 38.5 درجه سانتی گراد / 101.3 درجه فارنهایت یا دمای پایدار&gt; 38 درجه سانتی گراد / 100.4 درجه فارنهایت)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارکنان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC معکوس
 DocType: Project,Collect Progress,جمع آوری پیشرفت
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,انرژی
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,آیتم های مرتب شده باید پرداخت شود
 DocType: Taxable Salary Slab,To Amount,به مقدار
 DocType: Purchase Invoice,Is Return (Debit Note),آیا بازگشت (توجه توجه)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 apps/erpnext/erpnext/config/desktop.py,Getting Started,شروع شدن
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ادغام
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,تاریخ شروع مالی سال مالی و تاریخ پایان سال مالی یک سال مالی را نتوانید تغییر دهید.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع تعمیر و نگهداری قبل از تاریخ تحویل برای سریال نمی باشد {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,ردیف {0}: نرخ ارز اجباری است
 DocType: Purchase Invoice,Select Supplier Address,انتخاب آدرس تأمین کننده
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",مقدار موجود {0} است، شما نیاز دارید {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,لطفا API Consumer راز وارد کنید
 DocType: Program Enrollment Fee,Program Enrollment Fee,هزینه ثبت نام برنامه
+DocType: Employee Checkin,Shift Actual End,پایان واقعی شیت
 DocType: Serial No,Warranty Expiry Date,تاریخ انقضای گارانتی
 DocType: Hotel Room Pricing,Hotel Room Pricing,قیمت اتاق هتل
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted",منابع مالیاتی بیرونی (غیر از صفر امتیاز، بدون امتیاز و معافیت)
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,خواندن 5
 DocType: Shopping Cart Settings,Display Settings,تنظیمات نمایشگر
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,لطفا مقدار Depreciations Booked را تنظیم کنید
+DocType: Shift Type,Consequence after,نتیجه پس از
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,با چه چیزی به کمک نیاز دارید؟
 DocType: Journal Entry,Printing Settings,تنظیمات چاپ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,بانکداری
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,آدرس صورتحساب همانند آدرس حمل و نقل است
 DocType: Account,Cash,نقدی
 DocType: Employee,Leave Policy,ترک سیاست
+DocType: Shift Type,Consequence,نتیجه
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,آدرس دانشجو
 DocType: GST Account,CESS Account,حساب CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: مرکز هزینه برای حساب سود و زیان {2} لازم است. لطفا هزینه مرکز پیش فرض شرکت را تنظیم کنید.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,دوره تعطیل کوپن
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,نام محافظ 2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,لطفا حساب هزینه را وارد کنید
+DocType: Issue,Resolution By Variance,قطعنامه با واریانس
 DocType: Employee,Resignation Letter Date,تاریخ استعفای
 DocType: Soil Texture,Sandy Clay,خاک رس شنی
 DocType: Upload Attendance,Attendance To Date,حضور به تاریخ
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,مشاهده کن
 DocType: Item Price,Valid Upto,اعتبار دارد تا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Doctype مرجع باید یکی از {0}
+DocType: Employee Checkin,Skip Auto Attendance,از دست رفتن حضور خودکار
 DocType: Payment Request,Transaction Currency,پول معامله
 DocType: Loan,Repayment Schedule,برنامه بازپرداخت
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,ایجاد ضمانت ورودی نمونه
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,بستن بسته مالیات کوپن
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,اقدام ابتکاری
 DocType: POS Profile,Applicable for Users,مناسب برای کاربران
+,Delayed Order Report,گزارش سفارش تاخیر شده
 DocType: Training Event,Exam,امتحان
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,تعداد اشتباهی از نوشته های عمومی لجر موجود است. شما ممکن است یک حساب اشتباه در معامله را انتخاب کنید.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,خط لوله فروش
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,شرایط در تمام موارد مورد انتخاب ترکیب می شود.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,پیکربندی
 DocType: Hotel Room,Capacity,ظرفیت
+DocType: Employee Checkin,Shift End,پایان شفت
 DocType: Installation Note Item,Installed Qty,تعداد نصب شده
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,دسته {0} مورد {1} غیرفعال است.
 DocType: Hotel Room Reservation,Hotel Reservation User,کاربر رزرو هتل
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,روز کاری دو بار تکرار شده است
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,توافقنامه سطح خدمات با نوع شخص {0} و Entity {1} در حال حاضر وجود دارد.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},گروه مورد در مورد آیتم در مورد item {0} ذکر نشده است
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},خطای نام: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,قلمرو مورد نیاز در مشخصات POS است
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,تاریخ برنامه
 DocType: Packing Slip,Package Weight Details,وزن بسته بندی جزئیات
 DocType: Job Applicant,Job Opening,باز شدن موقعیت شغلی
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,آخرین همگام سازی موفقیت آمیز کارکنان Checkin. فقط اگر این اطمینان را داشته باشید که تمام سیاهههای مربوطه از همه مکانها همگامسازی شده است، این تنظیم را دوباره انجام دهید. لطفا این را اصلاح نکنید اگر مطمئن نیستید
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,هزینه واقعی
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),پیش پرداخت ({0}) در برابر سفارش {1} نمیتواند بیشتر از مجموع کل ({2} باشد)
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,گزینه های مورد نسخه به روز شده است
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,دریافت صورتحساب
 DocType: Tally Migration,Is Day Book Data Imported,اطلاعات کتاب روز وارد شده است
 ,Sales Partners Commission,کمپانی Sales Partners
+DocType: Shift Type,Enable Different Consequence for Early Exit,تأثیرات مختلفی را برای خروج زودرس ایجاد کنید
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,قانونی
 DocType: Loan Application,Required by Date,مورد نیاز تاریخ
 DocType: Quiz Result,Quiz Result,نتایج امتحان
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,قیمت گذاری قانون
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},لیست تعطیلات اختیاری برای مدت زمان تعطیلات تنظیم نمی شود {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,لطفا فیلد User ID را در یک رکورد Employee تنظیم کنید تا نقش کارکنان را تعیین کنید
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,زمان برای حل کردن
 DocType: Training Event,Training Event,رویداد آموزش
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",فشار خون در حالت طبیعی در بزرگسالان تقریبا 120 میلی متر جیوه سینوس و mmHg 80 میلیمتر دیاستولیک است، به اختصار &quot;120/80 mmHg&quot;
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,اگر مقدار محدود صفر باشد، سیستم تمام ورودی ها را بر می گرداند.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,تایید شده
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},از تاریخ باید در سال مالی باشد. فرض از تاریخ = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,لطفا گروه تامین کننده را در تنظیمات خرید خریداری کنید.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} وضعیت حضور نامعتبر است
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,افتتاح حساب موقت
 DocType: Purchase Invoice,Cash/Bank Account,حساب نقدی / حساب بانکی
 DocType: Quality Meeting Table,Quality Meeting Table,میز جلسه کیفیت
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و تنباکو
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,برنامه درس
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات دقیق مالیاتی
+DocType: Shift Type,Attendance will be marked automatically only after this date.,شرکت کنندگان تنها پس از این تاریخ به طور خودکار مشخص می شوند.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,لوازم مورد نیاز برای نگهدارندگان UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,درخواست نقل قول
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,پس از ورود به حساب با استفاده از ارز دیگر، ارز را نمی توان تغییر داد
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,مورد از مرکز است
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,روش کیفی
 DocType: Share Balance,No of Shares,بدون سهام
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: تعداد موجود در {4} در انبار {1} در زمان ارسال ورودی ({2} {3} موجود نیست)
 DocType: Quality Action,Preventive,پیشگیرانه
 DocType: Support Settings,Forum URL,نشانی اینترنتی انجمن
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,کارمند و شرکت کننده
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,پیش فرض مالیات و هزینه ها
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,این بر مبنای معاملات در برابر این تامین کننده است. برای جزئیات بیشتر به جدول زمانی مراجعه کنید
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,تاریخ شروع و پایان برای موافقت نامه را وارد کنید.
 DocType: Delivery Note Item,Against Sales Invoice,علیه صورتحساب فروش
 DocType: Loyalty Point Entry,Purchase Amount,مبلغ خرید
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,نمی توان به عنوان سفارش خرید تعیین کرد.
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,نام سازمان
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,درست از زمینه های معتبر و معتبر به صورت تجمعی اجباری است
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: بیت No باید همانند {1} {2} باشد
-DocType: Employee,Leave Details,ترک جزئیات
+DocType: Employee Checkin,Shift Start,شروع شیب
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} یخ زده می شوند
 DocType: Driver,Issuing Date,تاریخ صدور
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,درخواست کننده
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,نمودار جریان نقدی جزئیات الگو
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,استخدام و آموزش
 DocType: Drug Prescription,Interval UOM,فاصله UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,تنظیمات دوره گریس برای حضور خودکار
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,از ارز و به ارز نمی تواند یکسان باشد
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,داروها
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,ساعت پشتیبانی
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} لغو یا بسته است
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ردیف {0}: پیشرفت در برابر مشتری باید اعتبار باشد
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),گروه با کوپن (تثبیت شده)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,مدیریت سرزمین
 DocType: Lab Test,Sample ID,شناسه نمونه
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,سبد خرید خالی است
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,حضور به عنوان چک در هر کارمند مشخص شده است
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,دارایی {0} باید ارسال شود
 ,Absent Student Report,گزارش دانشجویی موجود نیست
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,شامل درآمد ناخالص
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,مبلغ جمع آوری شده
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ارائه نشده است بنابراین عملیات تکمیل نمی شود
 DocType: Subscription,Trial Period End Date,تاریخ پایان دوره آزمایشی
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,ورودی های متناوب به عنوان IN و OUT در طول تغییر همان
 DocType: BOM Update Tool,The new BOM after replacement,BOM جدید بعد از جایگزینی
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,تامین کننده&gt; نوع عرضه کننده
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,مورد 5
 DocType: Employee,Passport Number,شماره پاسپورت
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,افتتاح موقت
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,تامین کننده احتمالی
 ,Issued Items Against Work Order,مقررات صادر شده علیه سفارش کار
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,ایجاد {0} صورتحساب
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفا سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات تحصیلی تنظیم کنید
 DocType: Student,Joining Date,تاریخ عضویت
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,درخواست سایت
 DocType: Purchase Invoice,Against Expense Account,علیه حساب هزینه
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,هزینه های قابل اعمال
 ,Point of Sale,نقطه فروش
 DocType: Authorization Rule,Approving User  (above authorized value),تأیید کاربر (بالاتر از ارزش مجاز)
+DocType: Service Level Agreement,Entity,شخصیت
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} از {2} تا {3} منتقل شده است
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},مشتری {0} به پروژه تعلق ندارد {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,از نام حزب
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),ترکیب ماسه (٪)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP- .YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,واردات کتاب روز معلومات
+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; نامگذاری سری انتخاب کنید
 DocType: Asset,Asset Owner Company,دارایی شرکت مالک
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,هزینه اداره مورد نیاز برای رزرو ادعای هزینه است
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} شماره سریال معتبر برای مورد {1}
@@ -3398,7 +3431,6 @@
 DocType: Asset,Asset Owner,صاحب دارایی
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},انبار برای اجناس اجباری است Item {0} در ردیف {1}
 DocType: Stock Entry,Total Additional Costs,مجموع هزینه های اضافی
-DocType: Marketplace Settings,Last Sync On,آخرین همگام سازی در
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,لطفا حداقل یک ردیف را در جدول مالیات و هزینه ها تنظیم کنید
 DocType: Asset Maintenance Team,Maintenance Team Name,نام تیم تعمیر و نگهداری
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,نمودار مراکز هزینه
@@ -3414,12 +3446,12 @@
 DocType: Job Card,WIP Warehouse,انبار WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ- .YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},شناسه کاربر برای کارمند تنظیم نمی شود {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}",تعداد موجود است {0}، شما نیاز دارید {1}
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,کاربر {0} ایجاد شد
 DocType: Stock Settings,Item Naming By,مورد نامگذاری توسط
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,مرتب شده
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,این گروه مشتری ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,درخواست مواد {0} لغو یا متوقف می شود
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,به طور جدی بر اساس ورود به سیستم در چک کارمند
 DocType: Purchase Order Item Supplied,Supplied Qty,تعداد عرضه شده
 DocType: Cash Flow Mapper,Cash Flow Mapper,جریان نقدی نشانگر
 DocType: Soil Texture,Sand,شن
@@ -3478,6 +3510,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,گروه اقلام تکراری در جدول گروه مورد یافت می شود
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,حقوق سالانه
 DocType: Supplier Scorecard,Weighting Function,تابع وزن
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Conversion factor ({0} -&gt; {1}) برای مورد یافت نشد: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,خطا در ارزیابی فرمول معیار
 ,Lab Test Report,آزمایش آزمایشی گزارش
 DocType: BOM,With Operations,با عملیات
@@ -3491,6 +3524,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,هیچ مجوزی برای ورود مجله وجود ندارد
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} دانشجو غیر فعال است
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ورودی سهام
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},مجاز BOM: {0} نمی تواند والد یا فرزند {1} باشد
 DocType: Employee Onboarding,Activities,فعالیت ها
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,یک انبار انبوه اجباری است
 ,Customer Credit Balance,تعادل اعتباری مشتری
@@ -3503,9 +3537,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,برنامه وفاداری چندگانه برای مشتری. لطفا به صورت دستی انتخاب کنید
 DocType: Patient,Medication,داروی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,برنامه وفاداری را انتخاب کنید
+DocType: Employee Checkin,Attendance Marked,شرکت کنندگان در نشست
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,مواد خام
 DocType: Sales Order,Fully Billed,کاملا تخفیف داده شده
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},لطفا قیمت اتاق هتل را برای {} تنظیم کنید
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,فقط یک اولویت به عنوان پیش فرض را انتخاب کنید.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},لطفا شناسه / ایجاد حساب کاربری (Ledger) برای نوع - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,مبلغ کل اعتبار / بدهی باید همانند ورود مجله مجله باشد
 DocType: Purchase Invoice Item,Is Fixed Asset,دارایی ثابت است
@@ -3526,6 +3562,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,تایید انتصاب
 DocType: Shopping Cart Settings,Orders,سفارشات
 DocType: HR Settings,Retirement Age,سن بازنشستگی
+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 بفرستید
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,تعداد پیش بینی شده
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},حذف برای کشور ممنوع است {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
@@ -3609,11 +3646,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,حسابدار
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},تعلیق POS تاخیر برای {0} بین تاریخ {1} و {2} وجود دارد
 apps/erpnext/erpnext/config/help.py,Navigating,هدایت
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,فاکتورهای برجسته ای وجود ندارد
 DocType: Authorization Rule,Customer / Item Name,نام مشتری / مورد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,سریال جدید نمی تواند انبار را داشته باشد انبار باید توسط ورود سهام یا رسید خرید تعیین شود
 DocType: Issue,Via Customer Portal,از طریق پورتال مشتری
 DocType: Work Order Operation,Planned Start Time,زمان شروع برنامه ریزی شده
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2}
+DocType: Service Level Priority,Service Level Priority,اولویت خدمات سطح
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد تخریب های رزرو شده نمی تواند بیشتر از تعداد کل دفعات تخلیه باشد
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,به اشتراک گذاشتن لجر
 DocType: Journal Entry,Accounts Payable,حساب قابل پرداخت
@@ -3724,7 +3763,6 @@
 DocType: Delivery Note,Delivery To,تحویل به
 DocType: Bank Statement Transaction Settings Item,Bank Data,داده های بانکی
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,برنامه ریزی شده تا
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,نگه داشتن ساعت های صورتحساب و ساعات کار همان زمان بندی
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,پیگیری توسط منبع سرب
 DocType: Clinical Procedure,Nursing User,پرستار کاربر
 DocType: Support Settings,Response Key List,لیست کلید واکنش
@@ -3892,6 +3930,7 @@
 DocType: Work Order Operation,Actual Start Time,زمان شروع واقعی
 DocType: Antibiotic,Laboratory User,کاربر آزمایشگاهی
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,مزایده آنلاین
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,اولویت {0} تکرار شده است
 DocType: Fee Schedule,Fee Creation Status,وضعیت ایجاد هزینه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,نرم افزارها
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,سفارش خرید به پرداخت
@@ -3958,6 +3997,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,اطلاعات برای {0} بازیابی نشد
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,پول صورتحساب باید برابر با ارز یا حساب حساب بانکی پیش فرض شرکت باشد
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,لطفا شناسه کارمند این فروش را وارد کنید
+DocType: Shift Type,Early Exit Consequence after,پس از خروج زود هنگام
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,ایجاد افتتاح حساب های خرید و فروش
 DocType: Disease,Treatment Period,دوره درمان
 apps/erpnext/erpnext/config/settings.py,Setting up Email,راه اندازی ایمیل
@@ -3975,7 +4015,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,نام دانش آموز:
 DocType: SMS Log,Sent On,فرستاده شده است
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,فاکتور فروش
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,زمان پاسخ نمی تواند بیشتر از زمان قطع باشد
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",برای گروه دانشجویی دوره، دوره برای هر دانش آموز از دوره های ثبت شده در ثبت نام برنامه معتبر خواهد بود.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,لوازم خانگی در داخل کشور
 DocType: Employee,Create User Permission,ایجاد مجوز کاربر
@@ -4014,6 +4053,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,شرایط قرارداد استاندارد برای فروش یا خرید.
 DocType: Sales Invoice,Customer PO Details,اطلاعات مشتری PO
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,بیمار یافت نشد
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,اولویت پیش فرض را انتخاب کنید.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,حذف مورد اگر اتهامات مربوط به آن مورد نباشد
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با همین نام وجود دارد لطفا نام مشتری را تغییر دهید یا نام مشتری گروه را تغییر دهید
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4053,6 +4093,7 @@
 DocType: Support Settings,Support Portal,پورتال پشتیبانی
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,تاریخ پایان کار <b>{0}</b> نمیتواند کمتر از <b>{1}</b> تاریخ شروع محاسبه باشد <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},کارمند {0} در حال ترک {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},این توافقنامه سطح سرویس برای مشتری {0} خاص است
 DocType: Employee,Held On,برگزار شد
 DocType: Healthcare Practitioner,Practitioner Schedules,برنامه تمرینکننده
 DocType: Project Template Task,Begin On (Days),شروع (روز)
@@ -4060,6 +4101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},سفارش کار شده است {0}
 DocType: Inpatient Record,Admission Schedule Date,تاریخ برنامه پذیرش
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,تعدیل ارزش دارایی
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,اعضای مارک بر اساس &quot;چک کارمند&quot; برای کارمندان تعیین شده به این تغییر.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,اقلام ساخته شده به افراد ثبت نشده
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,همه مشاغل
 DocType: Appointment Type,Appointment Type,نوع انتصاب
@@ -4173,7 +4215,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص بسته معمولا وزن خالص + وزن بسته بندی مواد. (برای چاپ)
 DocType: Plant Analysis,Laboratory Testing Datetime,زمان آزمایش آزمایشگاهی
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Item {0} نمیتواند دسته داشته باشد
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,خط لوله فروش با مرحله
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,قدرت گروه دانشجویی
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,بیانیه بیانیه بانکی ورودی معاملات
 DocType: Purchase Order,Get Items from Open Material Requests,آیتم هایی از درخواست های باز مواد را دریافت کنید
@@ -4255,7 +4296,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,نمایش انبار انسانی عاقلانه
 DocType: Sales Invoice,Write Off Outstanding Amount,مقدار قابل توجهی را بنویسید
 DocType: Payroll Entry,Employee Details,جزئیات کارمند
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,زمان شروع نمی تواند بیشتر از پایان زمان برای {0} باشد.
 DocType: Pricing Rule,Discount Amount,مقدار تخفیف
 DocType: Healthcare Service Unit Type,Item Details,جزئیات مورد
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},اعلامیه مالیاتی تکراری {0} برای دوره {1}
@@ -4308,7 +4348,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,پرداخت خالص منفی نیست
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,هیچ تعاملات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},ردیف {0} # Item {1} را نمی توان بیش از {2} در برابر سفارش خرید {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,تغییر مکان
+DocType: Attendance,Shift,تغییر مکان
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,نمودار پردازش حساب ها و احزاب
 DocType: Stock Settings,Convert Item Description to Clean HTML,Convert Item Description برای پاک کردن HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,همه گروه های تولید کننده
@@ -4379,6 +4419,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,واحد خدمات والدین
 DocType: Sales Invoice,Include Payment (POS),شامل پرداخت (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,سهم خصوصی
+DocType: Shift Type,First Check-in and Last Check-out,اولین چک و آخرین اتمام
 DocType: Landed Cost Item,Receipt Document,سند رسید
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,دوره کارت امتیازی تامین کننده
 DocType: Employee Grade,Default Salary Structure,ساختار پیش فرض حقوق
@@ -4461,6 +4502,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,ایجاد سفارش خرید
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,تعریف بودجه برای یک سال مالی.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,جدول حساب نمیتواند خالی باشد
+DocType: Employee Checkin,Entry Grace Period Consequence,پس از پیروزی دوره پذیرش
 ,Payment Period Based On Invoice Date,دوره پرداخت بر اساس تاریخ صورتحساب
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},تاریخ نصب را نمی توان قبل از تاریخ تحویل برای Item {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,پیوند به درخواست مواد
@@ -4469,6 +4511,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورودی دوباره تنظیم برای این انبار وجود دارد {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,تاریخ داک
 DocType: Monthly Distribution,Distribution Name,نام توزیع
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,روز کاری {0} تکرار شده است
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,در حال بروزرسانی. ممکن است کمی طول بکشد.
 DocType: Item,"Example: ABCD.#####
@@ -4481,6 +4524,7 @@
 DocType: Vehicle Log,Fuel Qty,تعداد سوخت
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 موبایل شماره
 DocType: Invoice Discounting,Disbursed,پرداخت شده
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,زمان پس از پایان تغییر در طی آن چک کردن برای حضور در نظر گرفته می شود.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,تغییر خالص در حساب قابل پرداخت
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,در دسترس نیست
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,پاره وقت
@@ -4494,7 +4538,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,نمایش PDC در چاپ
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify تامین کننده
 DocType: POS Profile User,POS Profile User,کاربر پروفایل POS
-DocType: Student,Middle Name,نام میانه
 DocType: Sales Person,Sales Person Name,نام شخص فروش
 DocType: Packing Slip,Gross Weight,وزن ناخالص
 DocType: Journal Entry,Bill No,بیل نه
@@ -4503,7 +4546,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG- .YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,توافقنامه سطح خدمات
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,لطفا اولین کارمند و تاریخ را انتخاب کنید
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,نرخ ارز مورد بررسی با توجه به مقدار کوپن هزینه زمین محاسبه می شود
 DocType: Timesheet,Employee Detail,جزئیات کارکنان
 DocType: Tally Migration,Vouchers,کوپنها
@@ -4538,7 +4580,7 @@
 DocType: Additional Salary,Date on which this component is applied,تاریخی که این جزء اعمال می شود
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,فهرست سهامداران موجود با شماره های برگه
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,تنظیم حساب دروازه
-DocType: Service Level,Response Time Period,دوره زمان پاسخ
+DocType: Service Level Priority,Response Time Period,دوره زمان پاسخ
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات و هزینه های خرید
 DocType: Course Activity,Activity Date,تاریخ فعالیت
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,مشتری را انتخاب کنید یا اضافه کنید
@@ -4563,6 +4605,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,سال مالی
 DocType: Sales Invoice Item,Deferred Revenue,درآمد معوق
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,حداقل یکی از فروش یا خرید باید انتخاب شود
+DocType: Shift Type,Working Hours Threshold for Half Day,آستانه ساعت کار برای نیم روز
 ,Item-wise Purchase History,تاریخ دقیق خرید پیشنهادی
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},تاریخ توقف سرویس برای آیتم در سطر {0}
 DocType: Production Plan,Include Subcontracted Items,شامل موارد زیر قرارداد
@@ -4595,6 +4638,7 @@
 DocType: BOM,Allow Same Item Multiple Times,چندین بار یک مورد را مجاز کنید
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,ایجاد BOM
 DocType: Healthcare Practitioner,Charges,اتهامات
+DocType: Employee,Attendance and Leave Details,حضور و ترک جزئیات
 DocType: Student,Personal Details,اطلاعات شخصی
 DocType: Sales Order,Billing and Delivery Status,صورتحساب و وضعیت تحویل
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,ردیف {0}: برای تامین کننده {0} آدرس ایمیل مورد نیاز برای ارسال ایمیل است
@@ -4646,7 +4690,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},مقداری را وارد کنید {0} و {1}
 DocType: Purchase Order,Order Confirmation Date,سفارش تایید تاریخ
 DocType: Delivery Trip,Calculate Estimated Arrival Times,محاسبه زمان ورود تخمینی
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا سیستم نامگذاری کارکنان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,مصرفی
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS- .YYYY.-
 DocType: Subscription,Subscription Start Date,تاریخ شروع اشتراک
@@ -4669,7 +4712,7 @@
 DocType: Journal Entry Account,Journal Entry Account,حساب ورودی مجله
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,واریانت
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,فعالیت انجمن
-DocType: Service Level,Resolution Time Period,مدت زمان قطعنامه
+DocType: Service Level Priority,Resolution Time Period,مدت زمان قطعنامه
 DocType: Request for Quotation,Supplier Detail,جزئیات تامین کننده
 DocType: Project Task,View Task,مشاهده کار
 DocType: Serial No,Purchase / Manufacture Details,جزئیات خرید / ساخت
@@ -4736,6 +4779,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,انبار تنها می تواند از طریق ضمانت ورود / تحویل سهام / رسید خرید تغییر می کند
 DocType: Support Settings,Close Issue After Days,بستن شماره بعد از روز
 DocType: Payment Schedule,Payment Schedule,برنامه زمانی پرداخت
+DocType: Shift Type,Enable Entry Grace Period,فعال کردن دوره گریز ورود
 DocType: Patient Relation,Spouse,همسر
 DocType: Purchase Invoice,Reason For Putting On Hold,دلیل برای قرار گرفتن در معرض
 DocType: Item Attribute,Increment,افزایش
@@ -4875,6 +4919,7 @@
 DocType: Vehicle Log,Invoice Ref,شماره فاکتور
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},فرم C برای فاکتور قابل اجرا نیست: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,صورتحساب ایجاد شده
+DocType: Shift Type,Early Exit Grace Period,دوره عزیمت زود هنگام
 DocType: Patient Encounter,Review Details,بررسی جزئیات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,ردیف {0}: مقدار ساعت باید بیشتر از صفر باشد.
 DocType: Account,Account Number,شماره حساب
@@ -4886,7 +4931,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL",قابل اجرا اگر شرکت SpA، SApA یا SRL باشد
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,شرایط همپوشانی بین:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,پرداخت شده و تحویل نمی شود
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,کد اجباری اجباری است زیرا عنصر به صورت خودکار شماره گذاری نمی شود
 DocType: GST HSN Code,HSN Code,HSN کد
 DocType: GSTR 3B Report,September,سپتامبر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,هزینه های اداری
@@ -4922,6 +4966,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,حساب CWIP
 DocType: SMS Log,Sender Name,نام فرستنده
 DocType: Pricing Rule,Supplier Group,گروه تامین کننده
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",تنظیم زمان شروع و پایان زمان برای \ روز پشتیبانی {0} در شاخص {1}.
 DocType: Employee,Date of Issue,تاریخ صدور
 ,Requested Items To Be Transferred,مورد درخواست شده برای انتقال
 DocType: Employee,Contract End Date,تاریخ پایان قرارداد
@@ -4932,6 +4978,7 @@
 DocType: Opportunity,Sales Stage,مرحله فروش
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,در Word ها هنگامی که سفارش خرید را ذخیره می کنید قابل مشاهده خواهد بود.
 DocType: Item Reorder,Re-order Level,سطح سفارش مجدد
+DocType: Shift Type,Enable Auto Attendance,فعال کردن حضور خودکار
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,ترجیح
 ,Department Analytics,تجزیه و تحلیل گروه
 DocType: Crop,Scientific Name,نام علمی
@@ -4944,6 +4991,7 @@
 DocType: Quiz Activity,Quiz Activity,فعالیت امتحان
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} در یک دوره ثبت نام معتبر نیست
 DocType: Timesheet,Billed,پرداخت شده
+apps/erpnext/erpnext/config/support.py,Issue Type.,نوع مقاله.
 DocType: Restaurant Order Entry,Last Sales Invoice,آخرین اسکناس فروش
 DocType: Payment Terms Template,Payment Terms,شرایط پرداخت
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",ذخیره تعداد: تعداد سفارش برای فروش، اما تحویل داده نشده است.
@@ -5039,6 +5087,7 @@
 DocType: Account,Asset,دارایی
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} یک برنامه تمرین بهداشتی ندارد آن را در کارشناسی ارشد بهداشت و درمان اضافه کنید
 DocType: Vehicle,Chassis No,شاسی نه
+DocType: Employee,Default Shift,تغییرات پیش فرض
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,اختصارات شرکت
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,درخت بیل مواد
 DocType: Article,LMS User,کاربر LMS
@@ -5087,6 +5136,7 @@
 DocType: Sales Person,Parent Sales Person,شخصی فروش والدین
 DocType: Student Group Creation Tool,Get Courses,دریافت دوره ها
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: مقدار باید 1 باشد، زیرا اقلام دارایی ثابت است. لطفا از سطر جداگانه برای چندین عدد استفاده کنید.
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),ساعت کاری که زیر آن مشخص نشده است. (صفر برای غیر فعال کردن)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,گره های برگ تنها در تراکنش مجاز می باشند
 DocType: Grant Application,Organization,سازمان
 DocType: Fee Category,Fee Category,هزینه دسته
@@ -5099,6 +5149,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,لطفا وضعیت خود را برای این رویداد آموزشی به روز کنید
 DocType: Volunteer,Morning,صبح
 DocType: Quotation Item,Quotation Item,مورد نقل قول
+apps/erpnext/erpnext/config/support.py,Issue Priority.,اولویت مسئله
 DocType: Journal Entry,Credit Card Entry,ورود کارت اعتباری
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",شکاف زمانی شکسته می شود، شکاف {0} تا {1} همپوشانی با شکاف موجود {2} تا {3}
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
@@ -5149,11 +5200,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,واردات داده ها و تنظیمات
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",اگر خودکار انتخاب در چک شده است، سپس مشتریان به طور خودکار با برنامه وفاداری مرتبط (در صرفه جویی در)
 DocType: Account,Expense Account,حساب هزینه
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,زمان قبل از شروع تغییر زمان که در آن ورود کارکنان برای حضور در نظر گرفته می شود.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ارتباط با نگهبان 1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,ایجاد صورتحساب
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},درخواست پرداخت قبلا وجود دارد {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',کارمند در {0} رفع شده باید به عنوان &#39;چپ&#39; تنظیم شود
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},پرداخت {0} {1}
+DocType: Company,Sales Settings,تنظیمات فروش
 DocType: Sales Order Item,Produced Quantity,تعداد تولیدی
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,درخواست نقل قول را می توان با کلیک روی پیوند زیر مشاهده کرد
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
@@ -5232,6 +5285,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,قالب های پیش فرض مالی برای فروش و خرید ایجاد می شود.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ترک نوع {0} نمی تواند حمل و نقل ارسال شود
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,بدهی برای حساب باید یک حساب دریافتی باشد
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,تاریخ پایان قرارداد نمیتواند کمتر از امروز باشد.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},لطفا تنظیم حساب در انبار {0} یا حساب پیش فرض موجودی در شرکت {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,تنظیم به عنوان پیشفرض
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),وزن خالص این بسته. (به طور خودکار به عنوان مجموع وزن خالص اقلام محاسبه می شود)
@@ -5258,8 +5312,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,بسته های منقضی شده
 DocType: Shipping Rule,Shipping Rule Type,نوع حمل و نقل
 DocType: Job Offer,Accepted,پذیرفته شده
-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> \ را برای لغو این سند حذف کنید"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,شما قبلا برای معیارهای ارزیابی ارزیابی کرده اید {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,شماره های دسته را انتخاب کنید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),سن (روز)
@@ -5286,6 +5338,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,دامنه های خود را انتخاب کنید
 DocType: Agriculture Task,Task Name,وظیفه نام
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,مقالات در حال حاضر برای سفارش کار ایجاد شده است
+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> \ را برای لغو این سند حذف کنید"
 ,Amount to Deliver,مقدار تحویل
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,شرکت {0} وجود ندارد
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,هیچ درخواست معلق در انتظار برای پیوند برای موارد داده شده یافت نشد.
@@ -5335,6 +5389,7 @@
 DocType: Lab Prescription,Test Code,کد تست
 DocType: Purchase Taxes and Charges,On Previous Row Total,در مجموع ردیف قبلی
 DocType: Student,Student Email Address,آدرس ایمیل دانشجو
+,Delayed Item Report,گزارش مورد دلخواه
 DocType: Academic Term,Education,تحصیلات
 DocType: Supplier Quotation,Supplier Address,آدرس ارائه دهنده
 DocType: Salary Detail,Do not include in total,در مجموع شامل نمی شود
@@ -5342,7 +5397,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} وجود ندارد
 DocType: Purchase Receipt Item,Rejected Quantity,مقدار رد شده
 DocType: Cashier Closing,To TIme,برای TIme
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Conversion factor ({0} -&gt; {1}) برای مورد یافت نشد: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,کاربر گروه خلاصه روزانه کار
 DocType: Fiscal Year Company,Fiscal Year Company,سال مالی شرکت
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,آیتم جایگزین نباید همانند کد آیتم باشد
@@ -5394,6 +5448,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,تأخیر بین توقف تحویل
 DocType: Stock Settings,Freeze Stocks Older Than [Days],مسدود کردن سهام قدیمی تر از [روز]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,طرح تخفیف محصول تبلیغاتی
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,اولویت مسئله در حال حاضر وجود دارد
 DocType: Account,Asset Received But Not Billed,دارایی دریافت شده اما غیرقانونی است
 DocType: POS Closing Voucher,Total Collected Amount,مجموع مقدار جمع آوری شده
 DocType: Course,Default Grading Scale,مقیاس درجه بندی پیش فرض
@@ -5436,6 +5491,7 @@
 DocType: Contract,Fulfilment Terms,شرایط تکمیل
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,غیر گروه به گروه
 DocType: Student Guardian,Mother,مادر
+DocType: Issue,Service Level Agreement Fulfilled,توافقنامه سطح خدمات تحقق یافته است
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,مالیات را تخفیف برای مزایای کارمند بدون اعلان
 DocType: Travel Request,Travel Funding,تامین مالی سفر
 DocType: Shipping Rule,Fixed,درست شد
@@ -5465,10 +5521,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,موردی یافت نشد.
 DocType: Item Attribute,From Range,از محدوده
 DocType: Clinical Procedure,Consumables,مواد مصرفی
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; و &#39;timestamp&#39; مورد نیاز هستند.
 DocType: Purchase Taxes and Charges,Reference Row #,ردیف ردیف #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},لطفا &quot;مرکز هزینه های استهلاک دارایی&quot; را در شرکت تنظیم کنید {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,ردیف # {0}: سند پرداخت برای تکمیل تراکنش لازم است
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,روی این دکمه کلیک کنید تا داده های فروش سفارش خود را از MWS آمازون بکشید.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),ساعت کاری که زیر نیم روز است مشخص شده است. (صفر برای غیر فعال کردن)
 ,Assessment Plan Status,وضعیت برنامه ارزیابی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,لطفا اول {0} را انتخاب کنید
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,این را برای ایجاد رکورد کارمند ارسال کنید
@@ -5539,6 +5597,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,تنظیم باز کنید
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,تغییر فیلترها
 DocType: Production Plan,Material Request Detail,جزئیات درخواست مواد
+DocType: Shift Type,Process Attendance After,مشارکت فرآیند پس از
 DocType: Material Request Item,Quantity and Warehouse,تعداد و انبار
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,به برنامه ها بروید
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},ردیف # {0}: ورودی کپی شده در منابع {1} {2}
@@ -5596,6 +5655,7 @@
 DocType: Pricing Rule,Party Information,اطلاعات حزب
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),بدهکار ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,تا تاریخ نمیتواند بیشتر از تاریخ تسکین کارکنان باشد
+DocType: Shift Type,Enable Exit Grace Period,گارانتی خروج را فعال کنید
 DocType: Expense Claim,Employees Email Id,شناسه کارکنان ایمیل
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,به روز رسانی قیمت از Shopify به لیست قیمت ERPNext
 DocType: Healthcare Settings,Default Medical Code Standard,استاندارد پیش فرض استاندارد پزشکی
@@ -5626,7 +5686,6 @@
 DocType: Budget,Applicable on Material Request,قابل اجرا در درخواست مواد
 DocType: Support Settings,Search APIs,API های جستجو
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,درصد تولید بیش از حد برای سفارش فروش
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,مشخصات فنی
 DocType: Purchase Invoice,Supplied Items,اقلام ارائه شده
 DocType: Leave Control Panel,Select Employees,کارمندان را انتخاب کنید
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},حساب درآمد سود را در وام {0}
@@ -5652,7 +5711,7 @@
 ,Supplier-Wise Sales Analytics,تجزیه و تحلیل فروش هوشمند عرضه کننده
 DocType: GSTR 3B Report,February,فوریه
 DocType: Appraisal,For Employee,برای کارمند
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,تاریخ تحویل واقعی
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,تاریخ تحویل واقعی
 DocType: Sales Partner,Sales Partner Name,نام تجاری فروشنده
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,ريزش خالص {0}: تاریخ شروع خسارت وارد شده به عنوان تاریخ گذشته است
 DocType: GST HSN Code,Regional,منطقه ای
@@ -5691,6 +5750,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,کارت امتیازی ارائه شده
 DocType: Travel Itinerary,Travel To,سفر به
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,علامتگذاری حضور
+DocType: Shift Type,Determine Check-in and Check-out,تعیین ورود و خروج
 DocType: POS Closing Voucher,Difference,تفاوت
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,کوچک
 DocType: Work Order Item,Work Order Item,مورد سفارش کار
@@ -5724,6 +5784,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,دارو
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} بسته است
 DocType: Patient,Medical History,تاریخچه پزشکی
+DocType: Expense Claim,Expense Taxes and Charges,مالیات و هزینه های هزینه
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,تعداد روزهای پس از تاریخ فاکتور قبل از لغو اشتراک یا علامتگذاری اشتراک به عنوان بدون پرداخت هزینه سپری شده است
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,توجه داشته باشید نصب {0} قبلا ارائه شده است
 DocType: Patient Relation,Family,خانواده
@@ -5756,7 +5817,6 @@
 DocType: Dosage Strength,Strength,استحکام
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} واحد {1} مورد نیاز در {2} برای تکمیل این معامله.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,مواد اولیه فرعی متعلق به قرارداد قرارداد
-DocType: Bank Guarantee,Customer,مشتری
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",در صورت فعال بودن، دوره Academic Term در ابزار ثبت نام برنامه اجباری خواهد بود.
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",برای گروه دانشجویی مبتنی بر دسته، گروه دانشجویی برای هر دانش آموز از ثبت نام برنامه تأیید خواهد شد.
 DocType: Course,Topics,موضوعات
@@ -5836,6 +5896,7 @@
 DocType: Chapter,Chapter Members,اعضای گروه
 DocType: Warranty Claim,Service Address,آدرس خدمات
 DocType: Journal Entry,Remark,یادداشت
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: مقدار موجود در {4} در انبار {1} در زمان ارسال ورودی ({2} {3} موجود نیست)
 DocType: Patient Encounter,Encounter Time,زمان برخورد
 DocType: Serial No,Invoice Details,جزئیات فاکتور
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های زیر می توانند در گروه ها ایجاد شوند، اما می توان از ورودی ها در برابر غیر گروه ها استفاده کرد
@@ -5916,6 +5977,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),بستن (باز کردن + مجموع)
 DocType: Supplier Scorecard Criteria,Criteria Formula,معیارهای فرمول
 apps/erpnext/erpnext/config/support.py,Support Analytics,پشتیبانی از تجزیه و تحلیل
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),شناسه سرویس حضور (شناسه بیومتریک / RF برچسب)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,مرور و اقدام
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اگر حساب یخ زده باشد، ورودی ها به کاربران محدود می شود.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,مقدار پس از استهلاک
@@ -5937,6 +5999,7 @@
 DocType: Salary Slip,Loan Repayment,بازپرداخت وام
 DocType: Employee Education,Major/Optional Subjects,موضوعات اصلی / اختیاری
 DocType: Soil Texture,Silt,سیل
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,آدرس و اطلاعات مخاطب
 DocType: Bank Guarantee,Bank Guarantee Type,نوع تضمین بانکی
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",اگر غیرفعال شود، فیلد &#39;Rounded Total&#39; در هر معامله قابل مشاهده نخواهد بود
 DocType: Pricing Rule,Min Amt,حداقل امت
@@ -5975,6 +6038,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,باز کردن ابزار ایجاد صورتحساب
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,شامل معاملات POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},هیچ کارمند برای ارزش کارمند داده شده مشخص نشده است. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),مقدار دریافتی (ارزش شرکت)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save",LocalStorage پر است، ذخیره نکرد
 DocType: Chapter Member,Chapter Member,عضو گروه
@@ -6007,6 +6071,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,هیچ گروه دانشجویی ایجاد نشد.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},تکرار ردیف {0} با همان {1}
 DocType: Employee,Salary Details,جزئیات حقوق و دستمزد
+DocType: Employee Checkin,Exit Grace Period Consequence,خروج از دوره عطف
 DocType: Bank Statement Transaction Invoice Item,Invoice,صورتحساب
 DocType: Special Test Items,Particulars,جزئیات
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,لطفا فیلتر را بر اساس مورد یا انبار تنظیم کنید
@@ -6108,6 +6173,7 @@
 DocType: Serial No,Out of AMC,خارج از AMC
 DocType: Job Opening,"Job profile, qualifications required etc.",مشخصات شغلی، مدارک مورد نیاز و غیره
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,کشتی به دولت
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,میخواهید درخواست مواد را ارسال کنید
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: Compensatory Leave Request,Work End Date,تاریخ پایان کار
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,درخواست مواد اولیه
@@ -6293,6 +6359,7 @@
 DocType: Sales Order Item,Gross Profit,سود ناخالص
 DocType: Quality Inspection,Item Serial No,مورد شماره سریال
 DocType: Asset,Insurer,بیمه گر
+DocType: Employee Checkin,OUT,بیرون
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,مقدار خرید
 DocType: Asset Maintenance Task,Certificate Required,گواهی مورد نیاز است
 DocType: Retention Bonus,Retention Bonus,پاداش احتباس
@@ -6408,6 +6475,8 @@
 DocType: Invoice Discounting,Sanctioned,مجازات
 DocType: Course Enrollment,Course Enrollment,ثبت نام دوره
 DocType: Item,Supplier Items,آیتم های تامین کننده
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",زمان شروع نمی تواند بیشتر یا برابر End Time \ for {0} باشد.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 DocType: Support Search Source,Response Options,گزینه های پاسخ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} باید مقدار بین 0 تا 100 باشد
@@ -6494,7 +6563,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,دارایی های ثابت
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,مجموع درآمد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; قلمرو
 DocType: Share Balance,From No,از شماره
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,فاکتور تطبیق پرداخت
 DocType: Purchase Invoice,Taxes and Charges Added,مالیات ها و هزینه ها اضافه شده است
@@ -6602,6 +6670,7 @@
 DocType: POS Profile,Ignore Pricing Rule,نادیده گرفتن قانون قیمت گذاری
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,غذا
 DocType: Lost Reason Detail,Lost Reason Detail,جزئیات از دست رفته
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},شماره سریال زیر ایجاد شد: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,بازخورد مشتری
 DocType: Serial No,Warranty / AMC Details,گارانتی / جزئیات AMC
 DocType: Issue,Opening Time,زمان بازگشایی
@@ -6651,6 +6720,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,نام شرکت همان نیست
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,ارتقاء کارکنان نمی تواند قبل از تاریخ ارتقاء داده شود
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},مجاز به به روز رسانی معاملات سهام بیش از {0}
+DocType: Employee Checkin,Employee Checkin,چک کارمند
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای Item {0} باشد
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ایجاد نقل قول مشتری
 DocType: Buying Settings,Buying Settings,تنظیمات خرید
@@ -6672,6 +6742,7 @@
 DocType: Patient,Patient Demographics,جمعیت شناسی بیمار
 DocType: Share Transfer,To Folio No,به برگه شماره
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,جریان نقدی عملیات
+DocType: Employee Checkin,Log Type,نوع ورود
 DocType: Stock Settings,Allow Negative Stock,اجازه دهید سهام منفی
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,هیچ کدام از موارد هیچ تغییری در مقدار یا ارزش ندارند.
 DocType: Asset,Purchase Date,تاریخ خرید
@@ -6716,6 +6787,7 @@
 DocType: Vital Signs,Very Hyper,خیلی زیاد
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,طبیعت کسب و کار خود را انتخاب کنید.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,لطفا ماه و سال را انتخاب کنید
+DocType: Service Level,Default Priority,اولویت پیش فرض
 DocType: Student Log,Student Log,ورود دانشجو
 DocType: Shopping Cart Settings,Enable Checkout,فعال کردن پرداخت
 apps/erpnext/erpnext/config/settings.py,Human Resources,منابع انسانی
@@ -6744,7 +6816,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Shopify را با ERPNext وصل کنید
 DocType: Homepage Section Card,Subtitle,عنوان فرعی
 DocType: Soil Texture,Loam,لام
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,تامین کننده&gt; نوع عرضه کننده
 DocType: BOM,Scrap Material Cost(Company Currency),هزینه مواد قراضه (ارزش شرکت)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,یادداشت تحویل {0} نباید ارسال شود
 DocType: Task,Actual Start Date (via Time Sheet),تاریخ شروع واقعی (از طریق ورق زمان)
@@ -6800,6 +6871,7 @@
 DocType: Drug Prescription,Dosage,مصرف
 DocType: Cheque Print Template,Starting position from top edge,موقعیت شروع از لبه بالا
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),مدت زمان انتصاب (دقیقه)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},این کارمند در حال حاضر یک ورودی با همان نشانگر زمانی دارد. {0}
 DocType: Accounting Dimension,Disable,غیرفعال کردن
 DocType: Email Digest,Purchase Orders to Receive,سفارشات خرید برای دریافت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,دستورالعمل های تولید نمی توانند مطرح شوند:
@@ -6815,7 +6887,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,ماده انتقال قرارداد قرارداد
 DocType: Job Card,Timing Detail,جزئیات زمان
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,مورد نیاز
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},وارد کردن {0} از {1}
 DocType: Job Offer Term,Job Offer Term,پیشنهاد شغل
 DocType: SMS Center,All Contact,همه تماس
 DocType: Project Task,Project Task,وظیفه پروژه
@@ -6866,7 +6937,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,مورد {0} برای شماره سریال تنظیم نشده است
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,از دولت
 DocType: Leave Type,Maximum Continuous Days Applicable,حداکثر روز پیوسته قابل اجرا
-apps/erpnext/erpnext/config/support.py,Support Team.,تیم پشتیبانی
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,لطفا اول نام شرکت را وارد کنید
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,واردات موفق
 DocType: Guardian,Alternate Number,شماره جایگزین
@@ -6958,6 +7028,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,ردیف # {0}: مورد اضافه شده است
 DocType: Student Admission,Eligibility and Details,واجد شرایط بودن و جزئیات
 DocType: Staffing Plan,Staffing Plan Detail,جزئیات برنامه کارکنان
+DocType: Shift Type,Late Entry Grace Period,دوره غیبت ورودی بعدی
 DocType: Email Digest,Annual Income,درآمد سالانه
 DocType: Journal Entry,Subscription Section,بخش اشتراک
 DocType: Salary Slip,Payment Days,روز پرداخت
@@ -7008,6 +7079,7 @@
 DocType: Journal Entry Account,Account Balance,موجودی حساب
 DocType: Asset Maintenance Log,Periodicity,دوره ای
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,رکورد پزشکی
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,ورود به سیستم برای چک کردن سقوط در تغییر مورد نیاز است: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,اجرا
 DocType: Item,Valuation Method,روش ارزش گذاری
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} در برابر صورتحساب فروش {1}
@@ -7092,6 +7164,7 @@
 DocType: Loan Type,Loan Name,نام وام
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,حالت پیش فرض پرداخت را تنظیم کنید
 DocType: Quality Goal,Revision,بازبینی
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,زمان قبل از پایان زمان تغییر زمانی که چک کردن به عنوان زود هنگام (در دقیقه) در نظر گرفته شده است.
 DocType: Healthcare Service Unit,Service Unit Type,نوع واحد خدمات
 DocType: Purchase Invoice,Return Against Purchase Invoice,برگشت به خرید فاکتور
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,ایجاد راز
@@ -7247,12 +7320,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,لوازم آرایشی
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,این را چک کنید اگر میخواهید قبل از ذخیره، یک سری را انتخاب کنید. اگر شما این را بررسی کنید پیش فرض وجود نخواهد داشت.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش مجاز هستند حسابهای یخ زده را تنظیم کنند و اعمال حسابداری را در برابر حسابهای یخ زده ایجاد / تغییر دهند
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد مورد&gt; گروه مورد&gt; نام تجاری
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا شده
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن اسلات زمان در {0} روز بعدی برای عملیات {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,بسته شدن
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,شما فقط می توانید تمدید کنید اگر عضویت شما در 30 روز منقضی شود
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},مقدار باید بین {0} و {1} باشد
 DocType: Quality Feedback,Parameters,مولفه های
+DocType: Shift Type,Auto Attendance Settings,تنظیمات حضور در خودرو
 ,Sales Partner Transaction Summary,خلاصه تراکنش فروش شریک
 DocType: Asset Maintenance,Maintenance Manager Name,نام مدیر تعمیر و نگهداری
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,لازم است که جزئیات مورد را انتخاب کنید.
@@ -7344,10 +7419,10 @@
 DocType: Pricing Rule,Validate Applied Rule,تأیید اعتبار کاربردی
 DocType: Job Card Item,Job Card Item,مورد کار کارت
 DocType: Homepage,Company Tagline for website homepage,Tagline شرکت برای صفحه اصلی وب سایت
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,تنظیم زمان پاسخ و وضوح برای اولویت {0} در شاخص {1}.
 DocType: Company,Round Off Cost Center,مرکز هزینه گرد کردن
 DocType: Supplier Scorecard Criteria,Criteria Weight,معیارهای وزن
 DocType: Asset,Depreciation Schedules,برنامه های تخریب
-DocType: Expense Claim Detail,Claim Amount,میزان ادعا
 DocType: Subscription,Discounts,تخفیف
 DocType: Shipping Rule,Shipping Rule Conditions,شرایط حمل و نقل
 DocType: Subscription,Cancelation Date,تاریخ لغو
@@ -7375,7 +7450,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,نمایش صفرها
 DocType: Employee Onboarding,Employee Onboarding,کارمند انبار
 DocType: POS Closing Voucher,Period End Date,تاریخ پایان تاریخ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,فرصت های فروش با منبع
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,اولین تایید کننده خروج از لیست به عنوان پیش فرض خروج از سیستم تنظیم می شود.
 DocType: POS Settings,POS Settings,تنظیمات POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,همه حسابها
@@ -7396,7 +7470,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ردیف # {0}: نرخ باید همانند {1}: {2} ({3} / {4} باشد)
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR- .YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,اقلام خدمات بهداشتی
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,هیچ پرونده یافت نشد
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,محدوده پیری 3
 DocType: Vital Signs,Blood Pressure,فشار خون
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,هدف در
@@ -7443,6 +7516,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,دسته ای
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,دفاع
 DocType: Item,Has Batch No,هیچ دسته ای ندارد
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,روزهای عقب مانده
 DocType: Lead,Person Name,نام شخص
 DocType: Item Variant,Item Variant,مورد Variant
 DocType: Training Event Employee,Invited,دعوت کرد
@@ -7464,7 +7538,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",تاریخ شروع و پایان را در یک دوره ثبت نام معیوب معتبر، نمیتوان {0} محاسبه کرد.
 DocType: POS Profile,Only show Customer of these Customer Groups,فقط مشتری این گروه مشتریان را نشان می دهد
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,موارد را برای ذخیره فاکتور انتخاب کنید
-DocType: Service Level,Resolution Time,زمان قطع شدن
+DocType: Service Level Priority,Resolution Time,زمان قطع شدن
 DocType: Grading Scale Interval,Grade Description,توصیف درجه
 DocType: Homepage Section,Cards,کارت ها
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,دقیقه جلسه کیفیت
@@ -7491,6 +7565,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,بیانیه بیانیه بانکی به عنوان یک لجر عمومی
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),بهداشت و درمان (بتا)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,پیش فرض انبار برای ایجاد سفارش سفارش و تحویل توجه داشته باشید
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,زمان پاسخ برای {0} در index {1} نمیتواند بیشتر از زمان Resolution باشد.
 DocType: Opportunity,Customer / Lead Name,نام مشتری / سرب
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU- .YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,مقدار نامعلوم
@@ -7537,7 +7612,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,واردات احزاب و آدرس ها
 DocType: Item,List this Item in multiple groups on the website.,لیست این مورد را در چند گروه در وب سایت قرار دهید.
 DocType: Request for Quotation,Message for Supplier,پیام برای تامین کننده
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,نمی توان تغییر {0} را به عنوان معامله سهام برای مورد {1} وجود دارد.
 DocType: Healthcare Practitioner,Phone (R),تلفن (R)
 DocType: Maintenance Team Member,Team Member,عضو تیم
 DocType: Asset Category Account,Asset Category Account,حساب دارایی دسته
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 1295a08..c6c97c8 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Nimitys {0} ja myyntilasku {1} peruttiin
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvon numero
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Sähköpostiosoitteesi...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Sisällytä oletuskirjamerkinnät
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Sisällytä oletuskirjamerkinnät
 DocType: Activity Cost,Activity Type,Toimintotyyppi
 DocType: Purchase Invoice,Get Advances Paid,Hanki ennakkomaksut
 DocType: Company,Gain/Loss Account on Asset Disposal,Vahvistus- / tappiotili Varojen hävittämisessä
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Maksutiedot
 DocType: Employee Education,Class / Percentage,Luokka / prosenttiosuus
 ,Electronic Invoice Register,Sähköisen laskun rekisteri
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Sellaisten tapahtumien lukumäärä, joiden jälkeen seuraus suoritetaan."
 DocType: Sales Invoice,Is Return (Credit Note),Onko palautus (luottoilmoitus)
+DocType: Price List,Price Not UOM Dependent,Hinta ei ole UOM-riippuvainen
 DocType: Lab Test Sample,Lab Test Sample,Lab-testinäyte
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Esim. 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Nettopalkka
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Laskutettu kokonaismäärä yhteensä
 DocType: Clinical Procedure,Consumables Invoice Separately,Kulutustarvikkeet Lasku erikseen
+DocType: Shift Type,Working Hours Threshold for Absent,Poissaolon työaikakynnys
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Talousarvoa ei voi määrittää ryhmätilille {0}
 DocType: Purchase Receipt Item,Rate and Amount,Hinta ja määrä
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Potilasasetukset
 DocType: Asset,Insurance End Date,Vakuutuksen päättymispäivä
 DocType: Bank Account,Branch Code,Haarakoodi
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Aika vastata
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Käyttäjäfoorumi
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Myyjä ja ostaja eivät voi olla samoja
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Siirtää
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Hakuehto (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Tulos lähetetään
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Päivämäärä ei voi olla suurempi kuin Toistaiseksi
 DocType: Supplier,Supplier of Goods or Services.,Tavaroiden tai palvelujen toimittaja.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Uuden tilin nimi. Huomaa: Älä luo tilejä asiakkaille ja toimittajille
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Opiskelijaryhmä tai kurssin aikataulu on pakollinen
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Taiton nimi
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Tulosta raporttikortti
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-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 Series {0} -asetukseksi Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Tukiliput
 DocType: Asset Category Account,Fixed Asset Account,Kiinteä omaisuus-tili
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Uusin
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Pakollinen tase
 DocType: Payment Entry,Total Allocated Amount,Jaettu kokonaismäärä
 DocType: Sales Invoice,Get Advances Received,Hanki ennakkomaksut
+DocType: Shift Type,Last Sync of Checkin,Checkinin viimeinen synkronointi
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Tuotteen veroarvo sisältyy arvoon
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Veriryhmä
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Rajaa etäisyys UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Vaihteen alkamisajankohdan jälkeen sisäänkirjautumisen katsotaan olevan myöhässä (minuutteina).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Tutkia
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Laskuja ei löytynyt
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} avointa työpaikkaa ja {1} budjetti {2} varten on jo suunniteltu {3} tytäryhtiöille. Voit suunnitella vain {4} avoimia työpaikkoja ja budjettia {5} henkilöstötaulukon {6} kohdalla emoyhtiölle {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Tuotteiden alennuslaatat
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Liikkuva keskiarvo
 DocType: Employee Attendance Tool,Unmarked Attendance,Merkitsemätön osallistuminen
 DocType: Homepage Section,Number of Columns,Kolumnien numerot
+DocType: Issue Priority,Issue Priority,Issue Priority
 DocType: Holiday List,Add Weekly Holidays,Lisää viikkolomat
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Luo palkkamerkki
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Julkaisupäivä
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse erä {0}. Yksittäistä erää ei löydy, joka täyttää tämän vaatimuksen"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Vasemman työntekijän säilytysbonusta ei voi luoda
+DocType: Employee Checkin,Location / Device ID,Sijainti / Laitteen tunnus
 DocType: Purchase Order,To Receive,Saada
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Olet offline-tilassa. Et voi ladata uudelleen, ennen kuin sinulla on verkko."
 DocType: Course Activity,Enrollment,rekisteröinti
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-laskutiedot puuttuvat
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Mitään aineellista pyyntöä ei ole luotu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Merkki
 DocType: Loan,Total Amount Paid,Maksettu kokonaismäärä
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Kaikki nämä kohteet on jo laskutettu
 DocType: Training Event,Trainer Name,Kouluttajan nimi
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Mainitse lyijyn nimi johtajana {0}
 DocType: Employee,You can enter any date manually,Voit kirjoittaa minkä tahansa päivämäärän manuaalisesti
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Varastojen sovittelu
+DocType: Shift Type,Early Exit Consequence,Varhainen poistuminen
 DocType: Item Group,General Settings,Yleiset asetukset
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Eräpäivä ei voi olla ennen lähettämistä / toimittajan laskun päiväystä
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Anna edunsaajan nimi ennen lähettämistä.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Maksuvahvistus
 ,Available Stock for Packing Items,Pakkaustuotteiden varastot
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Poista tämä lasku {0} C-lomakkeesta {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Jokainen voimassa oleva sisään- ja uloskirjautuminen
 DocType: Support Search Source,Query Route String,Kyselyreitin merkkijono
 DocType: Customer Feedback Template,Customer Feedback Template,Asiakaspalaute-malli
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Lainaukset asiakkaille tai asiakkaille.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,Valtuutusvalvonta
 ,Daily Work Summary Replies,Päivittäinen työn yhteenveto Vastaukset
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Sinua on kutsuttu tekemään yhteistyötä projektissa: {0}
+DocType: Issue,Response By Variance,Varianssin vastaus
 DocType: Item,Sales Details,Myynnin tiedot
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Kirjelomakkeet tulostusmalleja varten.
 DocType: Salary Detail,Tax on additional salary,Lisäpalkkio
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Tehtävän eteneminen
 DocType: Journal Entry,Opening Entry,Avaustiedot
 DocType: Bank Guarantee,Charges Incurred,Maksut aiheutuvat
+DocType: Shift Type,Working Hours Calculation Based On,Työaikojen laskeminen perustuu
 DocType: Work Order,Material Transferred for Manufacturing,Tuotantoon siirretty materiaali
 DocType: Products Settings,Hide Variants,Piilota vaihtoehdot
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Poista kapasiteetin suunnittelu ja ajan seuranta käytöstä
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,Kiinnostuksen kohteet
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Kulutettu määrä
 DocType: Education Settings,Education Manager,Koulutuspäällikkö
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Suunnittele työpäiväkirjat työaseman työaikojen ulkopuolella.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Lojaalisuuspisteet: {0}
 DocType: Healthcare Settings,Registration Message,Rekisteröintiviesti
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Lasku on jo luotu kaikille laskutustunnille
 DocType: Sales Partner,Contact Desc,Ota yhteyttä Desc
 DocType: Purchase Invoice,Pricing Rules,Hinnoittelusäännöt
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska olemassa olevia tapahtumia {0} vastaan on olemassa, et voi muuttaa arvoa {1}"
 DocType: Hub Tracked Item,Image List,Kuvaluettelo
 DocType: Item Variant Settings,Allow Rename Attribute Value,Salli ominaisuuden arvon nimeäminen uudelleen
-DocType: Price List,Price Not UOM Dependant,Hinta ei ole UOM-riippuvainen
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Aika (minuutteina)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,perustiedot
 DocType: Loan,Interest Income Account,Korkotuototili
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Valitse POS-profiili
 DocType: Support Settings,Get Latest Query,Hanki uusin kysely
 DocType: Employee Incentive,Employee Incentive,Työntekijöiden kannustin
+DocType: Service Level,Priorities,prioriteetit
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Lisää kortteja tai mukautettuja osioita kotisivulle
 DocType: Homepage,Hero Section Based On,Hero-osa perustuu
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ostokustannukset yhteensä (ostolaskun kautta)
@@ -1452,7 +1464,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Tilattu määrä
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätty varasto on pakollinen hylätystä kohdasta {1}
 ,Received Items To Be Billed,"Vastaanotettavat kohteet, jotka laskutetaan"
-DocType: Salary Slip Timesheet,Working Hours,Työtunnit
+DocType: Attendance,Working Hours,Työtunnit
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Maksutapa
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,"Ostotilaus, jota ei ole vastaanotettu ajoissa"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Kesto päivissä
@@ -1572,7 +1584,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Lakisääteiset tiedot ja muut yleiset tiedot toimittajalta
 DocType: Item Default,Default Selling Cost Center,Oletusmyynnin kustannuskeskus
 DocType: Sales Partner,Address & Contacts,Osoite ja yhteystiedot
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä ja asenna numerointisarja osallistumiseen asetusten avulla&gt; Numerosarja
 DocType: Subscriber,Subscriber,Tilaaja
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) on loppunut
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Valitse ensin Lähetyspäivä
@@ -1583,7 +1594,7 @@
 DocType: Detected Disease,Tasks Created,Tehtävät luotu
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Oletuksena BOM ({0}) on oltava aktiivinen tässä kohdassa tai sen mallissa
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Komission hinta%
-DocType: Service Level,Response Time,Vasteaika
+DocType: Service Level Priority,Response Time,Vasteaika
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce-asetukset
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Määrän on oltava positiivinen
 DocType: Contract,CRM,CRM
@@ -1600,7 +1611,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Transaktiotietojen kartoitus
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Johtaja vaatii joko henkilön nimen tai organisaation nimen
 DocType: Student,Guardians,Guardians
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna opettajan nimeämisjärjestelmä opetuksessa&gt; Koulutusasetukset
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Valitse tuotemerkki ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Keskitulot
 DocType: Shipping Rule,Calculate Based On,Laske perustana
@@ -1637,6 +1647,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Osallistumistietue {0} on opiskelijaa {1} vastaan
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Transaktion päivämäärä
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Peruuta tilaus
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Palvelutason sopimusta ei voitu asettaa {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Nettopalkan määrä
 DocType: Account,Liability,vastuu
 DocType: Employee,Bank A/C No.,Pankin A / C-numero
@@ -1702,7 +1713,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raaka-ainekoodi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Ostolasku {0} on jo toimitettu
 DocType: Fees,Student Email,Opiskelijan sähköposti
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM-rekursio: {0} ei voi olla {2} vanhempi tai lapsi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Hanki tuotteet terveydenhuollon palveluista
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Kantaosuutta {0} ei lähetetä
 DocType: Item Attribute Value,Item Attribute Value,Kohteen attribuutin arvo
@@ -1727,7 +1737,6 @@
 DocType: Production Plan,Select Items to Manufacture,Valitse valmistettavat kohteet
 DocType: Leave Application,Leave Approver Name,Jätä hyväksyntänimi
 DocType: Shareholder,Shareholder,osakas
-DocType: Issue,Agreement Status,Sopimuksen tila
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Tapahtumien oletusasetukset.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Ole hyvä ja valitse opiskelijapääsy, joka on pakollinen opiskelija-hakijalle"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Valitse BOM
@@ -1988,6 +1997,7 @@
 DocType: Account,Income Account,Tulotili
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Kaikki varastot
 DocType: Contract,Signee Details,Signee Details
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Salli uloskirjautuminen vaihdon päättymisajan jälkeen (minuutteina)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,hankinta
 DocType: Item Group,Check this if you want to show in website,"Tarkista tämä, jos haluat näyttää sivustossa"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Talousvuotta {0} ei löytynyt
@@ -2054,6 +2064,7 @@
 DocType: Activity Cost,Billing Rate,Laskutusaste
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Varoitus: Toinen {0} # {1} on olemassa varastomerkintää {2} vastaan
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Ota Google Maps -asetukset käyttöön arvioidaksesi ja optimoidaksesi reitit
+DocType: Purchase Invoice Item,Page Break,Sivunvaihto
 DocType: Supplier Scorecard Criteria,Max Score,Max Pisteet
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Takaisinmaksun aloituspäivä ei voi olla ennen maksupäivää.
 DocType: Support Search Source,Support Search Source,Tuki-lähde
@@ -2122,6 +2133,7 @@
 DocType: Employee Transfer,Employee Transfer,Työntekijöiden siirto
 ,Sales Funnel,Myyntikanava
 DocType: Agriculture Analysis Criteria,Water Analysis,Vesianalyysi
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Aloita sisäänkirjautuminen ennen muutoksen alkamisaikaa (minuutteina)
 DocType: Accounts Settings,Accounts Frozen Upto,Tilit jäädytetään
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Mikään ei ole muokattavissa.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Toiminta {0} pidempään kuin mikään käytettävissä oleva työaika työasemassa {1}, hajota toiminta useaan toimintoon"
@@ -2135,7 +2147,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Maksuviivästys (päivät)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Anna poistotiedot
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Asiakas PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Odotetun toimituspäivän pitäisi olla myyntitilauksen päivämäärän jälkeen
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Tuotteen määrä ei voi olla nolla
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Virheellinen määrite
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Valitse BOM kohdasta {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Laskutyyppi
@@ -2145,6 +2159,7 @@
 DocType: Volunteer,Afternoon,Iltapäivällä
 DocType: Vital Signs,Nutrition Values,Ravitsemusarvot
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Kuume (lämpötila&gt; 38,5 ° C / 101,3 ° F tai jatkuva lämpötila&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä ja asenna työntekijöiden nimeämisjärjestelmä henkilöstöresurssissa&gt; HR-asetukset
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC peruutettu
 DocType: Project,Collect Progress,Kerää edistystä
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,energia
@@ -2195,6 +2210,7 @@
 ,Ordered Items To Be Billed,"Tilatut kohteet, jotka laskutetaan"
 DocType: Taxable Salary Slab,To Amount,Summaan
 DocType: Purchase Invoice,Is Return (Debit Note),Onko palautus (maksutapa)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Päästä alkuun
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Yhdistää
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Tilivuoden alkamispäivää ja verovuoden päättymispäivää ei voi muuttaa, kun varainhoitovuosi on tallennettu."
@@ -2213,8 +2229,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Kunnossapidon alkamispäivä ei voi olla ennen sarjanumeron {0} toimituspäivää
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Rivi {0}: valuuttakurssi on pakollinen
 DocType: Purchase Invoice,Select Supplier Address,Valitse toimittajan osoite
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Käytettävissä oleva määrä on {0}, tarvitset {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Anna API-salaisuus
 DocType: Program Enrollment Fee,Program Enrollment Fee,Ohjelman ilmoittautumismaksu
+DocType: Employee Checkin,Shift Actual End,Vaihda todellinen loppu
 DocType: Serial No,Warranty Expiry Date,Takuuajan päättymispäivä
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotellihuoneen hinnoittelu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Ulkoiset verotettavat toimitukset (muut kuin nolla-arvot, nolla-arvo ja vapautus)"
@@ -2274,6 +2292,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lukeminen 5
 DocType: Shopping Cart Settings,Display Settings,Näyttöasetukset
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Aseta poistettujen varausten määrä
+DocType: Shift Type,Consequence after,Seuraus
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Minkä kanssa tarvitset apua?
 DocType: Journal Entry,Printing Settings,Tulostusasetukset
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,pankkitoiminta
@@ -2283,6 +2302,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Laskutusosoite on sama kuin lähetysosoite
 DocType: Account,Cash,Käteinen raha
 DocType: Employee,Leave Policy,Jätä politiikka
+DocType: Shift Type,Consequence,seuraus
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Opiskelijaosoite
 DocType: GST Account,CESS Account,CESS-tili
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kustannuskeskus tarvitaan &quot;Voitto ja tappio&quot; -tilille {2}. Aseta yrityksen oletusarvoinen kustannuskeskus.
@@ -2347,6 +2367,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Ajanjakson päättäminen
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2-nimi
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Anna kustannustili
+DocType: Issue,Resolution By Variance,Ratkaisu varianssin mukaan
 DocType: Employee,Resignation Letter Date,Erottamisen kirjainpäivä
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Osallistuminen päivämäärään
@@ -2359,6 +2380,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Näytä nyt
 DocType: Item Price,Valid Upto,Voimassa
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Viite Doctype-koodin on oltava {0}
+DocType: Employee Checkin,Skip Auto Attendance,Ohita Auto Attendance
 DocType: Payment Request,Transaction Currency,Transaction Currency
 DocType: Loan,Repayment Schedule,Palautusaikataulu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Luo näytteen säilytysvaraston merkintä
@@ -2430,6 +2452,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS Loppukuponkien verot
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Toimenpide aloitettu
 DocType: POS Profile,Applicable for Users,Sovellettavissa käyttäjille
+,Delayed Order Report,Viivästetyn tilauksen raportti
 DocType: Training Event,Exam,Koe
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Virheellinen määrä yleisiä kirjaimia löytyi. Olet ehkä valinnut väärän tilin tilissä.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Myyntiputki
@@ -2444,10 +2467,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Ehtoja sovelletaan kaikkiin valittuihin kohteisiin.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Määritä
 DocType: Hotel Room,Capacity,kapasiteetti
+DocType: Employee Checkin,Shift End,Vaihtopää
 DocType: Installation Note Item,Installed Qty,Asennettu määrä
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Erän {0} erä {1} on poistettu käytöstä.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel varauksen käyttäjä
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Työpäivä on toistettu kahdesti
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Palvelutason sopimus entiteettityypin {0} ja Entity {1} kanssa on jo olemassa.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},"Kohtaryhmä, jota ei ole mainittu kohteen päällikössä kohteen {0} kohdalla"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Nimi-virhe: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Alue on pakollinen POS-profiilissa
@@ -2495,6 +2519,7 @@
 DocType: Depreciation Schedule,Schedule Date,Aikataulu
 DocType: Packing Slip,Package Weight Details,Pakkauksen painon tiedot
 DocType: Job Applicant,Job Opening,Avoin työpaikka
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Viimeksi tunnettu onnistunut synkronointi työntekijän tarkistuksessa. Palauta tämä vain, jos olet varma, että kaikki lokit synkronoidaan kaikista paikoista. Älä muuta tätä, jos olet epävarma."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Todellinen kustannus
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kokonaisennakko ({0}) vastaan {1} ei voi olla suurempi kuin Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Kohteen vaihtoehdot päivitetään
@@ -2539,6 +2564,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Hanki Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Onko päivän kirjan tiedot tuotu
 ,Sales Partners Commission,Myyntikumppanien komissio
+DocType: Shift Type,Enable Different Consequence for Early Exit,Ota käyttöön erilaiset seuraukset varhaiselle poistumiselle
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,oikeudellinen
 DocType: Loan Application,Required by Date,Päivämäärä edellyttää
 DocType: Quiz Result,Quiz Result,Tietovisa Tulos
@@ -2598,7 +2624,6 @@
 DocType: Pricing Rule,Pricing Rule,Hinnoittelusääntö
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Valinnainen lomalista ei ole asetettu lomapäiväksi {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Aseta Työntekijätieto-kenttään Käyttäjän tunnus -kenttä, jos haluat asettaa Työntekijä-roolin"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Aika ratkaista
 DocType: Training Event,Training Event,Harjoitustapahtuma
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normaali lepo verenpaine aikuisessa on noin 120 mmHg systolista ja 80 mmHg diastolista, lyhennettynä &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Järjestelmä noutaa kaikki merkinnät, jos raja-arvo on nolla."
@@ -2642,6 +2667,7 @@
 DocType: Student Applicant,Approved,hyväksytty
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},"Päivämäärän pitäisi olla verovuoden sisällä. Oletetaan, että päivämäärä = {0}"
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Aseta toimittajaryhmä ostoasetuksiin.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} on virheellinen osallistumisasema.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tilapäinen avaustili
 DocType: Purchase Invoice,Cash/Bank Account,Käteinen / pankkitili
 DocType: Quality Meeting Table,Quality Meeting Table,Quality Meeting Table
@@ -2676,6 +2702,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Ruoka, juoma ja tupakka"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Kurssin aikataulu
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Kohta Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Osallistuminen merkitään automaattisesti vasta tämän päivämäärän jälkeen.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Tarvikkeet valmistetaan UIN-pidikkeille
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Tarjouspyyntö
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,"Valuutta ei voi muuttaa sen jälkeen, kun olet tehnyt merkintöjä jollakin muulla valuutalla"
@@ -2724,7 +2751,6 @@
 DocType: Item,Is Item from Hub,Onko kohde Hubista
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Laatujärjestelmä.
 DocType: Share Balance,No of Shares,Osakkeiden lukumäärä
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rivi {0}: Määrä ei ole käytettävissä {4} varastossa {1} merkinnän lähettämisen aikana ({2} {3})
 DocType: Quality Action,Preventive,ehkäisevä
 DocType: Support Settings,Forum URL,Foorumin URL-osoite
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Työntekijä ja osallistuminen
@@ -2946,7 +2972,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Oletusverot ja -maksut
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Tämä perustuu tämän toimittajan tapahtumiin. Katso lisätietoja alla olevasta aikataulusta
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Työntekijän enimmäismäärä {0} ylittää {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Syötä sopimuksen alkamis- ja päättymispäivä.
 DocType: Delivery Note Item,Against Sales Invoice,Myyntilaskua vastaan
 DocType: Loyalty Point Entry,Purchase Amount,Ostomäärä
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,"Ei voi asettaa menetetyksi, koska myyntitilaus tehdään."
@@ -2970,7 +2995,7 @@
 DocType: Lead,Organization Name,Organisaation nimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Voimassa olevat ja voimassa olevat kentät ovat pakollisia kumulatiivisille
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erän numero on oltava sama kuin {1} {2}
-DocType: Employee,Leave Details,Jätä tiedot
+DocType: Employee Checkin,Shift Start,Vaihto Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Varastotapahtumat ennen {0} on jäädytetty
 DocType: Driver,Issuing Date,Julkaisupäivä
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,pyytäjän
@@ -3015,9 +3040,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Cash Flow Mapping Mallin tiedot
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Rekrytointi ja koulutus
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Automaattisen läsnäolon armonajan asetukset
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Valuutasta ja valuutasta ei voi olla sama
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,lääketeollisuus
 DocType: Employee,HR-EMP-,HR-EMP
+DocType: Service Level,Support Hours,Tuki-ajat
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} peruutetaan tai suljetaan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rivi {0}: Ennakkomaksua vastaan tulee olla luotto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Ryhmittäin lahjakortti (konsolidoitu)
@@ -3127,6 +3154,7 @@
 DocType: Territory,Territory Manager,aluejohtaja
 DocType: Lab Test,Sample ID,Näytteen tunnus
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Ostoskori on tyhjä
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Osallistuminen on merkitty työntekijän sisäänkirjautumisen yhteydessä
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Omaisuus {0} on toimitettava
 ,Absent Student Report,Opiskelijaraportin puuttuminen
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Sisältää bruttokate
@@ -3134,7 +3162,9 @@
 DocType: Travel Request Costing,Funded Amount,Rahoitettu määrä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} ei ole toimitettu, joten toimintaa ei voi suorittaa"
 DocType: Subscription,Trial Period End Date,Koeajan päättymispäivä
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Vaihda merkintöjä IN- ja OUT-toiminnon aikana samalla siirtymällä
 DocType: BOM Update Tool,The new BOM after replacement,Uusi BOM vaihdon jälkeen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Kohta 5
 DocType: Employee,Passport Number,Passin numero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Väliaikainen avaaminen
@@ -3249,6 +3279,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Mahdollinen toimittaja
 ,Issued Items Against Work Order,Annetut kohteet työjärjestystä vastaan
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Laskun luominen {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna opettajan nimeämisjärjestelmä opetuksessa&gt; Koulutusasetukset
 DocType: Student,Joining Date,Liittymispäivämäärä
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Pyydävä sivusto
 DocType: Purchase Invoice,Against Expense Account,Vastaan kustannuslaskua
@@ -3288,6 +3319,7 @@
 DocType: Landed Cost Item,Applicable Charges,Sovellettavat maksut
 ,Point of Sale,Myyntipiste
 DocType: Authorization Rule,Approving User  (above authorized value),Käyttäjän hyväksyminen (sallitun arvon yläpuolella)
+DocType: Service Level Agreement,Entity,Entity
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirrettiin osoitteesta {2} {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Asiakas {0} ei kuulu projektiin {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Osapuolen nimi
@@ -3334,6 +3366,7 @@
 DocType: Soil Texture,Sand Composition (%),Hiekka-koostumus (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Tuo päivän kirjan tiedot
+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 Series {0} -asetukseksi Setup&gt; Settings&gt; Naming Series
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Kustannusvaatimusta varten tarvitaan kustannuskeskus
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} kelvollinen sarjanumero {1}
@@ -3393,7 +3426,6 @@
 DocType: Asset,Asset Owner,Omaisuuden omistaja
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Varasto on pakollinen varastossa {0} rivissä {1}
 DocType: Stock Entry,Total Additional Costs,Lisäkustannukset yhteensä
-DocType: Marketplace Settings,Last Sync On,Viimeinen synkronointi käytössä
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Aseta vähintään yksi rivi Verot ja maksut -taulukossa
 DocType: Asset Maintenance Team,Maintenance Team Name,Huoltoryhmän nimi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Kustannuskeskusten kaavio
@@ -3409,12 +3441,12 @@
 DocType: Job Card,WIP Warehouse,WIP-varasto
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Käyttäjän tunnus ei ole määritetty työntekijälle {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Saatavilla oleva määrä on {0}, tarvitset {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Käyttäjä {0} luotu
 DocType: Stock Settings,Item Naming By,Kohteen nimeäminen
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,tilattu
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"Tämä on root-asiakasryhmä, jota ei voi muokata."
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materiaalipyyntö {0} peruutetaan tai pysäytetään
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Perustuu tiukasti palkkaluokkaan Työntekijän tarkistus
 DocType: Purchase Order Item Supplied,Supplied Qty,Toimitettu määrä
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,Hiekka
@@ -3473,6 +3505,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Kohtaryhmän taulukossa on kaksoiskappaleiden ryhmä
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Vuosipalkka
 DocType: Supplier Scorecard,Weighting Function,Painotustoiminto
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM: n muuntokerrointa ({0} -&gt; {1}) ei löytynyt kohdasta {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Virhe arvioitaessa kriteerikaavaa
 ,Lab Test Report,Lab-testiraportti
 DocType: BOM,With Operations,Toiminnoilla
@@ -3486,6 +3519,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Journal Entry -palvelussa ei ole maksuja
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} on passiivinen opiskelija
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Tee kaluston merkintä
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM-rekursio: {0} ei voi olla vanhempi tai lapsi {1}
 DocType: Employee Onboarding,Activities,toiminta
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Atleast yksi varasto on pakollinen
 ,Customer Credit Balance,Asiakkaan luottotase
@@ -3498,9 +3532,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Usean kanta-asiakasohjelman löytäminen asiakkaalle. Valitse manuaalisesti.
 DocType: Patient,Medication,Lääkitys
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Valitse Loyalty Program
+DocType: Employee Checkin,Attendance Marked,Osallistuminen merkitty
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Raakamateriaalit
 DocType: Sales Order,Fully Billed,Täysin laskutettu
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Aseta hotellihuoneen hinta {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Valitse vain yksi prioriteetti oletusarvoksi.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Tunnista / luo tili (Ledger) tyypille - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Kokonaisluotto / veloitusmäärä on sama kuin linkitetyn lehden merkinnän
 DocType: Purchase Invoice Item,Is Fixed Asset,Onko kiinteä omaisuuserä
@@ -3521,6 +3557,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Nimitysvahvistus
 DocType: Shopping Cart Settings,Orders,tilaukset
 DocType: HR Settings,Retirement Age,Eläkeikä
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä ja asenna numerointisarja osallistumiseen asetusten avulla&gt; Numerosarja
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Ennustettu määrä
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Poistaminen ei ole sallittua maassa {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Rivi # {0}: Omaisuus {1} on jo {2}
@@ -3604,11 +3641,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Kirjanpitäjä
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS Closing Voucher alreday on {0} välillä päivämäärän {1} ja {2} välillä
 apps/erpnext/erpnext/config/help.py,Navigating,Liikkuminen
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Mitään maksamatta olevia laskuja ei tarvitse valuuttakurssien uudelleenarvostusta
 DocType: Authorization Rule,Customer / Item Name,Asiakas / tuotenimi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Uudella sarjanumerolla ei voi olla varastoa. Varasto on asetettava varastorekisteriin tai ostokuittiin
 DocType: Issue,Via Customer Portal,Asiakasportaalin kautta
 DocType: Work Order Operation,Planned Start Time,Suunniteltu aloitusaika
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} on {2}
+DocType: Service Level Priority,Service Level Priority,Palvelutason prioriteetti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Varausten määrä ei voi olla suurempi kuin poistojen kokonaismäärä
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Jaa Ledger
 DocType: Journal Entry,Accounts Payable,Velat
@@ -3719,7 +3758,6 @@
 DocType: Delivery Note,Delivery To,Toimitus kohteeseen
 DocType: Bank Statement Transaction Settings Item,Bank Data,Pankkitiedot
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Suunniteltu Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Säilytä laskutusajat ja työtunnit samoin aikalehdessä
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Seuraa lähdekoodin johtoja.
 DocType: Clinical Procedure,Nursing User,Hoitotyön käyttäjä
 DocType: Support Settings,Response Key List,Vastausavainluettelo
@@ -3887,6 +3925,7 @@
 DocType: Work Order Operation,Actual Start Time,Todellinen alkamisaika
 DocType: Antibiotic,Laboratory User,Laboratorion käyttäjä
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online-huutokaupat
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Prioriteetti {0} on toistettu.
 DocType: Fee Schedule,Fee Creation Status,Maksujen luominen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,ohjelmistot
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Myyntitilauksen maksaminen
@@ -3953,6 +3992,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} ei saanut tietoja.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Laskutusvaluutan on oltava yhtä suuri kuin yrityksen oletusarvoinen valuutan tai osapuolen tilivaluutta
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Anna tämän myyntihenkilön työntekijän tunnus
+DocType: Shift Type,Early Exit Consequence after,Varhainen poistuminen seurauksesta
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Luo myynti- ja ostolaskut
 DocType: Disease,Treatment Period,Hoitojakso
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Sähköpostin määrittäminen
@@ -3970,7 +4010,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Opiskelijan nimi:
 DocType: SMS Log,Sent On,Lähetetty
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Myyntilasku
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Vastausaika ei voi olla suurempi kuin tarkkuusaika
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurssille perustuva opiskelijaryhmä kurssi validoidaan jokaiselle opiskelijalle ilmoittautuneista kursseista ohjelman rekisteröinnissä.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Valtion sisäiset toimitukset
 DocType: Employee,Create User Permission,Luo käyttäjäoikeus
@@ -4009,6 +4048,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Myynti- tai ostosopimusehdot.
 DocType: Sales Invoice,Customer PO Details,Asiakkaan PO-tiedot
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Potilas ei löytynyt
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Valitse oletus prioriteetti.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Poista kohde, jos maksuja ei sovelleta kyseiseen kohtaan"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Asiakasryhmä on sama nimi, vaihda Asiakkaan nimi tai nimeä uudelleen Asiakasryhmä"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4048,6 +4088,7 @@
 DocType: Support Settings,Support Portal,Tukiportaali
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Tehtävän <b>{0}</b> päättymispäivä ei voi olla pienempi kuin <b>{1}</b> odotettu alkamispäivä <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Työntekijä {0} on poistumassa {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Tämä palvelutason sopimus on asiakaskohtainen {0}
 DocType: Employee,Held On,Pidettiin
 DocType: Healthcare Practitioner,Practitioner Schedules,Harjoittajien aikataulut
 DocType: Project Template Task,Begin On (Days),Aloita (päivät)
@@ -4055,6 +4096,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Työjärjestys on ollut {0}
 DocType: Inpatient Record,Admission Schedule Date,Pääsymaksun päivämäärä
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Omaisuusarvon säätö
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Merkitse läsnäoloa, joka perustuu tähän muutokseen osoitetuille työntekijöille."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Rekisteröimättömille henkilöille tehdyt toimitukset
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Kaikki työpaikat
 DocType: Appointment Type,Appointment Type,Nimitystyyppi
@@ -4168,7 +4210,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pakkauksen bruttopaino. Yleensä nettopaino + pakkausmateriaalin paino. (tulostaa)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoriotestaus Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Kohde {0} ei voi sisältää erää
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Myyntiputki vaiheittain
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Opiskelijaryhmän vahvuus
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Pankkitilinpäätössiirto
 DocType: Purchase Order,Get Items from Open Material Requests,Hanki kohteet avoimista aineistopyynnöistä
@@ -4250,7 +4291,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Näytä ikääntymisen varasto
 DocType: Sales Invoice,Write Off Outstanding Amount,Kirjoita pois erinomainen summa
 DocType: Payroll Entry,Employee Details,Työntekijän tiedot
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Aloitusaika ei voi olla suurempi kuin lopetusaika {0}.
 DocType: Pricing Rule,Discount Amount,Alennuksen määrä
 DocType: Healthcare Service Unit Type,Item Details,Kohteen tiedot
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Kopioi {0} veroilmoitus ajanjaksolle {1}
@@ -4303,7 +4343,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Nettopalkka ei voi olla negatiivinen
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Ei vuorovaikutuksia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Rivi {0} # Kohta {1} ei voi siirtää enemmän kuin {2} ostotilausta vastaan {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Siirtää
+DocType: Attendance,Shift,Siirtää
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Tilien ja sopimuspuolten käsittely
 DocType: Stock Settings,Convert Item Description to Clean HTML,Muunna kohteen kuvaus puhtaaksi HTML-koodiksi
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Kaikki toimittajaryhmät
@@ -4374,6 +4414,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Vanhempien huoltoyksikkö
 DocType: Sales Invoice,Include Payment (POS),Sisällytä maksu (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Yksityinen pääoma
+DocType: Shift Type,First Check-in and Last Check-out,Ensimmäinen sisäänkirjautuminen ja viimeinen uloskirjautuminen
 DocType: Landed Cost Item,Receipt Document,Kuitti-asiakirja
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Toimittajan tuloskortin aika
 DocType: Employee Grade,Default Salary Structure,Palkan perusrakenne
@@ -4456,6 +4497,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Luo ostotilaus
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Määritä varainhoitovuoden talousarvio.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Tilit-taulukko ei voi olla tyhjä.
+DocType: Employee Checkin,Entry Grace Period Consequence,Entry Grace Period seuraus
 ,Payment Period Based On Invoice Date,Maksuaika laskutuspäivänä
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Linkki materiaalipyyntöön
 DocType: Warranty Claim,From Company,Yritys
@@ -4463,6 +4505,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: Tähän varastoon on jo olemassa järjestysmuoto {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 DocType: Monthly Distribution,Distribution Name,Jakelun nimi
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Työpäivä {0} on toistettu.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Ryhmä ei-ryhmään
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Päivitys käynnissä. Se voi kestää jonkin aikaa.
 DocType: Item,"Example: ABCD.#####
@@ -4475,6 +4518,7 @@
 DocType: Vehicle Log,Fuel Qty,Polttoaineen määrä
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,maksettu
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Ajan päättymisen jälkeinen aika, jona uloskirjautuminen katsotaan osallistuvaksi."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Velkojen nettomuutos
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Ei saatavilla
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Osa-aikainen
@@ -4488,7 +4532,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Näytä PDC tulostuksessa
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Toimittaja
 DocType: POS Profile User,POS Profile User,POS-profiilin käyttäjä
-DocType: Student,Middle Name,Toinen nimi
 DocType: Sales Person,Sales Person Name,Myyjän nimi
 DocType: Packing Slip,Gross Weight,Bruttopaino
 DocType: Journal Entry,Bill No,Bill No
@@ -4497,7 +4540,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-Vlogi-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Palvelun tasoa koskeva sopimus
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Valitse ensin Työntekijä ja Päivämäärä
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Tuotteen arvostusnopeus lasketaan uudelleen laskettuna laskeutuneiden kustannusten voucher-määrän perusteella
 DocType: Timesheet,Employee Detail,Työntekijän tiedot
 DocType: Tally Migration,Vouchers,tositteita
@@ -4532,7 +4574,7 @@
 DocType: Additional Salary,Date on which this component is applied,"Päivä, jona tätä osaa sovelletaan"
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,"Luettelo käytettävissä olevista osakkeenomistajista, joilla on folio-numerot"
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Määritä yhdyskäytävän tilit.
-DocType: Service Level,Response Time Period,Vastausaika
+DocType: Service Level Priority,Response Time Period,Vastausaika
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostoverot ja -maksut
 DocType: Course Activity,Activity Date,Toimintapäivä
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Valitse tai lisää uusi asiakas
@@ -4557,6 +4599,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Talousvuosi
 DocType: Sales Invoice Item,Deferred Revenue,Laskennalliset tulot
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Atleast on yksi myynti- tai ostotapauksista
+DocType: Shift Type,Working Hours Threshold for Half Day,Puolen päivän työtuntien kynnys
 ,Item-wise Purchase History,Tuotekohtainen ostohistoria
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Rivi {0} -kohdan kohteen pysäytyspäivää ei voi muuttaa
 DocType: Production Plan,Include Subcontracted Items,Sisällytä alihankintatuotteet
@@ -4588,6 +4631,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Salli saman kohteen useita kertoja
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Luo BOM
 DocType: Healthcare Practitioner,Charges,maksut
+DocType: Employee,Attendance and Leave Details,Osallistuminen ja jätä tiedot
 DocType: Student,Personal Details,Henkilökohtaiset tiedot
 DocType: Sales Order,Billing and Delivery Status,Laskutus ja toimitus
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Rivi {0}: Toimittajalle {0} Sähköpostiosoite tarvitaan sähköpostin lähettämiseen
@@ -4639,7 +4683,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Anna arvo {0} ja {1}
 DocType: Purchase Order,Order Confirmation Date,Tilausvahvistuksen päivämäärä
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Laske arvioidut saapumisajat
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä ja asenna työntekijöiden nimeämisjärjestelmä henkilöstöresurssissa&gt; HR-asetukset
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,kuluvia
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Tilauksen aloituspäivä
@@ -4662,7 +4705,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account -tili
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,variantti
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Foorumin toiminta
-DocType: Service Level,Resolution Time Period,Ratkaisuaika
+DocType: Service Level Priority,Resolution Time Period,Ratkaisuaika
 DocType: Request for Quotation,Supplier Detail,Toimittajatiedot
 DocType: Project Task,View Task,Näytä tehtävä
 DocType: Serial No,Purchase / Manufacture Details,Osto / valmistustiedot
@@ -4729,6 +4772,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varaston voi vaihtaa vain varastomerkinnän / toimitusmerkinnän / ostokuitin kautta
 DocType: Support Settings,Close Issue After Days,Sulje ongelma päivien jälkeen
 DocType: Payment Schedule,Payment Schedule,Maksuaikataulu
+DocType: Shift Type,Enable Entry Grace Period,Ota käyttöön sisäänpääsymaksuaika
 DocType: Patient Relation,Spouse,puoliso
 DocType: Purchase Invoice,Reason For Putting On Hold,Syynä pidättämiseen
 DocType: Item Attribute,Increment,lisäys
@@ -4866,6 +4910,7 @@
 DocType: Vehicle Log,Invoice Ref,Laskun viite
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-lomake ei koske laskussa: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Laskun luominen
+DocType: Shift Type,Early Exit Grace Period,Varhainen irtautumisaikaa
 DocType: Patient Encounter,Review Details,Tarkista tiedot
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tunniarvon on oltava suurempi kuin nolla.
 DocType: Account,Account Number,Tilinumero
@@ -4877,7 +4922,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Sovelletaan, jos yhtiö on SpA, SApA tai SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Päällekkäiset olosuhteet:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Maksettu ja toimitettu
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Tuotekoodi on pakollinen, koska kohdetta ei numeroida automaattisesti"
 DocType: GST HSN Code,HSN Code,HSN-koodi
 DocType: GSTR 3B Report,September,syyskuu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Hallinnolliset kulut
@@ -4923,6 +4967,7 @@
 DocType: Opportunity,Sales Stage,Myyntivaihe
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Sanoissa näkyy, kun olet tallentanut myyntitilauksen."
 DocType: Item Reorder,Re-order Level,Tilaa taso uudelleen
+DocType: Shift Type,Enable Auto Attendance,Ota automaattinen osallistuminen käyttöön
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,etusija
 ,Department Analytics,Osasto Analytics
 DocType: Crop,Scientific Name,Tieteellinen nimi
@@ -4935,6 +4980,7 @@
 DocType: Quiz Activity,Quiz Activity,Tietokilpailu
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} ei ole voimassa olevassa palkka-ajanjaksossa
 DocType: Timesheet,Billed,laskutetaan
+apps/erpnext/erpnext/config/support.py,Issue Type.,Ongelman tyyppi.
 DocType: Restaurant Order Entry,Last Sales Invoice,Viimeinen myynti-lasku
 DocType: Payment Terms Template,Payment Terms,Maksuehdot
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Varattu Määrä: Myytävänä, mutta ei toimitettu määrä."
@@ -5030,6 +5076,7 @@
 DocType: Account,Asset,etu
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0}: lla ei ole terveydenhuollon harjoittajan aikataulua. Lisää se Healthcare Practitioner masteriin
 DocType: Vehicle,Chassis No,Alusta nro
+DocType: Employee,Default Shift,Oletussiirtymä
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Yritys Lyhenne
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Materiaaliluettelon puu
 DocType: Article,LMS User,LMS-käyttäjä
@@ -5078,6 +5125,7 @@
 DocType: Sales Person,Parent Sales Person,Vanhemman myyntihenkilö
 DocType: Student Group Creation Tool,Get Courses,Hanki kursseja
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, koska kohde on kiinteä omaisuus. Käytä erillistä riviä useita kertoja."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Työtunnit, joiden alapuolella poissaolo on merkitty. (Zero pois käytöstä)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Vain lehtisolmut ovat sallittuja tapahtumassa
 DocType: Grant Application,Organization,organisaatio
 DocType: Fee Category,Fee Category,Maksujen luokka
@@ -5090,6 +5138,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Päivitä tilasi treenitapahtumaan
 DocType: Volunteer,Morning,Aamu
 DocType: Quotation Item,Quotation Item,Tarjouspiste
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Issue Priority.
 DocType: Journal Entry,Credit Card Entry,Luottokorttimerkintä
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Aikaväli ohitettiin, paikka {0} - {1} päällekkäin olemassaolevaan paikkaan {2} {3}"
 DocType: Journal Entry Account,If Income or Expense,Jos tulot tai kulut
@@ -5140,11 +5189,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Tietojen tuonti ja asetukset
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Jos automaattinen sisäänkirjautuminen on valittuna, asiakkaat liitetään automaattisesti kyseiseen kanta-asiakasohjelmaan (tallennettuna)"
 DocType: Account,Expense Account,Kulutili
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Aika ennen siirtymän alkamisaikaa, jonka aikana työntekijän sisäänkirjautumista pidetään läsnäolona."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Suhde Guardianiin1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Luo lasku
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',"Työntekijä, joka on vapautettu {0}: sta, on asetettava vasemmalle"
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Maksa {0} {1}
+DocType: Company,Sales Settings,Myyntiasetukset
 DocType: Sales Order Item,Produced Quantity,Tuotettu määrä
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Tarjouspyyntöön pääsee klikkaamalla seuraavaa linkkiä
 DocType: Monthly Distribution,Name of the Monthly Distribution,Kuukausittaisen jakelun nimi
@@ -5223,6 +5274,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Myynnin ja oston oletetut veromallit luodaan.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Poistumistyyppiä {0} ei voi siirtää
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Veloitustilille on oltava saamisetili
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Sopimuksen päättymispäivä ei voi olla pienempi kuin tänään.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Määritä tili Varastossa {0} tai Oletusvarastoratkaisu yrityksessä {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Oletusasetuksena
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Tämän paketin nettopaino. (laskettu automaattisesti tuotteiden nettopainon summana)
@@ -5249,8 +5301,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Vanhentuneet erät
 DocType: Shipping Rule,Shipping Rule Type,Lähetyssäännön tyyppi
 DocType: Job Offer,Accepted,Hyväksytyt
-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> poistamalla tämä asiakirja"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Olet jo arvioinut arviointiperusteita {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Valitse Eränumerot
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Ikä (päivät)
@@ -5276,6 +5326,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Valitse verkkotunnuksesi
 DocType: Agriculture Task,Task Name,Tehtävän nimi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,"Varastokirjaukset, jotka on jo luotu työjärjestykseen"
+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> poistamalla tämä asiakirja"
 ,Amount to Deliver,Toimitettava määrä
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Yritystä {0} ei ole olemassa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Ei odotettavissa olevia aineistopyyntöjä, joiden on todettu linkittyvän kyseisiin kohteisiin."
@@ -5325,6 +5377,7 @@
 DocType: Lab Prescription,Test Code,Testikoodi
 DocType: Purchase Taxes and Charges,On Previous Row Total,Edellinen rivi yhteensä
 DocType: Student,Student Email Address,Opiskelijan sähköpostiosoite
+,Delayed Item Report,Viivästyneen kohteen raportti
 DocType: Academic Term,Education,koulutus
 DocType: Supplier Quotation,Supplier Address,Toimittajan osoite
 DocType: Salary Detail,Do not include in total,Älä sisällä yhteensä
@@ -5332,7 +5385,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ei ole olemassa
 DocType: Purchase Receipt Item,Rejected Quantity,Hylätty määrä
 DocType: Cashier Closing,To TIme,TIme
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM: n muuntokerrointa ({0} -&gt; {1}) ei löytynyt kohdasta {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Päivittäinen työn yhteenveto Ryhmän käyttäjä
 DocType: Fiscal Year Company,Fiscal Year Company,Tilivuoden yhtiö
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Vaihtoehtoinen kohde ei saa olla sama kuin alkukoodi
@@ -5384,6 +5436,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Toimituksen pysäytysten välinen viive
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Pakkaa varastot vanhemmiksi kuin [päivät]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Tarjouskilpailutuotteiden alennus
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Ongelma prioriteetti on jo olemassa
 DocType: Account,Asset Received But Not Billed,Omaisuus vastaanotettiin mutta ei laskutettu
 DocType: POS Closing Voucher,Total Collected Amount,Kerätty summa yhteensä
 DocType: Course,Default Grading Scale,Oletusasteikko
@@ -5426,6 +5479,7 @@
 DocType: Contract,Fulfilment Terms,Täytäntöönpanon ehdot
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ei-ryhmästä ryhmään
 DocType: Student Guardian,Mother,Äiti
+DocType: Issue,Service Level Agreement Fulfilled,Palvelutason sopimus täyttyi
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Vähennä verotusta hakematta työntekijäetuista
 DocType: Travel Request,Travel Funding,Matkarahoitus
 DocType: Shipping Rule,Fixed,kiinteä
@@ -5455,10 +5509,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Kohteita ei löytynyt.
 DocType: Item Attribute,From Range,Alueelta
 DocType: Clinical Procedure,Consumables,kulutushyödykkeet
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,vaaditaan &#39;worker_field_value&#39; ja &#39;timestamp&#39;.
 DocType: Purchase Taxes and Charges,Reference Row #,Viittausrivi #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Määritä Asset-poistokustannuskeskus yrityksessä {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,"Rivi # {0}: Maksuasiakirja on välttämätön, jotta leikkaus suoritetaan"
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Napsauta tätä painiketta, jos haluat vetää myyntitilaustietosi Amazon MWS: ltä."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Työaika, jonka alapuolella puolipäivä on merkitty. (Zero pois käytöstä)"
 ,Assessment Plan Status,Arviointisuunnitelman tila
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Valitse ensin {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Lähetä tämä luoda työntekijätieto
@@ -5529,6 +5585,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Aseta Open
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Vaihda suodattimia
 DocType: Production Plan,Material Request Detail,Materiaalipyynnön tiedot
+DocType: Shift Type,Process Attendance After,Prosessin osallistuminen jälkeen
 DocType: Material Request Item,Quantity and Warehouse,Määrä ja varasto
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Siirry ohjelmiin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Rivi # {0}: Kaksoiskappale viitteissä {1} {2}
@@ -5586,6 +5643,7 @@
 DocType: Pricing Rule,Party Information,Juhlatiedot
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Velalliset ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Tähän mennessä ei voi olla suurempi kuin työntekijän vapauttamispäivä
+DocType: Shift Type,Enable Exit Grace Period,Ota poistumisaikaa käyttöön
 DocType: Expense Claim,Employees Email Id,Työntekijöiden sähköpostiosoite
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Päivitä hinta osoitteesta Shopify To ERPNext Hinnasto
 DocType: Healthcare Settings,Default Medical Code Standard,Lääketieteellisen koodin oletusstandardi
@@ -5616,7 +5674,6 @@
 DocType: Budget,Applicable on Material Request,Sovelletaan aineistopyyntöön
 DocType: Support Settings,Search APIs,Etsi API: t
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Ylimääräinen tuotannon osuus myyntitilauksesta
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,tekniset tiedot
 DocType: Purchase Invoice,Supplied Items,Toimitettavat kohteet
 DocType: Leave Control Panel,Select Employees,Valitse Työntekijät
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Valitse korkotulotili lainassa {0}
@@ -5642,7 +5699,7 @@
 ,Supplier-Wise Sales Analytics,Toimittaja-viisas myynnin analytiikka
 DocType: GSTR 3B Report,February,helmikuu
 DocType: Appraisal,For Employee,Työntekijälle
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Todellinen toimituspäivä
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Todellinen toimituspäivä
 DocType: Sales Partner,Sales Partner Name,Myyntikumppanin nimi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Poisto-rivi {0}: Poistoajan aloituspäivä on merkitty viimeisenä päivämääränä
 DocType: GST HSN Code,Regional,alueellinen
@@ -5681,6 +5738,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Toimittajan tuloskortti
 DocType: Travel Itinerary,Travel To,Matkusta
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,Määritä sisään- ja uloskirjautuminen
 DocType: POS Closing Voucher,Difference,Ero
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Pieni
 DocType: Work Order Item,Work Order Item,Työjärjestys
@@ -5714,6 +5772,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,lääke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} on suljettu
 DocType: Patient,Medical History,Lääketieteellinen historia
+DocType: Expense Claim,Expense Taxes and Charges,Kustannusten verot ja maksut
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Laskun päivämäärän jälkeen kuluneiden päivien määrä ennen tilauksen peruuttamista tai merkintöjen merkitsemistä maksamatta
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Asennusohje {0} on jo lähetetty
 DocType: Patient Relation,Family,Perhe
@@ -5746,7 +5805,6 @@
 DocType: Dosage Strength,Strength,Vahvuus
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} yksiköt {1} tarvitsivat {2} tämän tapahtuman suorittamiseksi.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Alihankintapohjaiset raaka-aineet
-DocType: Bank Guarantee,Customer,asiakas
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jos tämä on käytössä, kenttä Akateeminen termi on pakollinen ohjelman rekisteröintityökalussa."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Eräperusteisen opiskelijaryhmän osalta opiskelija-erä validoidaan jokaiselle opiskelijalle ohjelman rekisteröinnistä.
 DocType: Course,Topics,aiheista
@@ -5826,6 +5884,7 @@
 DocType: Chapter,Chapter Members,Luvun jäsenet
 DocType: Warranty Claim,Service Address,Palvelun osoite
 DocType: Journal Entry,Remark,Huomautus
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),"Rivi {0}: Määrä, jota {4} ei ole varastossa {1} merkinnän postitusaikana ({2} {3})"
 DocType: Patient Encounter,Encounter Time,Encounter Time
 DocType: Serial No,Invoice Details,Laskun erittely
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ryhmät-kohdassa voidaan tehdä muita tilejä, mutta merkinnät voidaan tehdä muita kuin ryhmiä vastaan"
@@ -5906,6 +5965,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Sulkeminen (avaaminen + yhteensä)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriteerien kaava
 apps/erpnext/erpnext/config/support.py,Support Analytics,Tuki Analyticsille
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Osallistumislaitteen tunnus (biometrinen / RF-tunniste)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Tarkastelu ja toiminta
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jos tili on jäädytetty, käyttäjät voivat rajoittaa merkintöjä."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Määrä poistojen jälkeen
@@ -5927,6 +5987,7 @@
 DocType: Salary Slip,Loan Repayment,Lainan takaisinmaksu
 DocType: Employee Education,Major/Optional Subjects,Tärkeimmät / valinnaiset aiheet
 DocType: Soil Texture,Silt,liete
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Toimittajien osoitteet ja yhteystiedot
 DocType: Bank Guarantee,Bank Guarantee Type,Pankkitakaustyyppi
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jos poistat käytöstä, &#39;Pyöristetty summa&#39; -kenttä ei näy missään tapahtumassa"
 DocType: Pricing Rule,Min Amt,Min
@@ -5965,6 +6026,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Laskun luominen -työkalun kohta
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Sisällytä POS-tapahtumia
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},"Ei työntekijää, joka löytyy työntekijän kentän arvosta. &#39;{}&#39;: {}"
 DocType: Payment Entry,Received Amount (Company Currency),Vastaanotettu määrä (yrityksen valuutta)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage on täynnä, ei tallentanut"
 DocType: Chapter Member,Chapter Member,Luvun jäsen
@@ -5997,6 +6059,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Ei opiskelijaryhmiä.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Monista rivi {0} samalla {1}
 DocType: Employee,Salary Details,Palkan tiedot
+DocType: Employee Checkin,Exit Grace Period Consequence,Poistu Grace-jakson seurauksista
 DocType: Bank Statement Transaction Invoice Item,Invoice,Lasku
 DocType: Special Test Items,Particulars,tarkemmat tiedot
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Aseta suodatin perustuen kohteeseen tai varastoon
@@ -6098,6 +6161,7 @@
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Työprofiili, vaaditut tutkinnot jne."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Lähetetään valtiolle
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Haluatko lähettää aineistopyynnön
 DocType: Opportunity Item,Basic Rate,Perusnopeus
 DocType: Compensatory Leave Request,Work End Date,Työpäivämäärä
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Raaka-aineiden pyyntö
@@ -6282,6 +6346,7 @@
 DocType: Sales Order Item,Gross Profit,Bruttokate
 DocType: Quality Inspection,Item Serial No,Tuote Sarjanumero
 DocType: Asset,Insurer,vakuuttaja
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Ostomäärä
 DocType: Asset Maintenance Task,Certificate Required,Vaadittu todistus
 DocType: Retention Bonus,Retention Bonus,Pidätysbonus
@@ -6396,6 +6461,8 @@
 DocType: Invoice Discounting,Sanctioned,seuraamuksia
 DocType: Course Enrollment,Course Enrollment,Kurssin ilmoittautuminen
 DocType: Item,Supplier Items,Toimittajan tuotteet
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Aloitusaika ei voi olla suurempi tai yhtä suuri kuin lopetusaika {0}.
 DocType: Sales Order,Not Applicable,Ei sovellettavissa
 DocType: Support Search Source,Response Options,Vastausvaihtoehdot
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0}: n pitäisi olla arvo välillä 0 - 100
@@ -6481,7 +6548,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Kiinteä omaisuus
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Voitto yhteensä
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Share Balance,From No,Vuodesta No
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksun täsmäytyslasku
 DocType: Purchase Invoice,Taxes and Charges Added,Lisätyt verot ja maksut
@@ -6589,6 +6655,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ohita hinnoittelusääntö
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,ruoka
 DocType: Lost Reason Detail,Lost Reason Detail,Kadonnut syy Yksityiskohta
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Seuraavat sarjanumerot luotiin: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Asiakaspalaute
 DocType: Serial No,Warranty / AMC Details,Takuu / AMC-tiedot
 DocType: Issue,Opening Time,Avaamis aika
@@ -6638,6 +6705,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Yrityksen nimi ei ole sama
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Työntekijöiden edistämistä ei voi lähettää ennen tarjouspäivää
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ei saa päivittää {0} vanhempia varastotapahtumia
+DocType: Employee Checkin,Employee Checkin,Työntekijän tarkistus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Aloituspäivän tulee olla pienempi kuin loppupäivä kohdasta {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Luo asiakkaan lainausmerkkejä
 DocType: Buying Settings,Buying Settings,Ostoasetukset
@@ -6659,6 +6727,7 @@
 DocType: Patient,Patient Demographics,Potilaiden väestötiedot
 DocType: Share Transfer,To Folio No,To Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Rahavirta toiminnoista
+DocType: Employee Checkin,Log Type,Lokityyppi
 DocType: Stock Settings,Allow Negative Stock,Salli negatiiviset varastot
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Mitään kohteista ei ole muutoksia määrään tai arvoon.
 DocType: Asset,Purchase Date,Ostopäivä
@@ -6703,6 +6772,7 @@
 DocType: Vital Signs,Very Hyper,Erittäin hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Valitse yrityksesi luonne.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Valitse kuukausi ja vuosi
+DocType: Service Level,Default Priority,Oletus prioriteetti
 DocType: Student Log,Student Log,Opiskelijaloki
 DocType: Shopping Cart Settings,Enable Checkout,Ota Checkout käyttöön
 apps/erpnext/erpnext/config/settings.py,Human Resources,henkilöstöhallinto
@@ -6731,7 +6801,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Yhdistä Shopify ERPNextin avulla
 DocType: Homepage Section Card,Subtitle,alaotsikko
 DocType: Soil Texture,Loam,savimaata
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: BOM,Scrap Material Cost(Company Currency),Romun materiaalikustannukset (yrityksen valuutta)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Toimitusilmoitusta {0} ei saa lähettää
 DocType: Task,Actual Start Date (via Time Sheet),Todellinen aloituspäivä
@@ -6802,7 +6871,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Alihankintana siirretty materiaali
 DocType: Job Card,Timing Detail,Ajoitustiedot
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Pakollinen Käytössä
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} {1}: n tuominen
 DocType: Job Offer Term,Job Offer Term,Työn tarjouksen termi
 DocType: SMS Center,All Contact,Kaikki yhteystiedot
 DocType: Project Task,Project Task,Hankkeen tehtävä
@@ -6853,7 +6921,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Kohde {0} ei ole asetettu sarjanumeroille
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Valtiosta
 DocType: Leave Type,Maximum Continuous Days Applicable,Maksimi jatkuvia päiviä sovelletaan
-apps/erpnext/erpnext/config/support.py,Support Team.,Tukitiimi.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Anna ensin yrityksen nimi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Tuo onnistunut
 DocType: Guardian,Alternate Number,Vaihtoehtoinen numero
@@ -6945,6 +7012,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Rivi # {0}: Tuote lisättiin
 DocType: Student Admission,Eligibility and Details,Kelpoisuus ja tiedot
 DocType: Staffing Plan,Staffing Plan Detail,Henkilöstösuunnitelma
+DocType: Shift Type,Late Entry Grace Period,Late Entry Grace Period
 DocType: Email Digest,Annual Income,Vuositulot
 DocType: Journal Entry,Subscription Section,Tilausosa
 DocType: Salary Slip,Payment Days,Maksupäivät
@@ -6995,6 +7063,7 @@
 DocType: Journal Entry Account,Account Balance,Tilin saldo
 DocType: Asset Maintenance Log,Periodicity,Jaksotus
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Sairauskertomus
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Lokityyppi vaaditaan siirtoihin: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,suoritus
 DocType: Item,Valuation Method,Arviointimenetelmä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
@@ -7079,6 +7148,7 @@
 DocType: Loan Type,Loan Name,Lainan nimi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Määritä maksutapa
 DocType: Quality Goal,Revision,tarkistus
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Aika ennen vaihtoa päättyy, kun uloskirjautuminen katsotaan aikaiseksi (minuutteina)."
 DocType: Healthcare Service Unit,Service Unit Type,Huoltoyksikön tyyppi
 DocType: Purchase Invoice,Return Against Purchase Invoice,Palauta ostolaskuun
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Luo salaisuus
@@ -7234,12 +7304,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmetiikka
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Tarkista tämä, jos haluat pakottaa käyttäjän valitsemaan sarjan ennen tallennusta. Tällöin ei ole oletusarvoisia."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Käyttäjät, joilla on tämä rooli, voivat asettaa jäädytettyjä tilejä ja luoda / muokata kirjanpitotietoja jäädytettyjä tilejä vastaan"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Merkki
 DocType: Expense Claim,Total Claimed Amount,Vaadittu summa yhteensä
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Aikaväliä ei löydy seuraavien {0} päivien aikana toiminnasta {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Käärimistä
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Voit uusia vain, jos jäsenyytesi päättyy 30 päivän kuluessa"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Arvon on oltava välillä {0} ja {1}
 DocType: Quality Feedback,Parameters,parametrit
+DocType: Shift Type,Auto Attendance Settings,Automaattinen osallistumisasetukset
 ,Sales Partner Transaction Summary,Myyntikumppanin transaktioiden yhteenveto
 DocType: Asset Maintenance,Maintenance Manager Name,Huoltokeskuksen nimi
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Tuotteen tiedot on haettava.
@@ -7331,10 +7403,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Vahvista sovellettu sääntö
 DocType: Job Card Item,Job Card Item,Työpaikkakortti
 DocType: Homepage,Company Tagline for website homepage,Yrityksen Tagline-sivusto kotisivulle
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Määritä vastausaika ja resoluutio prioriteetille {0} indeksissä {1}.
 DocType: Company,Round Off Cost Center,Pyöreitä kustannuskeskus
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteerit Paino
 DocType: Asset,Depreciation Schedules,Poistoajat
-DocType: Expense Claim Detail,Claim Amount,Vaatimuksen määrä
 DocType: Subscription,Discounts,alennukset
 DocType: Shipping Rule,Shipping Rule Conditions,Toimitusehdot
 DocType: Subscription,Cancelation Date,Peruutuspäivä
@@ -7362,7 +7434,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Näytä nolla-arvot
 DocType: Employee Onboarding,Employee Onboarding,Työntekijä onboarding
 DocType: POS Closing Voucher,Period End Date,Ajan päättymispäivä
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Myyntimahdollisuudet lähteen mukaan
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Ensimmäinen Leave Approver -luettelo asetetaan luetteloon oletusarvoiseksi Leave Approveriksi.
 DocType: POS Settings,POS Settings,POS-asetukset
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Kaikki tilit
@@ -7383,7 +7454,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Rivi # {0}: Hinta on sama kuin {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Terveydenhuollon palvelut
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Merkintöjä ei löydy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Ikääntymisalue 3
 DocType: Vital Signs,Blood Pressure,Verenpaine
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Tavoite päällä
@@ -7430,6 +7500,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,erissä
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Puolustus
 DocType: Item,Has Batch No,Onko eränumero
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Viivästetyt päivät
 DocType: Lead,Person Name,Henkilön nimi
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Training Event Employee,Invited,Kutsuttu
@@ -7451,7 +7522,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",Alkamis- ja päättymispäivät eivät ole voimassa olevan palkka-ajan kuluessa eivät voi laskea {0}.
 DocType: POS Profile,Only show Customer of these Customer Groups,Näytä vain näiden asiakasryhmien asiakas
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Valitse laskutoimitukset
-DocType: Service Level,Resolution Time,Tarkkuusaika
+DocType: Service Level Priority,Resolution Time,Tarkkuusaika
 DocType: Grading Scale Interval,Grade Description,Luokan kuvaus
 DocType: Homepage Section,Cards,Kortit
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Laadun kokouspöytäkirjat
@@ -7477,6 +7548,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Pankin tilinpäätössiirto pääkirjaan nähden
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Terveydenhuolto (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,"Oletusvarasto, jonka avulla voit luoda myyntitilaus- ja toimitusilmoituksen"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,{0}: n vastausaika indeksissä {1} ei voi olla suurempi kuin tarkkuusaika.
 DocType: Opportunity,Customer / Lead Name,Asiakkaan / johtajan nimi
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Pyytämätön määrä
@@ -7523,7 +7595,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Osapuolten ja osoitteiden tuominen
 DocType: Item,List this Item in multiple groups on the website.,Luettele tämä kohde useille ryhmille sivustolla.
 DocType: Request for Quotation,Message for Supplier,Viesti toimittajalle
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"{0} ei voi vaihtaa, koska kohde {1} -vaihtoehto on olemassa."
 DocType: Healthcare Practitioner,Phone (R),Puhelin (R)
 DocType: Maintenance Team Member,Team Member,Tiimin jäsen
 DocType: Asset Category Account,Asset Category Account,Omaisuusluokan tili
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 85c39ad..8edaeb0 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Rendez-vous {0} et facture commerciale {1} annulés
 DocType: Purchase Receipt,Vehicle Number,Numéro de véhicule
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Votre adresse email...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Inclure les entrées de livre par défaut
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Inclure les entrées de livre par défaut
 DocType: Activity Cost,Activity Type,Type d&#39;activité
 DocType: Purchase Invoice,Get Advances Paid,Obtenir des avances payées
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte de gain / perte sur la cession d&#39;actifs
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Entrées de paiement
 DocType: Employee Education,Class / Percentage,Classe / pourcentage
 ,Electronic Invoice Register,Registre de facture électronique
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Le nombre d&#39;occurrences après lequel la conséquence est exécutée.
 DocType: Sales Invoice,Is Return (Credit Note),Est le retour (note de crédit)
+DocType: Price List,Price Not UOM Dependent,Prix non dépendant de l&#39;UOM
 DocType: Lab Test Sample,Lab Test Sample,Échantillon de test de laboratoire
 DocType: Shopify Settings,status html,statut html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pour par exemple 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Salaire net
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Montant total facturé
 DocType: Clinical Procedure,Consumables Invoice Separately,Consommables facturent séparément
+DocType: Shift Type,Working Hours Threshold for Absent,Seuil des heures de travail pour absent
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR- APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Le budget ne peut pas être affecté à un compte de groupe {0}
 DocType: Purchase Receipt Item,Rate and Amount,Taux et montant
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Asset,Insurance End Date,Date de fin de l&#39;assurance
 DocType: Bank Account,Branch Code,Code de succursale
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Temps de réponse
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Forum utilisateur
 DocType: Landed Cost Item,Landed Cost Item,Article de coût d&#39;atterrissage
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Le vendeur et l&#39;acheteur ne peuvent pas être identiques
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Transfert
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Élément de recherche (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Résultat soumis
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,La date de début ne peut être supérieure à la date de fin
 DocType: Supplier,Supplier of Goods or Services.,Fournisseur de biens ou de services.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nom du nouveau compte. Remarque: ne créez pas de comptes pour les clients et les fournisseurs.
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Groupe de travail ou horaire de cours obligatoire
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Nom de la compétence
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Imprimer le bulletin
 DocType: Soil Texture,Ternary Plot,Terrain ternaire
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Billets de soutien
 DocType: Asset Category Account,Fixed Asset Account,Compte d&#39;immobilisation
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Dernier
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obligatoire pour le bilan
 DocType: Payment Entry,Total Allocated Amount,Montant total alloué
 DocType: Sales Invoice,Get Advances Received,Recevoir les avances reçues
+DocType: Shift Type,Last Sync of Checkin,Dernière synchronisation de Checkin
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Article Montant de la taxe inclus dans la valeur
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Groupe sanguin
 apps/erpnext/erpnext/config/healthcare.py,Masters,Maîtrise
 DocType: Crop,Crop Spacing UOM,UdM d&#39;espacement des cultures
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,L&#39;heure après l&#39;heure de début du quart de travail où l&#39;enregistrement est considéré comme tardif (en minutes).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Explorer
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Aucune facture en attente trouvée
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} postes à pourvoir et {1} budget pour {2} déjà prévus pour les filiales de {3}. \ Vous ne pouvez planifier que jusqu&#39;à {4} postes vacants et le budget {5} conformément au plan d&#39;effectifs {6} de la société mère {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Dalles à prix réduit
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Moyenne mobile
 DocType: Employee Attendance Tool,Unmarked Attendance,Présence non marquée
 DocType: Homepage Section,Number of Columns,Le nombre de colonnes
+DocType: Issue Priority,Issue Priority,Priorité d&#39;émission
 DocType: Holiday List,Add Weekly Holidays,Ajouter des vacances hebdomadaires
 DocType: Shopify Log,Shopify Log,Journal Shopify
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Créer une fiche de salaire
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Date d&#39;émission
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Veuillez sélectionner un lot pour l&#39;élément {0}. Impossible de trouver un seul lot répondant à cette exigence
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Impossible de créer un bonus de rétention pour les employés restants
+DocType: Employee Checkin,Location / Device ID,Emplacement / ID de périphérique
 DocType: Purchase Order,To Receive,Recevoir
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors ligne. Vous ne pourrez pas recharger avant d&#39;avoir un réseau.
 DocType: Course Activity,Enrollment,Inscription
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informations manquantes sur la facturation électronique
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Aucune demande matérielle créée
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Loan,Total Amount Paid,Montant total payé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Tous ces articles ont déjà été facturés
 DocType: Training Event,Trainer Name,Nom du formateur
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Veuillez mentionner le nom du responsable en source {0}
 DocType: Employee,You can enter any date manually,Vous pouvez entrer n&#39;importe quelle date manuellement
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Article de rapprochement des stocks
+DocType: Shift Type,Early Exit Consequence,Conséquence de sortie anticipée
 DocType: Item Group,General Settings,réglages généraux
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,La date d&#39;échéance ne peut pas être antérieure à la date de comptabilisation / facture fournisseur
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Entrez le nom du bénéficiaire avant de le soumettre.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Confirmation de paiement
 ,Available Stock for Packing Items,Stock disponible pour les articles d&#39;emballage
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Veuillez supprimer cette facture {0} du formulaire C {1}.
+DocType: Shift Type,Every Valid Check-in and Check-out,Chaque enregistrement valide et check-out
 DocType: Support Search Source,Query Route String,Query Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Modèle de commentaires client
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citations aux prospects ou aux clients.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,Contrôle d&#39;autorisation
 ,Daily Work Summary Replies,Résumé du travail quotidien
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer au projet: {0}
+DocType: Issue,Response By Variance,Réponse par variance
 DocType: Item,Sales Details,Détails des ventes
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Têtes de lettres pour les modèles d&#39;impression.
 DocType: Salary Detail,Tax on additional salary,Taxe sur le salaire supplémentaire
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Progression de la tâche
 DocType: Journal Entry,Opening Entry,Entrée d&#39;ouverture
 DocType: Bank Guarantee,Charges Incurred,Accusations portées
+DocType: Shift Type,Working Hours Calculation Based On,Calcul des heures de travail basé sur
 DocType: Work Order,Material Transferred for Manufacturing,Matière transférée pour la fabrication
 DocType: Products Settings,Hide Variants,Masquer les variantes
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Désactiver la planification de la capacité et le suivi du temps
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,Intérêts
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantité consommée
 DocType: Education Settings,Education Manager,Responsable de l&#39;éducation
+DocType: Employee Checkin,Shift Actual Start,Décalage début effectif
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planifiez les journaux de temps en dehors des heures de travail du poste de travail.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Points de fidélité: {0}
 DocType: Healthcare Settings,Registration Message,Message d&#39;inscription
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Facture déjà créée pour toutes les heures de facturation
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Purchase Invoice,Pricing Rules,Règles de tarification
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec le poste {0}, vous ne pouvez pas modifier la valeur de {1}."
 DocType: Hub Tracked Item,Image List,Liste d&#39;images
 DocType: Item Variant Settings,Allow Rename Attribute Value,Permettre de renommer la valeur d&#39;attribut
-DocType: Price List,Price Not UOM Dependant,Prix non dépendant de l&#39;UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Temps (en minutes)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,De base
 DocType: Loan,Interest Income Account,Compte de revenu d&#39;intérêts
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Sélectionnez le profil du PDV
 DocType: Support Settings,Get Latest Query,Obtenir la dernière requête
 DocType: Employee Incentive,Employee Incentive,Incitation des employés
+DocType: Service Level,Priorities,Les priorités
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Ajouter des cartes ou des sections personnalisées sur la page d&#39;accueil
 DocType: Homepage,Hero Section Based On,Section de héros basée sur
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût total d&#39;achat (via la facture d&#39;achat)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Quantité commandée
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ligne n ° {0}: L&#39;entrepôt refusé est obligatoire pour l&#39;élément rejeté {1}.
 ,Received Items To Be Billed,Articles reçus à facturer
-DocType: Salary Slip Timesheet,Working Hours,Heures de travail
+DocType: Attendance,Working Hours,Heures de travail
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Mode de paiement
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Bons de commande non reçus à temps
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Durée en jours
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Informations statutaires et autres informations générales sur votre fournisseur
 DocType: Item Default,Default Selling Cost Center,Centre de coûts de vente par défaut
 DocType: Sales Partner,Address & Contacts,Adresse et contacts
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 DocType: Subscriber,Subscriber,Abonné
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) est en rupture de stock
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Veuillez sélectionner la date d&#39;affichage en premier
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,Tâches créées
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,La nomenclature par défaut ({0}) doit être active pour cet article ou son modèle.
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Taux de commission%
-DocType: Service Level,Response Time,Temps de réponse
+DocType: Service Level Priority,Response Time,Temps de réponse
 DocType: Woocommerce Settings,Woocommerce Settings,Paramètres Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,La quantité doit être positive
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Cartographie des données de transaction
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Un responsable requiert le nom d&#39;une personne ou le nom d&#39;une organisation
 DocType: Student,Guardians,Gardiens
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Sélectionnez une marque ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Revenu moyen
 DocType: Shipping Rule,Calculate Based On,Calculer sur
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},La fiche de présence {0} existe contre l&#39;élève {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Date de la transaction
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Annuler l&#39;abonnement
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Impossible de définir le contrat de service {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Montant net du salaire
 DocType: Account,Liability,Responsabilité
 DocType: Employee,Bank A/C No.,Bank A / C No.
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Code d&#39;article matière première
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,La facture d&#39;achat {0} est déjà soumise.
 DocType: Fees,Student Email,Email de l&#39;étudiant
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Récursion de nomenclature: {0} ne peut pas être le parent ou l&#39;enfant de {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Obtenir des articles des services de santé
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Entrée de stock {0} non soumise
 DocType: Item Attribute Value,Item Attribute Value,Valeur d&#39;attribut d&#39;élément
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,Sélectionner les articles à fabriquer
 DocType: Leave Application,Leave Approver Name,Laisser le nom de l&#39;approbateur
 DocType: Shareholder,Shareholder,Actionnaire
-DocType: Issue,Agreement Status,Statut de l&#39;accord
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Paramètres par défaut pour la vente de transactions.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Veuillez sélectionner l&#39;admission des étudiants qui est obligatoire pour le candidat payé.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Sélectionner une nomenclature
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,Compte de revenu
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Tous les entrepôts
 DocType: Contract,Signee Details,Détails du destinataire
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Autoriser le départ après l&#39;heure de fin du quart (en minutes)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Approvisionnement
 DocType: Item Group,Check this if you want to show in website,Cochez cette option si vous souhaitez afficher sur le site Web
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Année fiscale {0} non trouvée
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,Taux de facturation
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Avertissement: Un autre {0} # {1} existe pour la saisie du stock {2}.
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Activez les paramètres de Google Maps pour évaluer et optimiser les itinéraires.
+DocType: Purchase Invoice Item,Page Break,Saut de page
 DocType: Supplier Scorecard Criteria,Max Score,Score Max
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,La date de début du remboursement ne peut pas être antérieure à la date de décaissement.
 DocType: Support Search Source,Support Search Source,Support Search Source
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,Transfert d&#39;employé
 ,Sales Funnel,Entonnoir de vente
 DocType: Agriculture Analysis Criteria,Water Analysis,Analyse de l&#39;eau
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Commencez l&#39;enregistrement avant l&#39;heure de début du poste (en minutes)
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes gelés jusqu&#39;à
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Il n&#39;y a rien à éditer.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longue que toutes les heures de travail disponibles sur le poste de travail {1}, décomposez l&#39;opération en plusieurs opérations."
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},La commande client {0} est {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Retard de paiement (jours)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Entrer les détails de l&#39;amortissement
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Bon de commande client
 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 postérieure à la date de commande.
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,La quantité d&#39;article ne peut être nulle
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Attribut invalide
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Veuillez sélectionner une nomenclature en fonction de l&#39;article {0}.
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Type de facture
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,Après midi
 DocType: Vital Signs,Nutrition Values,Valeurs Nutritionnelles
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Fièvre (température&gt; 38,5 ° C / soutenue ou température continue&gt; 38 ° C / 100,4 ° F)"
+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 nommage des employés dans Ressources humaines&gt; Paramètres RH
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,CTI inversé
 DocType: Project,Collect Progress,Recueillir les progrès
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Énergie
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,Articles commandés à facturer
 DocType: Taxable Salary Slab,To Amount,Pour constituer
 DocType: Purchase Invoice,Is Return (Debit Note),Est le retour (note de débit)
+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/config/desktop.py,Getting Started,Commencer
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Fusionner
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Impossible de changer la date de début d&#39;exercice et la date de fin d&#39;exercice une fois que l&#39;exercice est enregistré.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},La date de début de maintenance ne peut pas être antérieure à la date de livraison pour le numéro de série {0}.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Ligne {0}: le taux de change est obligatoire
 DocType: Purchase Invoice,Select Supplier Address,Sélectionnez l&#39;adresse du fournisseur
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",La quantité disponible est {0}. Vous avez besoin de {1}.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Veuillez entrer le secret du consommateur API
 DocType: Program Enrollment Fee,Program Enrollment Fee,Frais d&#39;inscription au programme
+DocType: Employee Checkin,Shift Actual End,Décalage effectif fin
 DocType: Serial No,Warranty Expiry Date,Date d&#39;expiration de la garantie
 DocType: Hotel Room Pricing,Hotel Room Pricing,Prix des chambres d&#39;hôtel
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Fournitures taxables à la sortie (autres que détaxées, nulles et exonérées"
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lecture 5
 DocType: Shopping Cart Settings,Display Settings,Paramètres d&#39;affichage
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Veuillez définir le nombre d&#39;amortissements enregistrés
+DocType: Shift Type,Consequence after,Conséquence après
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Avec quoi as tu besoin d&#39;aide?
 DocType: Journal Entry,Printing Settings,Paramètres d&#39;impression
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bancaire
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,L&#39;adresse de facturation est identique à l&#39;adresse de livraison
 DocType: Account,Cash,En espèces
 DocType: Employee,Leave Policy,Politique de congés
+DocType: Shift Type,Consequence,Conséquence
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Adresse de l&#39;étudiant
 DocType: GST Account,CESS Account,Compte CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Un centre de coûts est requis pour le compte &quot;pertes et profits&quot; {2}. Veuillez configurer un centre de coûts par défaut pour la société.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Bon de clôture de période
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Nom du gardien2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,S&#39;il vous plaît entrer compte de dépenses
+DocType: Issue,Resolution By Variance,Résolution par variance
 DocType: Employee,Resignation Letter Date,Date de lettre de démission
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Présence à ce jour
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Voir maintenant
 DocType: Item Price,Valid Upto,Valable jusqu&#39;au
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Le type de référence doit être l&#39;un des {0}
+DocType: Employee Checkin,Skip Auto Attendance,Ignorer l&#39;assistance automatique
 DocType: Payment Request,Transaction Currency,Devise de la transaction
 DocType: Loan,Repayment Schedule,Calendrier de remboursement
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Créer un échantillon de stock de rétention
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Taxes sur les bons d&#39;achat
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Action initialisée
 DocType: POS Profile,Applicable for Users,Applicable pour les utilisateurs
+,Delayed Order Report,Rapport de commande retardé
 DocType: Training Event,Exam,Examen
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nombre incorrect d&#39;entrées du grand livre général trouvé. Vous avez peut-être sélectionné un compte incorrect dans la transaction.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Pipeline des ventes
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Des conditions seront appliquées sur tous les éléments sélectionnés combinés.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configurer
 DocType: Hotel Room,Capacity,Capacité
+DocType: Employee Checkin,Shift End,Fin de quart
 DocType: Installation Note Item,Installed Qty,Quantité installée
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Le lot {0} de l&#39;élément {1} est désactivé.
 DocType: Hotel Room Reservation,Hotel Reservation User,Réservation d&#39;hôtel
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Workday a été répété deux fois
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,L&#39;accord de niveau de service avec le type d&#39;entité {0} et l&#39;entité {1} existe déjà.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Groupe d&#39;articles non mentionné dans l&#39;article principal pour l&#39;article {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Erreur de nom: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Le territoire est requis dans le profil de PDV
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,Date de l&#39;horaire
 DocType: Packing Slip,Package Weight Details,Détails du poids du colis
 DocType: Job Applicant,Job Opening,Une opportunité d&#39;emploi
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Dernière synchronisation réussie de l&#39;enregistrement des employés. Réinitialisez cette opération uniquement si vous êtes certain que tous les journaux sont synchronisés à partir de tous les emplacements. S&#39;il vous plaît ne modifiez pas cela si vous n&#39;êtes pas sûr.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Prix actuel
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L’avance totale ({0}) sur la commande {1} ne peut pas être supérieure au total général ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Variantes d&#39;article mises à jour
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Obtenir des invocies
 DocType: Tally Migration,Is Day Book Data Imported,Les données du carnet de jour sont-elles importées?
 ,Sales Partners Commission,Commission des partenaires commerciaux
+DocType: Shift Type,Enable Different Consequence for Early Exit,Activer des conséquences différentes pour une sortie anticipée
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Légal
 DocType: Loan Application,Required by Date,Requis par date
 DocType: Quiz Result,Quiz Result,Résultat du quiz
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,Règle de tarification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Liste de congés facultative non définie pour la période de congé {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Définissez le champ ID utilisateur dans un enregistrement d&#39;employé pour définir le rôle de l&#39;employé.
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Temps de résolution
 DocType: Training Event,Training Event,Événement de formation
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La pression artérielle au repos normale chez l&#39;adulte est d&#39;environ 120 mmHg systolique et de 80 mmHg diastolique, en abrégé &quot;120/80 mmHg&quot;."
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Le système récupérera toutes les entrées si la valeur limite est zéro.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,Approuvé
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},La date de début doit être comprise dans l&#39;exercice financier. En supposant que la date de début = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Veuillez définir le groupe de fournisseurs dans les paramètres d&#39;achat.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} est un statut de présence invalide.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Compte d&#39;ouverture temporaire
 DocType: Purchase Invoice,Cash/Bank Account,Trésorerie / compte bancaire
 DocType: Quality Meeting Table,Quality Meeting Table,Table de réunion de qualité
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Alimentation, boissons et tabac"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Horaire du cours
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,La participation sera automatiquement marquée après cette date.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Fournitures faites aux titulaires de l&#39;UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Demande de devis
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,La devise ne peut pas être changée après des entrées utilisant une autre devise
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,Est un article du hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Procédure de qualité.
 DocType: Share Balance,No of Shares,Nombre d&#39;actions
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ligne {0}: la quantité n&#39;est pas disponible pour {4} dans l&#39;entrepôt {1} au moment de la comptabilisation de l&#39;entrée ({2} {3}).
 DocType: Quality Action,Preventive,Préventif
 DocType: Support Settings,Forum URL,URL du forum
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Employé et assiduité
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Taxes et frais par défaut
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Ceci est basé sur les transactions avec ce fournisseur. Voir la chronologie ci-dessous pour plus de détails
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Le montant maximum de la prestation de l&#39;employé {0} dépasse {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Entrez les dates de début et de fin de l&#39;accord.
 DocType: Delivery Note Item,Against Sales Invoice,Contre facture de vente
 DocType: Loyalty Point Entry,Purchase Amount,Montant des achats
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Ne peut pas être défini comme perdu car la commande est faite.
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,nom de l&#39;organisation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Les champs valides à partir de et valables jusqu&#39;à sont obligatoires pour le cumulatif.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Ligne n ° {0}: le numéro de lot doit être identique à {1} {2}.
-DocType: Employee,Leave Details,Laisser les détails
+DocType: Employee Checkin,Shift Start,Début de quart
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Les transactions de stock avant le {0} sont gelées
 DocType: Driver,Issuing Date,Date d&#39;émission
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Demandeur
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Détails du modèle de mappage des flux de trésorerie
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Recrutement et formation
 DocType: Drug Prescription,Interval UOM,UOM d&#39;intervalle
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Paramètres de période de grâce pour l&#39;assistance automatique
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,De la monnaie à la monnaie ne peuvent être identiques
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Médicaments
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Heures d&#39;assistance
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} est annulé ou fermé
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ligne {0}: l&#39;avance sur le client doit être créditée
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grouper par bon (consolidé)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,Manager de territoire
 DocType: Lab Test,Sample ID,ID échantillon
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Le panier est vide
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,La présence a été marquée selon les enregistrements des employés
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,L&#39;élément {0} doit être soumis.
 ,Absent Student Report,Rapport d&#39;étudiant absent
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Inclus dans le bénéfice brut
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,Montant financé
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} n&#39;a pas été soumis, l&#39;action ne peut donc pas être terminée."
 DocType: Subscription,Trial Period End Date,Date de fin de la période d&#39;essai
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Alterner les entrées comme IN et OUT pendant le même quart
 DocType: BOM Update Tool,The new BOM after replacement,La nouvelle nomenclature après remplacement
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Point 5
 DocType: Employee,Passport Number,Numéro de passeport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Ouverture temporaire
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Fournisseur possible
 ,Issued Items Against Work Order,Articles publiés contre ordre de travail
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Création de la facture {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 DocType: Student,Joining Date,Date d&#39;inscription
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Site demandeur
 DocType: Purchase Invoice,Against Expense Account,Compte contre frais
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,Frais applicables
 ,Point of Sale,Point de vente
 DocType: Authorization Rule,Approving User  (above authorized value),Utilisateur approbateur (valeur autorisée ci-dessus)
+DocType: Service Level Agreement,Entity,Entité
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} à {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Le client {0} n&#39;appartient pas au projet {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Du nom du parti
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),Composition de sable (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Données du journal d&#39;importation
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 DocType: Asset,Asset Owner Company,Propriétaire propriétaire de l&#39;entreprise
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Un centre de coûts est nécessaire pour réserver une demande de remboursement.
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} numéros de série valides pour l&#39;élément {1}
@@ -3399,7 +3432,6 @@
 DocType: Asset,Asset Owner,Propriétaire d&#39;actif
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},L&#39;entrepôt est obligatoire pour le poste de stock {0} dans la rangée {1}.
 DocType: Stock Entry,Total Additional Costs,Total des coûts supplémentaires
-DocType: Marketplace Settings,Last Sync On,Dernière synchronisation sur
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Veuillez définir au moins une ligne dans le tableau des taxes et des frais.
 DocType: Asset Maintenance Team,Maintenance Team Name,Nom de l&#39;équipe de maintenance
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Tableau des centres de coûts
@@ -3415,12 +3447,12 @@
 DocType: Job Card,WIP Warehouse,Entrepôt WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID utilisateur non défini pour l&#39;employé {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","La quantité disponible est {0}, vous avez besoin de {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Utilisateur {0} créé
 DocType: Stock Settings,Item Naming By,Nom de l&#39;article par
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Commandé
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ceci est un groupe de clients racine et ne peut pas être modifié.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,La demande de matériel {0} est annulée ou arrêtée
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Strictement basé sur le type de journal dans l&#39;enregistrement des employés
 DocType: Purchase Order Item Supplied,Supplied Qty,Quantité fournie
 DocType: Cash Flow Mapper,Cash Flow Mapper,Mappeur de flux de trésorerie
 DocType: Soil Texture,Sand,Le sable
@@ -3479,6 +3511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Groupe d&#39;articles en double trouvé dans la table des groupes d&#39;articles
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Salaire annuel
 DocType: Supplier Scorecard,Weighting Function,Fonction de pondération
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UOM ({0} -&gt; {1}) introuvable pour l&#39;élément: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Erreur lors de l&#39;évaluation de la formule de critère
 ,Lab Test Report,Rapport de test de laboratoire
 DocType: BOM,With Operations,Avec des opérations
@@ -3492,6 +3525,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Aucun remboursement disponible pour l&#39;écriture au journal
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Faire une entrée de stock
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Récursion de nomenclature: {0} ne peut pas être le parent ou l&#39;enfant de {1}
 DocType: Employee Onboarding,Activities,Activités
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Au moins un entrepôt est obligatoire
 ,Customer Credit Balance,Solde du crédit client
@@ -3504,9 +3538,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Programme de fidélité multiple trouvé pour le client. Veuillez sélectionner manuellement.
 DocType: Patient,Medication,Des médicaments
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Sélectionnez le programme de fidélité
+DocType: Employee Checkin,Attendance Marked,Présence marquée
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Matières premières
 DocType: Sales Order,Fully Billed,Entièrement facturé
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Veuillez définir le tarif de la chambre d&#39;hôtel sur {}.
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Sélectionnez une seule priorité par défaut.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Veuillez identifier / créer un compte (grand livre) pour le type - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Le montant total du crédit / débit doit être identique à celui de l&#39;écriture de journal liée.
 DocType: Purchase Invoice Item,Is Fixed Asset,Est une immobilisation
@@ -3527,6 +3563,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Confirmation de rendez-vous
 DocType: Shopping Cart Settings,Orders,Ordres
 DocType: HR Settings,Retirement Age,L&#39;âge de la retraite
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Quantité projetée
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La suppression n&#39;est pas autorisée pour le pays {0}.
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Ligne n ° {0}: l&#39;actif {1} est déjà {2}
@@ -3610,11 +3647,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Comptable
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Le bon de fermeture du point de vente existe déjà pour {0} entre la date {1} et le {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navigation
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Aucune facture en attente ne nécessite une réévaluation du taux de change
 DocType: Authorization Rule,Customer / Item Name,Nom du client / article
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Le nouveau numéro de série ne peut pas avoir d’entrepôt. L&#39;entrepôt doit être défini par entrée de stock ou reçu d&#39;achat.
 DocType: Issue,Via Customer Portal,Via le portail client
 DocType: Work Order Operation,Planned Start Time,Heure de début prévue
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} est {2}
+DocType: Service Level Priority,Service Level Priority,Priorité de niveau de service
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Le nombre d&#39;amortissements comptabilisés ne peut être supérieur au nombre total d&#39;amortissements
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Partage grand livre
 DocType: Journal Entry,Accounts Payable,Comptes à payer
@@ -3725,7 +3764,6 @@
 DocType: Delivery Note,Delivery To,Livraison à
 DocType: Bank Statement Transaction Settings Item,Bank Data,Données bancaires
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Prévu jusqu&#39;à
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Maintenir les heures de facturation et les heures de travail identiques sur la feuille de temps
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Suivi des leads par source de leads.
 DocType: Clinical Procedure,Nursing User,Utilisateur infirmier
 DocType: Support Settings,Response Key List,Liste des clés de réponse
@@ -3893,6 +3931,7 @@
 DocType: Work Order Operation,Actual Start Time,Heure de début réelle
 DocType: Antibiotic,Laboratory User,Utilisateur de laboratoire
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Enchères en ligne
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,La priorité {0} a été répétée.
 DocType: Fee Schedule,Fee Creation Status,Statut de création de frais
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Logiciels
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Commande client au paiement
@@ -3959,6 +3998,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Impossible de récupérer les informations pour {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou à la devise du compte client.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Veuillez saisir l&#39;ID employé de ce vendeur
+DocType: Shift Type,Early Exit Consequence after,Conséquence de sortie précoce après
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Créer des factures d&#39;ouverture et des factures d&#39;achat
 DocType: Disease,Treatment Period,Période de traitement
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Configuration de l&#39;email
@@ -3976,7 +4016,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Nom d&#39;étudiant:
 DocType: SMS Log,Sent On,Envoyé sur
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Facture de vente
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Le temps de réponse ne peut être supérieur au temps de résolution
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Pour les groupes d&#39;étudiants basés sur le cours, le cours sera validé pour chaque élève des cours inscrits dans le programme d&#39;inscription."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Fournitures intra-étatiques
 DocType: Employee,Create User Permission,Créer une autorisation utilisateur
@@ -4015,6 +4054,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Conditions contractuelles standard pour la vente ou l&#39;achat.
 DocType: Sales Invoice,Customer PO Details,Détails du client
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patient non trouvé
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Sélectionnez une priorité par défaut.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Supprimer l&#39;article si les frais ne sont pas applicables à cet article
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Un groupe de clients existe avec le même nom, veuillez modifier le nom du client ou renommer le groupe de clients."
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4054,6 +4094,7 @@
 DocType: Support Settings,Support Portal,Portail d&#39;assistance
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,La date de fin de la tâche <b>{0}</b> ne peut pas être inférieure à <b>{1}</b> date de début attendue <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},L&#39;employé {0} est en congé le {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Cet accord de niveau de service est spécifique au client {0}.
 DocType: Employee,Held On,Tenue sur
 DocType: Healthcare Practitioner,Practitioner Schedules,Horaires des pratiquants
 DocType: Project Template Task,Begin On (Days),Commencer sur (jours)
@@ -4061,6 +4102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},L&#39;ordre de travail a été {0}
 DocType: Inpatient Record,Admission Schedule Date,Date du calendrier d&#39;admission
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Ajustement de la valeur de l&#39;actif
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Marquez la présence sur la base de &#39;Enregistrement des employés&#39; pour les employés affectés à ce poste.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Fournitures faites à des personnes non inscrites
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Tous les emplois
 DocType: Appointment Type,Appointment Type,Type de rendez-vous
@@ -4174,7 +4216,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut de l&#39;emballage. Normalement poids net + poids du matériau d&#39;emballage. (pour impression)
 DocType: Plant Analysis,Laboratory Testing Datetime,Tests de laboratoire
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,L&#39;élément {0} ne peut pas avoir de lot
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Pipeline des ventes par étape
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Force du groupe d&#39;étudiants
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Saisie de transaction sur relevé bancaire
 DocType: Purchase Order,Get Items from Open Material Requests,Obtenir des articles à partir de demandes de matériel ouvertes
@@ -4256,7 +4297,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Montrer le vieillissement entrepôt
 DocType: Sales Invoice,Write Off Outstanding Amount,Radiation du montant impayé
 DocType: Payroll Entry,Employee Details,Détails de l&#39;employé
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,L&#39;heure de début ne peut pas être supérieure à l&#39;heure de fin pour {0}.
 DocType: Pricing Rule,Discount Amount,Montant de la remise
 DocType: Healthcare Service Unit Type,Item Details,Détails de l&#39;article
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Déclaration fiscale en double de {0} pour la période {1}
@@ -4309,7 +4349,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Le salaire net ne peut être négatif
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Nombre d&#39;interactions
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},La ligne {0} # d&#39;article {1} ne peut pas être transférée plus de {2} par rapport au bon de commande {3}.
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Décalage
+DocType: Attendance,Shift,Décalage
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Plan de traitement des comptes et des parties
 DocType: Stock Settings,Convert Item Description to Clean HTML,Convertir la description de l&#39;élément en HTML propre
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Tous les groupes de fournisseurs
@@ -4380,6 +4420,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Unité de service parent
 DocType: Sales Invoice,Include Payment (POS),Inclure le paiement (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Capital-investissement
+DocType: Shift Type,First Check-in and Last Check-out,Premier enregistrement et dernier départ
 DocType: Landed Cost Item,Receipt Document,Document de réception
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Période de la fiche d&#39;évaluation du fournisseur
 DocType: Employee Grade,Default Salary Structure,Structure de salaire par défaut
@@ -4462,6 +4503,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Créer une commande d&#39;achat
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Définir le budget pour un exercice.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,La table des comptes ne peut pas être vide.
+DocType: Employee Checkin,Entry Grace Period Consequence,Conséquence de la période de grâce d&#39;entrée
 ,Payment Period Based On Invoice Date,Période de paiement basée sur la date de facturation
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},La date d&#39;installation ne peut pas être antérieure à la date de livraison de l&#39;article {0}.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Lien vers la demande de matériel
@@ -4470,6 +4512,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0}: une entrée de commande existe déjà pour cet entrepôt {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Date du document
 DocType: Monthly Distribution,Distribution Name,Nom de la distribution
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,La journée de travail {0} a été répétée.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Groupe à groupe
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Mise à jour en cours. Ça peut prendre un moment.
 DocType: Item,"Example: ABCD.#####
@@ -4482,6 +4525,7 @@
 DocType: Vehicle Log,Fuel Qty,Quantité de carburant
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile Non
 DocType: Invoice Discounting,Disbursed,Décaissé
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Heure après la fin du quart de travail au cours de laquelle la prise en charge est prise en compte.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Variation nette des comptes créditeurs
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Indisponible
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,À temps partiel
@@ -4495,7 +4539,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Afficher PDC en impression
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Fournisseur Shopify
 DocType: POS Profile User,POS Profile User,Utilisateur de profil de point de vente
-DocType: Student,Middle Name,Deuxième nom
 DocType: Sales Person,Sales Person Name,Nom du vendeur
 DocType: Packing Slip,Gross Weight,Poids brut
 DocType: Journal Entry,Bill No,Numéro de facture
@@ -4504,7 +4547,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,Un +
 DocType: Issue,Service Level Agreement,Contrat de niveau de service
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Veuillez sélectionner l&#39;employé et la date en premier
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Le taux d’évaluation des articles est recalculé en prenant en compte le montant du bon de livraison
 DocType: Timesheet,Employee Detail,Détail de l&#39;employé
 DocType: Tally Migration,Vouchers,Pièces justificatives
@@ -4539,7 +4581,7 @@
 DocType: Additional Salary,Date on which this component is applied,Date à laquelle ce composant est appliqué
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Liste des actionnaires disponibles avec numéros de folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Configurer les comptes Gateway.
-DocType: Service Level,Response Time Period,Délai de réponse
+DocType: Service Level Priority,Response Time Period,Délai de réponse
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxes et frais d&#39;achat
 DocType: Course Activity,Activity Date,Date d&#39;activité
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Sélectionner ou ajouter un nouveau client
@@ -4564,6 +4606,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Année financière
 DocType: Sales Invoice Item,Deferred Revenue,Revenus reportés
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Au moins une vente ou achat doit être sélectionné
+DocType: Shift Type,Working Hours Threshold for Half Day,Seuil des heures de travail pour une demi-journée
 ,Item-wise Purchase History,Historique d&#39;achat par article
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Impossible de modifier la date d&#39;arrêt du service pour l&#39;élément de la ligne {0}
 DocType: Production Plan,Include Subcontracted Items,Inclure les articles sous-traités
@@ -4596,6 +4639,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Autoriser le même élément plusieurs fois
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Créer une nomenclature
 DocType: Healthcare Practitioner,Charges,Des charges
+DocType: Employee,Attendance and Leave Details,Détails de présence et de congés
 DocType: Student,Personal Details,Détails personnels
 DocType: Sales Order,Billing and Delivery Status,État de facturation et de livraison
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Ligne {0}: l&#39;adresse e-mail du fournisseur {0} est obligatoire pour envoyer un e-mail.
@@ -4647,7 +4691,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Entrez une valeur entre {0} et {1}
 DocType: Purchase Order,Order Confirmation Date,Date de confirmation de la commande
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Calculer les heures d&#39;arrivée estimées
-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 nommage des employés dans Ressources humaines&gt; Paramètres RH
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consommable
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Date de début de l&#39;abonnement
@@ -4670,7 +4713,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Compte d&#39;écriture au journal
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Une variante
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Activité du forum
-DocType: Service Level,Resolution Time Period,Délai de résolution
+DocType: Service Level Priority,Resolution Time Period,Délai de résolution
 DocType: Request for Quotation,Supplier Detail,Détail du fournisseur
 DocType: Project Task,View Task,Voir la tâche
 DocType: Serial No,Purchase / Manufacture Details,Détails d&#39;achat / fabrication
@@ -4737,6 +4780,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,L&#39;entrepôt ne peut être modifié que via Entrée de stock / Bon de livraison / Bon d&#39;achat.
 DocType: Support Settings,Close Issue After Days,Fermer le numéro après les jours
 DocType: Payment Schedule,Payment Schedule,Calendrier de paiement
+DocType: Shift Type,Enable Entry Grace Period,Activer la période de grâce d&#39;entrée
 DocType: Patient Relation,Spouse,Époux
 DocType: Purchase Invoice,Reason For Putting On Hold,Raison de la mise en attente
 DocType: Item Attribute,Increment,Incrément
@@ -4876,6 +4920,7 @@
 DocType: Vehicle Log,Invoice Ref,Réf facture
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},Le formulaire C ne s&#39;applique pas à la facture: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Facture créée
+DocType: Shift Type,Early Exit Grace Period,Période de grâce de sortie anticipée
 DocType: Patient Encounter,Review Details,Détails de l&#39;examen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Ligne {0}: la valeur en heures doit être supérieure à zéro.
 DocType: Account,Account Number,Numéro de compte
@@ -4887,7 +4932,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Applicable si la société est SpA, SApA ou SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Conditions de chevauchement trouvées entre:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Payé et non livré
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Le code d&#39;article est obligatoire car l&#39;article n&#39;est pas numéroté automatiquement
 DocType: GST HSN Code,HSN Code,Code HSN
 DocType: GSTR 3B Report,September,septembre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Dépenses administratives
@@ -4923,6 +4967,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Compte CWIP
 DocType: SMS Log,Sender Name,Nom de l&#39;expéditeur
 DocType: Pricing Rule,Supplier Group,Groupe de fournisseurs
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Définissez l&#39;heure de début et l&#39;heure de fin pour \ Support Day {0} à l&#39;index {1}.
 DocType: Employee,Date of Issue,Date d&#39;Emission
 ,Requested Items To Be Transferred,Articles demandés à transférer
 DocType: Employee,Contract End Date,Date de fin du contrat
@@ -4933,6 +4979,7 @@
 DocType: Opportunity,Sales Stage,Stade de vente
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En mots sera visible une fois que vous enregistrez la commande client.
 DocType: Item Reorder,Re-order Level,Niveau de réapprovisionnement
+DocType: Shift Type,Enable Auto Attendance,Activer la présence automatique
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Préférence
 ,Department Analytics,Département Analytics
 DocType: Crop,Scientific Name,Nom scientifique
@@ -4945,6 +4992,7 @@
 DocType: Quiz Activity,Quiz Activity,Activité de test
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} n&#39;est pas dans une période de paie valide
 DocType: Timesheet,Billed,Facturé
+apps/erpnext/erpnext/config/support.py,Issue Type.,Type de probleme.
 DocType: Restaurant Order Entry,Last Sales Invoice,Dernière facture de vente
 DocType: Payment Terms Template,Payment Terms,Modalités de paiement
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Qté réservée: Quantité commandée à la vente, mais non livrée."
@@ -5040,6 +5088,7 @@
 DocType: Account,Asset,Atout
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} n&#39;a pas d&#39;horaire pour les praticiens de la santé. Ajoutez-le au master Healthcare Practitioner
 DocType: Vehicle,Chassis No,N ° de châssis
+DocType: Employee,Default Shift,Décalage par défaut
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Abréviation de l&#39;entreprise
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Arbre de nomenclature
 DocType: Article,LMS User,Utilisateur LMS
@@ -5087,6 +5136,7 @@
 DocType: Sales Person,Parent Sales Person,Parent Parent
 DocType: Student Group Creation Tool,Get Courses,Obtenir des cours
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne # {0}: La quantité doit être 1, car item est une immobilisation fixe. Veuillez utiliser une ligne distincte pour plusieurs quantités."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Heures de travail en dessous desquelles Absent est marqué. (Zéro à désactiver)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Seuls les nœuds terminaux sont autorisés dans la transaction
 DocType: Grant Application,Organization,Organisation
 DocType: Fee Category,Fee Category,Catégorie de frais
@@ -5099,6 +5149,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Veuillez mettre à jour votre statut pour cet événement de formation.
 DocType: Volunteer,Morning,Matin
 DocType: Quotation Item,Quotation Item,Article de cotation
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Priorité d&#39;émission.
 DocType: Journal Entry,Credit Card Entry,Entrée de carte de crédit
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Intervalle de temps ignoré, l’intervalle {0} à {1} chevauche l’emplacement existant {2} à {3}"
 DocType: Journal Entry Account,If Income or Expense,Si revenu ou dépense
@@ -5149,11 +5200,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Importation de données et paramètres
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Si l&#39;option Auto Opt In est cochée, les clients seront automatiquement associés au programme de fidélité concerné (lors de la sauvegarde)."
 DocType: Account,Expense Account,Compte de dépenses
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Heure avant l&#39;heure de début du quart pendant laquelle l&#39;enregistrement des employés est pris en compte pour la présence.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Relation avec Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Créer une facture
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},La demande de paiement existe déjà {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',L&#39;employé relevé le {0} doit être défini sur &#39;Gauche&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Payer {0} {1}
+DocType: Company,Sales Settings,Paramètres de vente
 DocType: Sales Order Item,Produced Quantity,Quantité produite
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,La demande de devis est accessible en cliquant sur le lien suivant
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la distribution mensuelle
@@ -5232,6 +5285,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Des modèles de taxe par défaut pour les ventes et les achats sont créés.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Laissez le type {0} ne peut pas être reporté
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Le compte au débit doit être un compte à recevoir
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,La date de fin de l&#39;accord ne peut être inférieure à celle d&#39;aujourd&#39;hui.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Veuillez définir le compte dans l’entrepôt {0} ou le compte d’inventaire par défaut dans la société {1}.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Définir par défaut
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Le poids net de ce paquet. (calculé automatiquement comme somme du poids net des articles)
@@ -5258,8 +5312,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Lots expirés
 DocType: Shipping Rule,Shipping Rule Type,Type de règle d&#39;expédition
 DocType: Job Offer,Accepted,Accepté
-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","Supprimez l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Vous avez déjà évalué les critères d&#39;évaluation {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Sélectionner des numéros de lot
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Age (jours)
@@ -5286,6 +5338,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Sélectionnez vos domaines
 DocType: Agriculture Task,Task Name,Nom de la tâche
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Entrées de stock déjà créées pour le bon de travail
+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","Supprimez l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 ,Amount to Deliver,Quantité à livrer
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,La société {0} n&#39;existe pas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Aucune demande de matériel en attente trouvée pour créer un lien vers les articles donnés.
@@ -5335,6 +5389,7 @@
 DocType: Lab Prescription,Test Code,Code de test
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sur la ligne précédente Total
 DocType: Student,Student Email Address,Adresse électronique de l&#39;étudiant
+,Delayed Item Report,Rapport d&#39;élément retardé
 DocType: Academic Term,Education,Éducation
 DocType: Supplier Quotation,Supplier Address,Adresse du fournisseur
 DocType: Salary Detail,Do not include in total,Ne pas inclure au total
@@ -5342,7 +5397,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} n&#39;existe pas
 DocType: Purchase Receipt Item,Rejected Quantity,Quantité rejetée
 DocType: Cashier Closing,To TIme,À l&#39;heure
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UOM ({0} -&gt; {1}) introuvable pour l&#39;élément: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Utilisateur du groupe de résumé du travail quotidien
 DocType: Fiscal Year Company,Fiscal Year Company,Année fiscale Société
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,L&#39;article alternatif ne doit pas être identique au code d&#39;article
@@ -5394,6 +5448,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Délai entre les arrêts de livraison
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Gel des stocks plus vieux que [jours]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Schéma promotionnel Réduction de produit
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,La priorité du problème existe déjà
 DocType: Account,Asset Received But Not Billed,Actif reçu mais non facturé
 DocType: POS Closing Voucher,Total Collected Amount,Montant total collecté
 DocType: Course,Default Grading Scale,Échelle de notation par défaut
@@ -5436,6 +5491,7 @@
 DocType: Contract,Fulfilment Terms,Conditions de réalisation
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non groupe à groupe
 DocType: Student Guardian,Mother,Mère
+DocType: Issue,Service Level Agreement Fulfilled,Contrat de niveau de service rempli
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Taxe de déduction pour avantages sociaux non réclamés
 DocType: Travel Request,Travel Funding,Financement de voyage
 DocType: Shipping Rule,Fixed,Fixé
@@ -5465,10 +5521,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Aucun élément trouvé.
 DocType: Item Attribute,From Range,De la gamme
 DocType: Clinical Procedure,Consumables,Consommables
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; et &#39;timestamp&#39; sont obligatoires.
 DocType: Purchase Taxes and Charges,Reference Row #,Ligne de référence #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Définissez &quot;Centre de coûts d&#39;amortissement des actifs&quot; dans l&#39;entreprise {0}.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Ligne n ° {0}: Un document de paiement est requis pour effectuer la transaction.
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Cliquez sur ce bouton pour extraire vos données de commande client d&#39;Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Heures de travail en dessous desquelles la demi-journée est marquée. (Zéro à désactiver)
 ,Assessment Plan Status,Statut du plan d&#39;évaluation
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Veuillez sélectionner {0} d&#39;abord
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Soumettre ceci pour créer la fiche d&#39;employé
@@ -5539,6 +5597,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Set Open
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Basculer les filtres
 DocType: Production Plan,Material Request Detail,Détail de la demande de matériel
+DocType: Shift Type,Process Attendance After,Processus de présence après
 DocType: Material Request Item,Quantity and Warehouse,Quantité et entrepôt
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Aller aux programmes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Ligne n ° {0}: entrée en double dans les références {1} {2}
@@ -5596,6 +5655,7 @@
 DocType: Pricing Rule,Party Information,Informations sur la fête
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Débiteurs ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,"À ce jour, ne peut pas dépasser la date de relève de l&#39;employé"
+DocType: Shift Type,Enable Exit Grace Period,Activer la période de grâce de sortie
 DocType: Expense Claim,Employees Email Id,Employé Email Id
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Mise à jour des prix de Shopify à ERPNext Price List
 DocType: Healthcare Settings,Default Medical Code Standard,Code médical standard par défaut
@@ -5626,7 +5686,6 @@
 DocType: Budget,Applicable on Material Request,Applicable sur demande de matériel
 DocType: Support Settings,Search APIs,API de recherche
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Pourcentage de surproduction pour la commande client
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Caractéristiques
 DocType: Purchase Invoice,Supplied Items,Articles fournis
 DocType: Leave Control Panel,Select Employees,Sélectionnez les employés
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Sélectionnez le compte de revenu d’intérêts prêté {0}
@@ -5652,7 +5711,7 @@
 ,Supplier-Wise Sales Analytics,Analyse des ventes par fournisseur
 DocType: GSTR 3B Report,February,février
 DocType: Appraisal,For Employee,Pour employé
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Date de livraison réelle
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Date de livraison réelle
 DocType: Sales Partner,Sales Partner Name,Nom du partenaire commercial
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Ligne d&#39;amortissement {0}: la date de début d&#39;amortissement est entrée comme date passée
 DocType: GST HSN Code,Regional,Régional
@@ -5691,6 +5750,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Tableau de bord des fournisseurs
 DocType: Travel Itinerary,Travel To,Voyager à
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Marquer la présence
+DocType: Shift Type,Determine Check-in and Check-out,Déterminer les entrées et les sorties
 DocType: POS Closing Voucher,Difference,Différence
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Petit
 DocType: Work Order Item,Work Order Item,Poste de travail
@@ -5724,6 +5784,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Drogue
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} est fermé
 DocType: Patient,Medical History,Antécédents médicaux
+DocType: Expense Claim,Expense Taxes and Charges,Frais et taxes
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Nombre de jours après l&#39;écoulement de la date de facturation avant l&#39;annulation de l&#39;abonnement ou le marquage de l&#39;abonnement comme impayé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,La note d&#39;installation {0} a déjà été soumise.
 DocType: Patient Relation,Family,Famille
@@ -5756,7 +5817,6 @@
 DocType: Dosage Strength,Strength,Force
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} unités de {1} nécessaires dans {2} pour effectuer cette transaction.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush matières premières de sous-traitance basées sur
-DocType: Bank Guarantee,Customer,Client
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Si activé, la période académique sera obligatoire dans l&#39;outil d&#39;inscription au programme."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Pour le groupe d&#39;étudiants basé sur un lot, le lot d&#39;étudiants sera validé pour chaque élève à partir du programme d&#39;inscription."
 DocType: Course,Topics,Les sujets
@@ -5836,6 +5896,7 @@
 DocType: Chapter,Chapter Members,Membres du chapitre
 DocType: Warranty Claim,Service Address,Adresse de service
 DocType: Journal Entry,Remark,Remarque
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ligne {0}: quantité non disponible pour {4} dans l&#39;entrepôt {1} au moment de la comptabilisation de l&#39;entrée ({2} {3}).
 DocType: Patient Encounter,Encounter Time,Temps de rencontre
 DocType: Serial No,Invoice Details,Détails de la facture
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","D&#39;autres comptes peuvent être créés sous Groupes, mais des écritures peuvent être faites avec des non-groupes."
@@ -5916,6 +5977,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Clôture (ouverture + total)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formule de critères
 apps/erpnext/erpnext/config/support.py,Support Analytics,Support analytique
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Périphérique d&#39;assistance (identifiant d&#39;étiquette biométrique / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Révision et action
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé, les entrées sont autorisées aux utilisateurs restreints."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Montant après amortissement
@@ -5937,6 +5999,7 @@
 DocType: Salary Slip,Loan Repayment,Remboursement de prêt
 DocType: Employee Education,Major/Optional Subjects,Sujets majeurs / facultatifs
 DocType: Soil Texture,Silt,Limon
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Adresses et contacts des fournisseurs
 DocType: Bank Guarantee,Bank Guarantee Type,Type de garantie bancaire
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si cette option est désactivée, le champ &quot;Total arrondi&quot; ne sera visible dans aucune transaction."
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5975,6 +6038,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Ouvrir un élément de l&#39;outil de création de facture
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Inclure les transactions de PDV
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Aucun employé trouvé pour la valeur de champ d&#39;employé donnée. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Montant reçu (devise de la société)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage est plein, n&#39;a pas économisé"
 DocType: Chapter Member,Chapter Member,Membre du chapitre
@@ -6007,6 +6071,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Aucun groupe d&#39;étudiants créé.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Ligne en double {0} avec le même {1}
 DocType: Employee,Salary Details,Détail du salaire
+DocType: Employee Checkin,Exit Grace Period Consequence,Conséquence de la période de grâce à la sortie
 DocType: Bank Statement Transaction Invoice Item,Invoice,Facture d&#39;achat
 DocType: Special Test Items,Particulars,Les détails
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Veuillez définir le filtre en fonction de l&#39;article ou de l&#39;entrepôt
@@ -6108,6 +6173,7 @@
 DocType: Serial No,Out of AMC,Sur AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil du poste, qualifications requises etc."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Ship To State
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Voulez-vous soumettre la demande de matériel
 DocType: Opportunity Item,Basic Rate,Tarif de base
 DocType: Compensatory Leave Request,Work End Date,Date de fin des travaux
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Demande de matières premières
@@ -6293,6 +6359,7 @@
 DocType: Sales Order Item,Gross Profit,Bénéfice brut
 DocType: Quality Inspection,Item Serial No,Numéro de série
 DocType: Asset,Insurer,Assureur
+DocType: Employee Checkin,OUT,EN DEHORS
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Montant d&#39;achat
 DocType: Asset Maintenance Task,Certificate Required,Certificat requis
 DocType: Retention Bonus,Retention Bonus,Bonus de rétention
@@ -6408,6 +6475,8 @@
 DocType: Invoice Discounting,Sanctioned,Sanctionné
 DocType: Course Enrollment,Course Enrollment,Inscription au cours
 DocType: Item,Supplier Items,Articles du fournisseur
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",L’heure de début ne peut pas être supérieure ou égale à l’heure de fin \ pour {0}.
 DocType: Sales Order,Not Applicable,N&#39;est pas applicable
 DocType: Support Search Source,Response Options,Options de réponse
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} doit être une valeur comprise entre 0 et 100
@@ -6494,7 +6563,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Immobilisations
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Gain total
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Share Balance,From No,À partir de
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Facture de rapprochement des paiements
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et frais ajoutés
@@ -6602,6 +6670,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignorer la règle de tarification
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Aliments
 DocType: Lost Reason Detail,Lost Reason Detail,Motif perdu
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Les numéros de série suivants ont été créés: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Commentaires des clients
 DocType: Serial No,Warranty / AMC Details,Garantie / AMC Détails
 DocType: Issue,Opening Time,Horaire d&#39;ouverture
@@ -6651,6 +6720,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Nom de l&#39;entreprise pas identique
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,La promotion des employés ne peut pas être soumise avant la date de promotion
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Non autorisé à mettre à jour les transactions de stock antérieures à {0}
+DocType: Employee Checkin,Employee Checkin,Enregistrement des employés
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La date de début doit être inférieure à la date de fin pour l&#39;élément {0}.
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Créer des devis clients
 DocType: Buying Settings,Buying Settings,Paramètres d&#39;achat
@@ -6672,6 +6742,7 @@
 DocType: Patient,Patient Demographics,Données démographiques des patients
 DocType: Share Transfer,To Folio No,À Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Flux de trésorerie provenant des opérations
+DocType: Employee Checkin,Log Type,Type de journal
 DocType: Stock Settings,Allow Negative Stock,Autoriser le stock négatif
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Aucun des articles n&#39;a de changement en quantité ou en valeur.
 DocType: Asset,Purchase Date,date d&#39;achat
@@ -6716,6 +6787,7 @@
 DocType: Vital Signs,Very Hyper,Très hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Sélectionnez la nature de votre entreprise.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Veuillez sélectionner le mois et l&#39;année
+DocType: Service Level,Default Priority,Priorité par défaut
 DocType: Student Log,Student Log,Journal de l&#39;étudiant
 DocType: Shopping Cart Settings,Enable Checkout,Activer la caisse
 apps/erpnext/erpnext/config/settings.py,Human Resources,Ressources humaines
@@ -6744,7 +6816,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Connectez Shopify avec ERPNext
 DocType: Homepage Section Card,Subtitle,Sous-titre
 DocType: Soil Texture,Loam,Terreau
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: BOM,Scrap Material Cost(Company Currency),Coût du matériel de rebut (devise de l&#39;entreprise)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Le bon de livraison {0} ne doit pas être envoyé.
 DocType: Task,Actual Start Date (via Time Sheet),Date de début réelle (via la feuille de temps)
@@ -6800,6 +6871,7 @@
 DocType: Drug Prescription,Dosage,Dosage
 DocType: Cheque Print Template,Starting position from top edge,Position de départ du bord supérieur
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Durée du rendez-vous (min)
+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}
 DocType: Accounting Dimension,Disable,Désactiver
 DocType: Email Digest,Purchase Orders to Receive,Commandes d&#39;achat à recevoir
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Les commandes de productions ne peuvent pas être passées pour:
@@ -6815,7 +6887,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Article transféré pour sous-traitance
 DocType: Job Card,Timing Detail,Détail du timing
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Requis sur
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Importer {0} de {1}
 DocType: Job Offer Term,Job Offer Term,Durée de l&#39;offre d&#39;emploi
 DocType: SMS Center,All Contact,Tous les contacts
 DocType: Project Task,Project Task,Tâche du projet
@@ -6866,7 +6937,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,L&#39;élément {0} n&#39;est pas configuré pour les numéros de série.
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,De l&#39;Etat
 DocType: Leave Type,Maximum Continuous Days Applicable,Nombre maximal de jours continus applicable
-apps/erpnext/erpnext/config/support.py,Support Team.,Équipe de soutien.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Veuillez entrer le nom de l&#39;entreprise en premier
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importation réussie
 DocType: Guardian,Alternate Number,Autre numéro
@@ -6958,6 +7028,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Ligne n ° {0}: élément ajouté
 DocType: Student Admission,Eligibility and Details,Admissibilité et détails
 DocType: Staffing Plan,Staffing Plan Detail,Détail du plan de dotation
+DocType: Shift Type,Late Entry Grace Period,Délai de grâce pour entrée tardive
 DocType: Email Digest,Annual Income,Revenu annuel
 DocType: Journal Entry,Subscription Section,Section d&#39;abonnement
 DocType: Salary Slip,Payment Days,Jours de paiement
@@ -7008,6 +7079,7 @@
 DocType: Journal Entry Account,Account Balance,Solde du compte
 DocType: Asset Maintenance Log,Periodicity,Périodicité
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Dossier médical
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Le type de journal est requis pour les enregistrements entrant dans le quart de travail: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Exécution
 DocType: Item,Valuation Method,Méthode d&#39;évaluation
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} contre facture client {1}
@@ -7091,6 +7163,7 @@
 DocType: Loan Type,Loan Name,Nom du prêt
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Définir le mode de paiement par défaut
 DocType: Quality Goal,Revision,Révision
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,L&#39;heure avant l&#39;heure de fin du quart de travail au moment du départ est considérée comme précoce (en minutes).
 DocType: Healthcare Service Unit,Service Unit Type,Type d&#39;unité de service
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retour contre facture d&#39;achat
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Générer un secret
@@ -7246,12 +7319,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Produits de beauté
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Cochez cette case si vous souhaitez obliger l&#39;utilisateur à sélectionner une série avant de l&#39;enregistrer. Si vous cochez cette case, il n&#39;y aura pas de défaut."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à définir des comptes gelés et à créer / modifier des écritures comptables par rapport à des comptes gelés.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Expense Claim,Total Claimed Amount,Montant total réclamé
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver un créneau horaire dans les {0} prochains jours pour l&#39;opération {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Emballer
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Vous ne pouvez renouveler votre adhésion que si votre adhésion expire dans les 30 jours.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},La valeur doit être comprise entre {0} et {1}.
 DocType: Quality Feedback,Parameters,Paramètres
+DocType: Shift Type,Auto Attendance Settings,Paramètres de présence automatique
 ,Sales Partner Transaction Summary,Récapitulatif des transactions du partenaire commercial
 DocType: Asset Maintenance,Maintenance Manager Name,Nom du responsable de la maintenance
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Il est nécessaire de récupérer les détails de l&#39;article.
@@ -7343,10 +7418,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Valider la règle appliquée
 DocType: Job Card Item,Job Card Item,Article de carte de travail
 DocType: Homepage,Company Tagline for website homepage,Slogan de la société pour la page d&#39;accueil du site Web
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Définissez le temps de réponse et la résolution pour la priorité {0} à l&#39;index {1}.
 DocType: Company,Round Off Cost Center,Centre de coûts arrondi
 DocType: Supplier Scorecard Criteria,Criteria Weight,Critère Poids
 DocType: Asset,Depreciation Schedules,Horaires d&#39;amortissement
-DocType: Expense Claim Detail,Claim Amount,Montant de la réclamation
 DocType: Subscription,Discounts,Des remises
 DocType: Shipping Rule,Shipping Rule Conditions,Conditions de règles d&#39;expédition
 DocType: Subscription,Cancelation Date,Date d&#39;annulation
@@ -7374,7 +7449,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Afficher les valeurs zéro
 DocType: Employee Onboarding,Employee Onboarding,Employé Embarquement
 DocType: POS Closing Voucher,Period End Date,Date de fin de période
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Opportunités de vente par source
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Le premier approbateur partant de la liste sera défini comme approbateur partant par défaut.
 DocType: POS Settings,POS Settings,Paramètres de PDV
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Tous les comptes
@@ -7395,7 +7469,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ligne n ° {0}: le taux doit être identique à {1}: {2} ({3} / {4}).
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Articles de service de santé
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Aucun enregistrement trouvé
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Plage de vieillissement 3
 DocType: Vital Signs,Blood Pressure,Tension artérielle
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Cible sur
@@ -7442,6 +7515,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Des lots
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,La défense
 DocType: Item,Has Batch No,Numéro de lot
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Jours retardés
 DocType: Lead,Person Name,Nom d&#39;une personne
 DocType: Item Variant,Item Variant,Variante d&#39;article
 DocType: Training Event Employee,Invited,Invité
@@ -7463,7 +7537,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Les dates de début et de fin ne faisant pas partie d&#39;une période de paie valide, ne peuvent pas calculer {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Afficher uniquement les clients de ces groupes de clients
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Sélectionner les articles pour enregistrer la facture
-DocType: Service Level,Resolution Time,Temps de résolution
+DocType: Service Level Priority,Resolution Time,Temps de résolution
 DocType: Grading Scale Interval,Grade Description,Description du grade
 DocType: Homepage Section,Cards,Cartes
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Compte rendu de réunion de qualité
@@ -7490,6 +7564,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Relevé bancaire selon le grand livre
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Santé (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Magasin par défaut pour créer une commande client et un bon de livraison
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Le temps de réponse pour {0} à l&#39;index {1} ne peut pas être supérieur au temps de résolution.
 DocType: Opportunity,Customer / Lead Name,Nom du client / responsable
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Montant non réclamé
@@ -7536,7 +7611,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Parties importatrices et adresses
 DocType: Item,List this Item in multiple groups on the website.,Répertoriez cet élément dans plusieurs groupes sur le site Web.
 DocType: Request for Quotation,Message for Supplier,Message pour le fournisseur
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Impossible de modifier {0} car la transaction boursière pour l&#39;article {1} existe.
 DocType: Healthcare Practitioner,Phone (R),Téléphone (R)
 DocType: Maintenance Team Member,Team Member,Membre de l&#39;équipe
 DocType: Asset Category Account,Asset Category Account,Compte de catégorie d&#39;actif
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 8d33180..9e7e520 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,નિમણૂંક {0} અને વેચાણ ઇનવોઇસ {1} રદ થઈ
 DocType: Purchase Receipt,Vehicle Number,વાહન નંબર
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,તમારું ઇમેઇલ સરનામું ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,ડિફૉલ્ટ બુક એન્ટ્રીઓ શામેલ કરો
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,ડિફૉલ્ટ બુક એન્ટ્રીઓ શામેલ કરો
 DocType: Activity Cost,Activity Type,પ્રવૃત્તિ પ્રકાર
 DocType: Purchase Invoice,Get Advances Paid,ચૂકવણી એડવાન્સ મેળવો
 DocType: Company,Gain/Loss Account on Asset Disposal,સંપત્તિના નિકાલ પરના હિસાબ / ખોટ ખાતા
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,ચુકવણી પ્રવેશો
 DocType: Employee Education,Class / Percentage,વર્ગ / ટકાવારી
 ,Electronic Invoice Register,ઇલેક્ટ્રોનિક ભરતિયું નોંધણી
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,પરિણામ કે જેના પછી પરિણામ અમલમાં આવે છે.
 DocType: Sales Invoice,Is Return (Credit Note),રીટર્ન છે (ક્રેડિટ નોંધ)
+DocType: Price List,Price Not UOM Dependent,કિંમત યુઓમ આધારિત નથી
 DocType: Lab Test Sample,Lab Test Sample,લેબ ટેસ્ટ નમૂના
 DocType: Shopify Settings,status html,સ્થિતિ એચટીએમએલ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","દા.ત. 2012, 2012-13 માટે"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,કુલ ચુકવણી
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,કુલ ભરતિયું એમટી
 DocType: Clinical Procedure,Consumables Invoice Separately,ઉપભોક્તા ઇનવોઇસ અલગથી
+DocType: Shift Type,Working Hours Threshold for Absent,ગેરહાજરી માટે કામના કલાકો થ્રેશોલ્ડ
 DocType: Appraisal,HR-APR-.YY.-.MM.,એચઆર -APR- વાયવાય- એમએમ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},ગ્રુપ એકાઉન્ટ સામે બજેટ સોંપી શકાતું નથી {0}
 DocType: Purchase Receipt Item,Rate and Amount,દર અને રકમ
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,બહાર દર્દી સેટિંગ્સ
 DocType: Asset,Insurance End Date,વીમા સમાપ્તિ તારીખ
 DocType: Bank Account,Branch Code,શાખા સંકેત
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,જવાબ આપવાનો સમય
 apps/erpnext/erpnext/public/js/conf.js,User Forum,વપરાશકર્તા ફોરમ
 DocType: Landed Cost Item,Landed Cost Item,લેન્ડસ્ટેડ કોસ્ટ આઇટમ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,વેચનાર અને ખરીદદાર સમાન હોઈ શકતા નથી
@@ -597,6 +599,7 @@
 DocType: Share Transfer,Transfer,સ્થાનાંતરણ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),વસ્તુ શોધો (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} પરિણામ સબમિટ કર્યું
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,તારીખથી આજની તારીખથી વધુ હોઈ શકતી નથી
 DocType: Supplier,Supplier of Goods or Services.,ગુડ્સ અથવા સેવાઓનું સપ્લાયર.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,નવા ખાતા નું નામ. નોંધ: કૃપા કરીને ગ્રાહકો અને સપ્લાયર્સ માટે એકાઉન્ટ્સ બનાવશો નહીં
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,વિદ્યાર્થી જૂથ અથવા કોર્સ શેડ્યૂલ ફરજિયાત છે
@@ -878,7 +881,6 @@
 DocType: Skill,Skill Name,કૌશલ્ય નામ
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,પ્રિન્ટ રિપોર્ટ કાર્ડ
 DocType: Soil Texture,Ternary Plot,ટર્નીરી પ્લોટ
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,આધાર ટિકિટ
 DocType: Asset Category Account,Fixed Asset Account,ફિક્સ્ડ એસેટ એકાઉન્ટ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,નવીનતમ
@@ -891,6 +893,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,બેલેન્સ શીટ માટે ફરજિયાત
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
 DocType: Sales Invoice,Get Advances Received,એડવાન્સિસ પ્રાપ્ત કરો
+DocType: Shift Type,Last Sync of Checkin,ચેકિનનું છેલ્લું સમન્વયન
 DocType: Student,B-,બી-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,આઇટમ ટેક્સ રકમ મૂલ્યમાં શામેલ છે
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -899,7 +902,9 @@
 DocType: Student,Blood Group,બ્લડ ગ્રુપ
 apps/erpnext/erpnext/config/healthcare.py,Masters,સ્નાતકોત્તર
 DocType: Crop,Crop Spacing UOM,ક્રોપ સ્પેસિંગ યુએમએમ
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,જ્યારે ચેક-ઇન મોડા (મિનિટમાં) તરીકે ગણવામાં આવે છે ત્યારે શિફ્ટ શરૂ થાય તે સમય પછીનો સમય.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,અન્વેષણ કરો
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,કોઈ બાકી ઇન્વૉઇસેસ મળ્યાં નથી
 DocType: Promotional Scheme,Product Discount Slabs,ઉત્પાદન ડિસ્કાઉન્ટ સ્લેબો
 DocType: Hotel Room Package,Amenities,સવલતો
 DocType: Lab Test Groups,Add Test,ટેસ્ટ ઉમેરો
@@ -998,6 +1003,7 @@
 DocType: Item,Moving Average,ખસેડવું સરેરાશ
 DocType: Employee Attendance Tool,Unmarked Attendance,અનમાર્ક થયેલ હાજરી
 DocType: Homepage Section,Number of Columns,સ્તંભોની સંખ્યા
+DocType: Issue Priority,Issue Priority,ઇશ્યૂ પ્રાધાન્યતા
 DocType: Holiday List,Add Weekly Holidays,સાપ્તાહિક રજાઓ ઉમેરો
 DocType: Shopify Log,Shopify Log,Shopify લોગ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,પગાર કાપલી બનાવો
@@ -1006,6 +1012,7 @@
 DocType: Warranty Claim,Issue Date,ઇશ્યુ તારીખ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,આઇટમ {0} માટે બેચ પસંદ કરો. આ જરૂરિયાતને પૂર્ણ કરતી એક સિંગલ બેચ શોધવામાં અસમર્થ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,ડાબી કર્મચારીઓ માટે રીટેન્શન બોનસ બનાવી શકતા નથી
+DocType: Employee Checkin,Location / Device ID,સ્થાન / ઉપકરણ ID
 DocType: Purchase Order,To Receive,પ્રાપ્ત
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,તમે ઓફલાઇન મોડમાં છો. જ્યાં સુધી તમારી પાસે નેટવર્ક ન હોય ત્યાં સુધી તમે ફરીથી લોડ કરી શકશો નહીં.
 DocType: Course Activity,Enrollment,નોંધણી
@@ -1014,7 +1021,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},મહત્તમ: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ઇ-ઇનવોઇસિંગ માહિતી ખૂટે છે
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,કોઈ સામગ્રી વિનંતી બનાવતી નથી
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 DocType: Loan,Total Amount Paid,ચૂકવેલ કુલ રકમ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,આ બધી વસ્તુઓ પહેલેથી જ ભરપાઈ કરવામાં આવી છે
 DocType: Training Event,Trainer Name,ટ્રેનર નામ
@@ -1125,6 +1131,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},લીડમાં લીડ નામનો ઉલ્લેખ કરો {0}
 DocType: Employee,You can enter any date manually,તમે કોઈપણ તારીખ જાતે દાખલ કરી શકો છો
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક સમાધાન આઇટમ
+DocType: Shift Type,Early Exit Consequence,પ્રારંભિક બહાર નીકળો પરિણામ
 DocType: Item Group,General Settings,સામાન્ય સુયોજનો
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,બાકી તારીખ પોસ્ટિંગ / સપ્લાયર ઇન્વૉઇસ તારીખ પહેલાં હોઈ શકતી નથી
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,સબમિટ કરતાં પહેલાં લાભાર્થીનું નામ દાખલ કરો.
@@ -1162,6 +1169,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,ચુકવણી પુષ્ટિ
 ,Available Stock for Packing Items,પેકિંગ આઈટમ્સ માટે ઉપલબ્ધ સ્ટોક
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},કૃપા કરીને સી-ફોર્મ {1} માંથી આ ભરતિયું {0} ને દૂર કરો
+DocType: Shift Type,Every Valid Check-in and Check-out,દરેક માન્ય ચેક-ઇન અને ચેક-આઉટ
 DocType: Support Search Source,Query Route String,ક્વેરી રૂટ શબ્દમાળા
 DocType: Customer Feedback Template,Customer Feedback Template,ગ્રાહક પ્રતિસાદ ઢાંચો
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,લીડ્સ અથવા ગ્રાહકો માટે ખર્ચ.
@@ -1196,6 +1204,7 @@
 DocType: Authorization Control,Authorization Control,અધિકૃતતા નિયંત્રણ
 ,Daily Work Summary Replies,દૈનિક વર્ક સારાંશ જવાબો
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},તમને પ્રોજેક્ટ પર સહયોગ માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
+DocType: Issue,Response By Variance,વેરિયસ દ્વારા પ્રતિભાવ
 DocType: Item,Sales Details,વેચાણ વિગતો
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,પ્રિન્ટ નમૂનાઓ માટે લેટર હેડ્સ.
 DocType: Salary Detail,Tax on additional salary,વધારાના પગાર પર કર
@@ -1319,6 +1328,7 @@
 DocType: Project,Task Progress,કાર્ય પ્રગતિ
 DocType: Journal Entry,Opening Entry,ખુલ્લી એન્ટ્રી
 DocType: Bank Guarantee,Charges Incurred,ખર્ચ શામેલ
+DocType: Shift Type,Working Hours Calculation Based On,વર્કિંગ કલાક ગણતરી આધારિત
 DocType: Work Order,Material Transferred for Manufacturing,ઉત્પાદન માટે સામગ્રી સ્થાનાંતરિત
 DocType: Products Settings,Hide Variants,ચલો છુપાવો
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ક્ષમતા આયોજન અને સમય ટ્રેકિંગને અક્ષમ કરો
@@ -1348,6 +1358,7 @@
 DocType: Guardian,Interests,રૂચિ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ઉપભોક્તા જથ્થો
 DocType: Education Settings,Education Manager,શિક્ષણ મેનેજર
+DocType: Employee Checkin,Shift Actual Start,શિફ્ટ વાસ્તવિક પ્રારંભ
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,વર્કસ્ટેશન વર્કિંગ અવર્સની બહાર યોજના સમય લોગ.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},વફાદારી મુદ્દાઓ: {0}
 DocType: Healthcare Settings,Registration Message,નોંધણી સંદેશ
@@ -1372,9 +1383,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,ભરતિયું પહેલેથી જ બધા બિલિંગ કલાક માટે બનાવેલ છે
 DocType: Sales Partner,Contact Desc,સંપર્ક ડીસીસી
 DocType: Purchase Invoice,Pricing Rules,પ્રાઇસીંગ નિયમો
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","આઇટમ {0} ની સામે પ્રવર્તમાન વ્યવહારો હોવાથી, તમે {1} ની કિંમત બદલી શકતા નથી"
 DocType: Hub Tracked Item,Image List,છબી સૂચિ
 DocType: Item Variant Settings,Allow Rename Attribute Value,એટ્રીબ્યુટ મૂલ્યનું નામ બદલવાની મંજૂરી આપો
-DocType: Price List,Price Not UOM Dependant,કિંમત યુઓમ આધારિત નથી
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),સમય (મિનિટમાં)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,પાયાની
 DocType: Loan,Interest Income Account,વ્યાજ આવક ખાતું
@@ -1384,6 +1395,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,પી.ઓ.એસ. પ્રોફાઇલ પસંદ કરો
 DocType: Support Settings,Get Latest Query,તાજેતરની ક્વેરી મેળવો
 DocType: Employee Incentive,Employee Incentive,કર્મચારી પ્રોત્સાહન
+DocType: Service Level,Priorities,પ્રાધાન્યતા
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,હોમપેજ પર કાર્ડ્સ અથવા કસ્ટમ વિભાગો ઉમેરો
 DocType: Homepage,Hero Section Based On,હિરો સેક્શન આધારીત
 DocType: Project,Total Purchase Cost (via Purchase Invoice),કુલ ખરીદી કિંમત (ખરીદી ભરતિયું દ્વારા)
@@ -1444,7 +1456,7 @@
 DocType: Blanket Order Item,Ordered Quantity,આદેશ આપ્યો જથ્થો
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},પંક્તિ # {0}: નામંજૂર વેરહાઉસ નામંજૂર વસ્તુ સામે ફરજિયાત છે {1}
 ,Received Items To Be Billed,બિલ કરવા માટે વસ્તુઓ પ્રાપ્ત
-DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
+DocType: Attendance,Working Hours,કામ નાં કલાકો
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,ચુકવણી સ્થિતિ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,ખરીદી ઓર્ડર વસ્તુઓ સમય પર પ્રાપ્ત નથી
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,દિવસોમાં અવધિ
@@ -1564,7 +1576,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,તમારી સપ્લાયર વિશે વૈધાનિક માહિતી અને અન્ય સામાન્ય માહિતી
 DocType: Item Default,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Address & Contacts,સરનામું અને સંપર્કો
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સીરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 DocType: Subscriber,Subscriber,સબ્સ્ક્રાઇબર
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ફોર્મ / આઇટમ / {0}) સ્ટોકની બહાર છે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,કૃપા કરીને પહેલા પોસ્ટિંગ તારીખ પસંદ કરો
@@ -1575,7 +1586,7 @@
 DocType: Detected Disease,Tasks Created,કાર્યો બનાવ્યાં
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,ડિફૉલ્ટ BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવું આવશ્યક છે
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,કમિશન દર%
-DocType: Service Level,Response Time,પ્રતિભાવ સમય
+DocType: Service Level Priority,Response Time,પ્રતિભાવ સમય
 DocType: Woocommerce Settings,Woocommerce Settings,WooCommerce સેટિંગ્સ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,જથ્થો હકારાત્મક હોવા જ જોઈએ
 DocType: Contract,CRM,સીઆરએમ
@@ -1592,7 +1603,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,ટ્રાન્ઝેક્શન ડેટા મેપિંગ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,લીડને કોઈ વ્યક્તિનું નામ અથવા સંસ્થાના નામની જરૂર હોય છે
 DocType: Student,Guardians,વાલીઓ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,બ્રાન્ડ પસંદ કરો ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,મધ્ય આવક
 DocType: Shipping Rule,Calculate Based On,ગણતરી આધારિત
@@ -1629,6 +1639,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},વિદ્યાર્થી સામે હાજરી રેકોર્ડ {0} અસ્તિત્વ ધરાવે છે {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,ટ્રાંઝેક્શનની તારીખ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,ઉમેદવારી રદ કરો
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,સેવા સ્તર કરાર {0} સેટ કરી શકાયો નથી.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,ચોખ્ખી પગાર રકમ
 DocType: Account,Liability,જવાબદારી
 DocType: Employee,Bank A/C No.,બેંક એ / સી નં.
@@ -1693,7 +1704,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,કાચો માલસામાન વસ્તુ કોડ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,ખરીદી ભરતિયું {0} પહેલેથી સબમિટ થયેલ છે
 DocType: Fees,Student Email,વિદ્યાર્થી ઇમેઇલ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},બીએમએમ રિકર્ઝન: {0} માતાપિતા અથવા બાળકનું બાળક હોઈ શકતું નથી {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,હેલ્થકેર સેવાઓમાંથી વસ્તુઓ મેળવો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} સબમિટ નથી
 DocType: Item Attribute Value,Item Attribute Value,આઇટમ એટ્રીબ્યુટ મૂલ્ય
@@ -1718,7 +1728,6 @@
 DocType: Production Plan,Select Items to Manufacture,ઉત્પાદન કરવા માટે વસ્તુઓ પસંદ કરો
 DocType: Leave Application,Leave Approver Name,એપ્રોવર નામ છોડો
 DocType: Shareholder,Shareholder,શેરહોલ્ડર
-DocType: Issue,Agreement Status,કરારની સ્થિતિ
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,વ્યવહારો વેચવા માટે ડિફૉલ્ટ સેટિંગ્સ.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,કૃપા કરીને વિદ્યાર્થી પ્રવેશની પસંદગી કરો જે પેઇડ વિદ્યાર્થી અરજદાર માટે ફરજિયાત છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,બોમ પસંદ કરો
@@ -1980,6 +1989,7 @@
 DocType: Account,Income Account,આવક ખાતું
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,બધા વેરહાઉસ
 DocType: Contract,Signee Details,સાઇનિ વિગતો
+DocType: Shift Type,Allow check-out after shift end time (in minutes),શિફ્ટ સમાપ્ત સમય પછી (મિનિટમાં) ચેક-આઉટની મંજૂરી આપો
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,પ્રાપ્તિ
 DocType: Item Group,Check this if you want to show in website,જો તમે વેબસાઇટમાં બતાવવા માંગતા હોવ તો આ તપાસો
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,ફિસ્કલ વર્ષ {0} મળ્યું નથી
@@ -2046,6 +2056,7 @@
 DocType: Activity Cost,Billing Rate,બિલિંગ દર
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},ચેતવણી: અન્ય {0} # {1} સ્ટોક એન્ટ્રી સામે અસ્તિત્વમાં છે {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,કૃપા કરીને રસ્તાઓનો અંદાજ કાઢવા અને ઑપ્ટિમાઇઝ કરવા માટે Google નકશા સેટિંગ્સને સક્ષમ કરો
+DocType: Purchase Invoice Item,Page Break,પૃષ્ઠ વિરામ
 DocType: Supplier Scorecard Criteria,Max Score,મેક્સ સ્કોર
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,ચુકવણી પ્રારંભ તારીખ વિતરણ તારીખ પહેલાં હોઈ શકતી નથી.
 DocType: Support Search Source,Support Search Source,સપોર્ટ શોધ સ્રોત
@@ -2114,6 +2125,7 @@
 DocType: Employee Transfer,Employee Transfer,કર્મચારી ટ્રાન્સફર
 ,Sales Funnel,સેલ્સ ફનલ
 DocType: Agriculture Analysis Criteria,Water Analysis,પાણી વિશ્લેષણ
+DocType: Shift Type,Begin check-in before shift start time (in minutes),શિફ્ટ પ્રારંભ સમય પહેલા (મિનિટમાં) ચેક-ઇન પ્રારંભ કરો
 DocType: Accounts Settings,Accounts Frozen Upto,એકાઉન્ટ્સ ફ્રોઝન સુધી
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,સંપાદન કરવા માટે કંઈ નથી.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","વર્કસ્ટેશન {1} માં કોઈપણ ઉપલબ્ધ કલાકો કરતાં વધુ {0} ઓપરેશન, ઑપરેશનને બહુવિધ ઓપરેશન્સમાં તોડો"
@@ -2127,7 +2139,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},સેલ્સ ઓર્ડર {0} {1} છે
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),ચૂકવણીમાં વિલંબ (દિવસો)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,અવમૂલ્યન વિગતો દાખલ કરો
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,ગ્રાહક પી
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,અપેક્ષિત ડિલિવરી તારીખ સેલ્સ ઓર્ડર તારીખ પછી હોવી જોઈએ
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,વસ્તુ જથ્થો શૂન્ય હોઈ શકતો નથી
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,અમાન્ય લક્ષણ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},કૃપા કરીને વસ્તુ વિરુદ્ધ BOM પસંદ કરો {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ભરતિયું પ્રકાર
@@ -2137,6 +2151,7 @@
 DocType: Volunteer,Afternoon,બપોર પછી
 DocType: Vital Signs,Nutrition Values,પોષણ મૂલ્યો
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),તાવની હાજરી (તાપમાન&gt; 38.5 ડિગ્રી સેલ્સિયસ / 101.3 ડિગ્રી ફેરનહીટ અથવા સતત તાપમાન&gt; 38 ° સે / 100.4 ° ફે)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,આઇટીસી રિવર્સ
 DocType: Project,Collect Progress,પ્રગતિ એકત્રિત કરો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ઊર્જા
@@ -2186,6 +2201,7 @@
 ,Ordered Items To Be Billed,આદેશ આપ્યો વસ્તુઓ બિલ કરવામાં આવશે
 DocType: Taxable Salary Slab,To Amount,રકમ
 DocType: Purchase Invoice,Is Return (Debit Note),રીટર્ન છે (ડેબિટ નોંધ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 apps/erpnext/erpnext/config/desktop.py,Getting Started,પ્રારંભ કરો
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,મર્જ કરો
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,એકવાર ફિસ્કલ વર્ષ સાચવવામાં આવે પછી ફિસ્કલ યર પ્રારંભ તારીખ અને નાણાકીય વર્ષ સમાપ્તિ તારીખ બદલી શકતા નથી.
@@ -2204,8 +2220,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી પ્રારંભ તારીખ સીરીયલ નંબર {0} માટે વિતરણ તારીખ પહેલાં હોઈ શકતી નથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,પંક્તિ {0}: એક્સચેન્જ દર ફરજિયાત છે
 DocType: Purchase Invoice,Select Supplier Address,સપ્લાયર સરનામું પસંદ કરો
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","ઉપલબ્ધ જથ્થો {0} છે, તમારે {1} ની જરૂર છે"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,કૃપા કરીને API ઉપભોક્તા સિક્રેટ દાખલ કરો
 DocType: Program Enrollment Fee,Program Enrollment Fee,પ્રોગ્રામ નોંધણી ફી
+DocType: Employee Checkin,Shift Actual End,શિફ્ટ વાસ્તવિક અંત
 DocType: Serial No,Warranty Expiry Date,વોરંટી સમાપ્તિ તારીખ
 DocType: Hotel Room Pricing,Hotel Room Pricing,હોટેલ રૂમ પ્રાઇસીંગ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","બાહ્ય કરપાત્ર પુરવઠો (શૂન્ય રેટ કર્યા સિવાય, નબળા રેટ કર્યા અને મુક્તિ આપવામાં આવી"
@@ -2264,6 +2282,7 @@
 DocType: Quality Inspection Reading,Reading 5,વાંચન 5
 DocType: Shopping Cart Settings,Display Settings,ડિસ્પ્લે સેટિંગ્સ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,કૃપા કરીને બુક કરાયેલ અવમૂલ્યનની સંખ્યા સેટ કરો
+DocType: Shift Type,Consequence after,પછી પરિણામ
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,તમને કઈ મદદની જરૂર છે?
 DocType: Journal Entry,Printing Settings,છાપવાની સેટિંગ્સ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,બેંકિંગ
@@ -2273,6 +2292,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,બિલિંગ સરનામું શિપિંગ સરનામાં જેવું જ છે
 DocType: Account,Cash,રોકડ
 DocType: Employee,Leave Policy,નીતિ છોડી દો
+DocType: Shift Type,Consequence,પરિણામ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,વિદ્યાર્થીનું સરનામું
 DocType: GST Account,CESS Account,સીઈએસ એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: &#39;નફા અને નુકસાન&#39; ખાતા માટે ખર્ચ કેન્દ્ર આવશ્યક છે {2}. કૃપા કરીને કંપની માટે ડિફોલ્ટ કોસ્ટ સેન્ટર સેટ કરો.
@@ -2337,6 +2357,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,સમયગાળો બંધ વાઉચર
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,ગાર્ડિયન 2 નામ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,કૃપા કરીને ખર્ચ એકાઉન્ટ દાખલ કરો
+DocType: Issue,Resolution By Variance,ભિન્નતા દ્વારા ઠરાવ
 DocType: Employee,Resignation Letter Date,રાજીનામું લેટર તારીખ
 DocType: Soil Texture,Sandy Clay,સેન્ડી ક્લે
 DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
@@ -2349,6 +2370,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,હવે જુઓ
 DocType: Item Price,Valid Upto,માન્ય સુધી
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},સંદર્ભ ડોકટાઇપ {0} માંની એક હોવી આવશ્યક છે
+DocType: Employee Checkin,Skip Auto Attendance,ઑટો એટેન્ડન્સ છોડો
 DocType: Payment Request,Transaction Currency,ટ્રાન્ઝેક્શન કરન્સી
 DocType: Loan,Repayment Schedule,ચુકવણી સમયપત્રક
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,નમૂના રીટેન્શન સ્ટોક એન્ટ્રી બનાવો
@@ -2420,6 +2442,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,પોસ ક્લોઝિંગ વાઉચર ટેક્સ
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,ક્રિયા પ્રારંભિક
 DocType: POS Profile,Applicable for Users,વપરાશકર્તાઓ માટે લાગુ
+,Delayed Order Report,વિલંબિત ઓર્ડર રિપોર્ટ
 DocType: Training Event,Exam,પરીક્ષા
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ખોટી સંખ્યામાં સામાન્ય લેજર પ્રવેશો મળી. તમે ટ્રાન્ઝેક્શનમાં ખોટો ખાતા પસંદ કર્યો હશે.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,સેલ્સ પાઇપલાઇન
@@ -2434,10 +2457,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,બધી પસંદ કરેલી આઇટમ્સ પર સંયુક્ત શરતો લાગુ કરવામાં આવશે.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,રૂપરેખાંકિત કરો
 DocType: Hotel Room,Capacity,ક્ષમતા
+DocType: Employee Checkin,Shift End,શિફ્ટ એન્ડ
 DocType: Installation Note Item,Installed Qty,સ્થાપિત જથ્થો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,આઇટમ {1} નું બેચ {0} અક્ષમ છે.
 DocType: Hotel Room Reservation,Hotel Reservation User,હોટેલ આરક્ષણ વપરાશકર્તા
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,કામકાજ બે વાર પુનરાવર્તન કરવામાં આવ્યું છે
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,એન્ટિટી પ્રકાર {0} અને એન્ટિટી {1} સાથે સેવા સ્તર કરાર પહેલાથી અસ્તિત્વમાં છે.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},આઈટમ ગ્રુપનો આઇટમ માસ્ટરમાં ઉલ્લેખ કર્યો નથી {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},નામ ભૂલ: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,પી.ઓ.એસ. પ્રોફાઇલમાં પ્રદેશ આવશ્યક છે
@@ -2485,6 +2509,7 @@
 DocType: Depreciation Schedule,Schedule Date,સૂચિ તારીખ
 DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
 DocType: Job Applicant,Job Opening,જોબ ઓપનિંગ
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,કર્મચારી ચેકિનના છેલ્લા જાણીતા સફળ સમન્વયન. જો તમને ખાતરી છે કે બધા લોગ બધા સ્થાનોથી સમન્વયિત છે તો જ આને ફરીથી સેટ કરો. જો તમે અચોક્કસ હોવ તો કૃપા કરીને આને સંશોધિત કરશો નહીં.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,વાસ્તવિક ખર્ચ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ઓર્ડર સામે કુલ એડવાન્સ ({0}) {1} ગ્રાન્ડ ટોટલ ({2}) કરતા વધારે ન હોઈ શકે
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,વસ્તુ ચલો અદ્યતન
@@ -2529,6 +2554,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,આમંત્રણ મેળવો
 DocType: Tally Migration,Is Day Book Data Imported,દિવસ બુક ડેટા આયાત કરેલો છે
 ,Sales Partners Commission,સેલ્સ પાર્ટનર્સ કમિશન
+DocType: Shift Type,Enable Different Consequence for Early Exit,પ્રારંભિક બહાર નીકળો માટે વિવિધ પરિણામોને સક્ષમ કરો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,કાયદેસર
 DocType: Loan Application,Required by Date,તારીખ દ્વારા જરૂરી
 DocType: Quiz Result,Quiz Result,ક્વિઝ પરિણામ
@@ -2588,7 +2614,6 @@
 DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},વૈકલ્પિક રજાઓની સૂચિ રજા અવધિ માટે સેટ નથી {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,કૃપા કરીને કર્મચારીની ભૂમિકા સેટ કરવા માટે કર્મચારી રેકોર્ડમાં વપરાશકર્તા ID ફીલ્ડ સેટ કરો
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,ઉકેલવાનો સમય
 DocType: Training Event,Training Event,તાલીમ ઇવેન્ટ
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","પુખ્ત વયના સામાન્ય રક્તસ્રાવમાં આશરે 120 એમએમએચજી સિસ્ટૉલિક હોય છે, અને 80 એમએમએચજી ડાયાસ્ટોલિક, સંક્ષિપ્તમાં &quot;120/80 એમએમએચજી&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,મર્યાદા મૂલ્ય શૂન્ય હોય તો સિસ્ટમ બધી એન્ટ્રીઓ લાવશે.
@@ -2632,6 +2657,7 @@
 DocType: Student Applicant,Approved,મંજૂર
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},તારીખથી ફિસ્કલ વર્ષની અંદર હોવી જોઈએ. તારીખથી ધારી રહ્યા છીએ = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,કૃપા કરીને ખરીદી સેટિંગ્સમાં સપ્લાયર જૂથ સેટ કરો.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} અમાન્ય હાજરી સ્થિતિ છે.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,અસ્થાયી ઓપનિંગ એકાઉન્ટ
 DocType: Purchase Invoice,Cash/Bank Account,રોકડ / બેંક ખાતું
 DocType: Quality Meeting Table,Quality Meeting Table,ગુણવત્તા સભા ટેબલ
@@ -2667,6 +2693,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ખોરાક, પીણા અને તમાકુ"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,કોર્સ શેડ્યૂલ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,આઇટમ વાઈસ ટેક્સ વિગતવાર
+DocType: Shift Type,Attendance will be marked automatically only after this date.,આ તારીખ પછી હાજરી આપોઆપ ચિહ્નિત કરવામાં આવશે.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,યુઆઇએન ધારકોને કરવામાં આવતી પુરવઠો
 apps/erpnext/erpnext/hooks.py,Request for Quotations,અવતરણ માટે વિનંતી
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,કેટલીક ચલણનો ઉપયોગ કરીને પ્રવેશો કર્યા પછી કરન્સી બદલી શકાતી નથી
@@ -2715,7 +2742,6 @@
 DocType: Item,Is Item from Hub,હબ માંથી આઇટમ છે
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,ગુણવત્તા પ્રક્રિયા.
 DocType: Share Balance,No of Shares,શેર્સની સંખ્યા
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),પંક્તિ {0}: પ્રવેશની સમય ({2} {3}) પર વેરહાઉસ {1} માં {4} માલ ઉપલબ્ધ નથી.
 DocType: Quality Action,Preventive,નિવારક
 DocType: Support Settings,Forum URL,ફોરમ URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,કર્મચારી અને હાજરી
@@ -2937,7 +2963,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,ડિફોલ્ટ ટેક્સ અને ચાર્જિસ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,આ આ સપ્લાયર સામેના વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે સમયરેખા જુઓ
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,કરાર માટે પ્રારંભ અને સમાપ્તિ તારીખ દાખલ કરો.
 DocType: Delivery Note Item,Against Sales Invoice,સેલ્સ ઇનવોઇસ સામે
 DocType: Loyalty Point Entry,Purchase Amount,ખરીદી રકમ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,સેલ્સ ઑર્ડર બનાવાયેલી તરીકે લોસ્ટ તરીકે સેટ કરી શકાતું નથી.
@@ -2961,7 +2986,7 @@
 DocType: Lead,Organization Name,સંસ્થા નુ નામ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,સંચિત માટે ક્ષેત્રોથી માન્ય અને માન્ય છે તે ફરજિયાત છે
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},પંક્તિ # {0}: બેચ નોટ {1} {2} જેટલો જ હોવો જોઈએ
-DocType: Employee,Leave Details,વિગતો છોડો
+DocType: Employee Checkin,Shift Start,શિફ્ટ પ્રારંભ કરો
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0} પહેલાં સ્ટોક ટ્રાંઝેક્ટ્સ સ્થિર થઈ જાય છે
 DocType: Driver,Issuing Date,રજૂઆત તારીખ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,વિનંતી કરનાર
@@ -3006,9 +3031,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,કેશ ફ્લો મેપિંગ ઢાંચો વિગતો
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,ભરતી અને તાલીમ
 DocType: Drug Prescription,Interval UOM,અંતરાલ યુએમએમ
+DocType: Shift Type,Grace Period Settings For Auto Attendance,ઓટો હાજરી માટે ગ્રેસ પીરિયડ સેટિંગ્સ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,કરન્સી અને કરન્સીથી સમાન હોઈ શકતા નથી
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,ફાર્માસ્યુટિકલ્સ
 DocType: Employee,HR-EMP-,એચઆર-ઇએમપી-
+DocType: Service Level,Support Hours,સહાયક કલાકો
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} રદ અથવા બંધ છે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,પંક્તિ {0}: ગ્રાહક સામે એડવાન્સ ક્રેડિટ હોવું આવશ્યક છે
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),વાઉચર દ્વારા ગ્રુપ (કન્સોલિડેટેડ)
@@ -3118,6 +3145,7 @@
 DocType: Territory,Territory Manager,પ્રદેશ વ્યવસ્થાપક
 DocType: Lab Test,Sample ID,નમૂના ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,કાર્ટ ખાલી છે
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,કર્મચારી ચેક-ઇન્સ મુજબ હાજરી નિશ્ચિત કરવામાં આવી છે
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,સંપત્તિ {0} સબમિટ કરવી આવશ્યક છે
 ,Absent Student Report,ગેરહાજર વિદ્યાર્થી અહેવાલ
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,ગ્રોસ પ્રોફિટમાં શામેલ છે
@@ -3125,7 +3153,9 @@
 DocType: Travel Request Costing,Funded Amount,ભંડોળ રકમ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} સબમિટ કરવામાં આવ્યું નથી તેથી ક્રિયા પૂર્ણ કરી શકાતી નથી
 DocType: Subscription,Trial Period End Date,ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,સમાન શિફ્ટ દરમિયાન IN અને OUT ની વૈકલ્પિક એન્ટ્રીઓ
 DocType: BOM Update Tool,The new BOM after replacement,બદલી પછી નવી બોમ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,વસ્તુ 5
 DocType: Employee,Passport Number,પાસપોર્ટ નંબર
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,અસ્થાયી ખુલવાનો
@@ -3240,6 +3270,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,સંભવિત સપ્લાયર
 ,Issued Items Against Work Order,વર્ક ઑર્ડર સામે રજૂ કરાયેલ આઈટમ્સ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ભરતિયું બનાવી રહ્યું છે
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 DocType: Student,Joining Date,જોડાયા તારીખ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,સાઇટની વિનંતી કરી રહ્યાં છે
 DocType: Purchase Invoice,Against Expense Account,ખર્ચ એકાઉન્ટ સામે
@@ -3279,6 +3310,7 @@
 DocType: Landed Cost Item,Applicable Charges,લાગુ ચાર્જ
 ,Point of Sale,વેચાણ પોઇન્ટ
 DocType: Authorization Rule,Approving User  (above authorized value),વપરાશકર્તા મંજૂર (અધિકૃત મૂલ્ય ઉપર)
+DocType: Service Level Agreement,Entity,એન્ટિટી
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} {2} થી {3} માં સ્થાનાંતરિત રકમ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},ગ્રાહક {0} પ્રોજેક્ટથી સંબંધિત નથી {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,પાર્ટી નામથી
@@ -3325,6 +3357,7 @@
 DocType: Soil Texture,Sand Composition (%),રેતી રચના (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,એમએફજી-પીપી- .YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,આયાત દિવસ બુક ડેટા
+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; નામકરણ શ્રેણી દ્વારા નામકરણ સીરીઝ સેટ કરો
 DocType: Asset,Asset Owner Company,સંપત્તિ માલિક કંપની
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,ખર્ચના કેન્દ્રને ખર્ચના દાવાને બુક કરવાની જરૂર છે
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} આઇટમ માટે માન્ય સીરીયલ નોસ {1}
@@ -3385,7 +3418,6 @@
 DocType: Asset,Asset Owner,સંપત્તિ માલિક
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},પંક્તિ {1} માં સ્ટોક વસ્તુ {0} માટે વેરહાઉસ ફરજિયાત છે.
 DocType: Stock Entry,Total Additional Costs,કુલ વધારાના ખર્ચ
-DocType: Marketplace Settings,Last Sync On,છેલ્લું સમન્વયન ચાલુ
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,કૃપા કરીને કર અને ચાર્જ ટેબલમાં ઓછામાં ઓછી એક હરોળ સેટ કરો
 DocType: Asset Maintenance Team,Maintenance Team Name,જાળવણી ટીમનું નામ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,ખર્ચ કેન્દ્રોનું ચાર્ટ
@@ -3401,12 +3433,12 @@
 DocType: Job Card,WIP Warehouse,ડબ્લ્યુઆઇપી વેરહાઉસ
 DocType: Payment Request,ACC-PRQ-.YYYY.-,એસીસી-પીઆરક્યૂ- .YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},કર્મચારી માટે યુઝર આઈડી સેટ નથી {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","ઉપલબ્ધ qty {0} છે, તમારે {1} ની જરૂર છે"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,વપરાશકર્તા {0} બનાવ્યું
 DocType: Stock Settings,Item Naming By,આઇટમ દ્વારા નામકરણ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,આદેશ આપ્યો
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,આ રુટ ગ્રાહક જૂથ છે અને સંપાદિત કરી શકાતું નથી.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,મટીરીયલ વિનંતી {0} રદ અથવા બંધ છે
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,કર્મચારી ચેકિનમાં લોગ પ્રકાર પર આધારિત સખત રીતે
 DocType: Purchase Order Item Supplied,Supplied Qty,પુરવઠો જથ્થો
 DocType: Cash Flow Mapper,Cash Flow Mapper,કેશ ફ્લો મેપર
 DocType: Soil Texture,Sand,રેતી
@@ -3465,6 +3497,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,આઇટમ જૂથ કોષ્ટકમાં ડુપ્લિકેટ આઇટમ જૂથ મળી
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,વરસ નો પગાર
 DocType: Supplier Scorecard,Weighting Function,વેઇટિંગ ફંક્શન
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,માપદંડ ફોર્મ્યુલાનું મૂલ્યાંકન કરવામાં ભૂલ
 ,Lab Test Report,લેબ ટેસ્ટ રિપોર્ટ
 DocType: BOM,With Operations,ઓપરેશન્સ સાથે
@@ -3478,6 +3511,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,જર્નલ એન્ટ્રી માટે કોઈ ચુકવણી ઉપલબ્ધ નથી
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} નિષ્ક્રિય વિદ્યાર્થી છે
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,સ્ટોક એન્ટ્રી બનાવો
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},બીએમએમ રિકર્ઝન: {0} માતાપિતા અથવા બાળકનું બાળક હોઈ શકતું નથી {1}
 DocType: Employee Onboarding,Activities,પ્રવૃત્તિઓ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,ઓછામાં ઓછું એક વેરહાઉસ ફરજિયાત છે
 ,Customer Credit Balance,ગ્રાહક ક્રેડિટ બેલેન્સ
@@ -3490,9 +3524,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,ગ્રાહક માટે મલ્ટીપલ લોયલ્ટી પ્રોગ્રામ મળ્યો. કૃપા કરીને મેન્યુઅલી પસંદ કરો.
 DocType: Patient,Medication,દવા
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,વફાદારી કાર્યક્રમ પસંદ કરો
+DocType: Employee Checkin,Attendance Marked,હાજરી ચિહ્નિત
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,કાચો માલ
 DocType: Sales Order,Fully Billed,સંપૂર્ણપણે બિલકુલ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},કૃપા કરીને હોટેલ રૂમ દર {} પર સેટ કરો
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,ડિફોલ્ટ તરીકે ફક્ત એક પ્રાધાન્યતા પસંદ કરો.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},કૃપા કરી પ્રકાર ({0} માટે એકાઉન્ટ (લેજર) ને ઓળખો / બનાવો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,કુલ ક્રેડિટ / ડેબિટ રકમ લિંક કરેલી જર્નલ એન્ટ્રી જેવી જ હોવી જોઈએ
 DocType: Purchase Invoice Item,Is Fixed Asset,સ્થિર મિલકત છે
@@ -3513,6 +3549,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,નિમણૂક પુષ્ટિ
 DocType: Shopping Cart Settings,Orders,ઓર્ડર
 DocType: HR Settings,Retirement Age,નિવૃત્તિ ઉંમર
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,પ્રસ્તાવિત જથ્થો
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},દેશ માટે કાઢી નાંખવાની પરવાનગી નથી {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},પંક્તિ # {0}: સંપત્તિ {1} પહેલેથી જ છે {2}
@@ -3596,11 +3633,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,એકાઉન્ટન્ટ
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},પીઓએસ ક્લોઝિંગ વાઉચર એલ્ડ્રેય {0} ની તારીખ {1} અને {2} વચ્ચે અસ્તિત્વમાં છે
 apps/erpnext/erpnext/config/help.py,Navigating,નેવિગેટિંગ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,કોઈ બાકી ઇન્વૉઇસેસને વિનિમય દરના પુન: મૂલ્યાંકનની જરૂર નથી
 DocType: Authorization Rule,Customer / Item Name,ગ્રાહક / આઇટમ નામ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,નવી સીરીયલ નો વેરહાઉસ ન હોઈ શકે. વેરહાઉસ સ્ટોક એન્ટ્રી અથવા ખરીદી રસીદ દ્વારા સેટ કરવું આવશ્યક છે
 DocType: Issue,Via Customer Portal,ગ્રાહક પોર્ટલ દ્વારા
 DocType: Work Order Operation,Planned Start Time,આયોજન પ્રારંભ સમય
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2} છે
+DocType: Service Level Priority,Service Level Priority,સેવા સ્તર પ્રાધાન્યતા
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,બુક કરાયેલ અવમૂલ્યનની સંખ્યા અવમૂલ્યનની કુલ સંખ્યા કરતાં મોટી હોઈ શકતી નથી
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,શેર લેજર
 DocType: Journal Entry,Accounts Payable,ચુકવવાપાત્ર ખાતાઓ
@@ -3711,7 +3750,6 @@
 DocType: Delivery Note,Delivery To,ડિલિવરી
 DocType: Bank Statement Transaction Settings Item,Bank Data,બેંક ડેટા
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,સુનિશ્ચિત સુધી
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,ટાઇમશીટ પર બિલિંગ અવર્સ અને કાર્યકાળનો સમય જાળવો
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,ટ્રેક લીડ સોર્સ દ્વારા દોરી જાય છે.
 DocType: Clinical Procedure,Nursing User,નર્સિંગ યુઝર
 DocType: Support Settings,Response Key List,પ્રતિભાવ કી યાદી
@@ -3879,6 +3917,7 @@
 DocType: Work Order Operation,Actual Start Time,વાસ્તવિક પ્રારંભ સમય
 DocType: Antibiotic,Laboratory User,લેબોરેટરી યુઝર
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,ઑનલાઇન હરાજી
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,પ્રાધાન્યતા {0} પુનરાવર્તિત કરવામાં આવી છે.
 DocType: Fee Schedule,Fee Creation Status,ફી સર્જન સ્થિતિ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,સૉફ્ટવેર
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,વેચાણ ઓર્ડર ચુકવણી
@@ -3945,6 +3984,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} માટે માહિતી પુનઃપ્રાપ્ત કરી શકાઈ નથી.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,બિલિંગ ચલણ ડિફૉલ્ટ કંપનીની ચલણ અથવા પાર્ટી એકાઉન્ટ ચલણ જેટલી જ હોવી આવશ્યક છે
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,કૃપા કરીને આ વેચાણ વ્યક્તિના કર્મચારી આઈડી દાખલ કરો
+DocType: Shift Type,Early Exit Consequence after,પ્રારંભિક બહાર નીકળો પરિણામ પછી
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,ઓપનિંગ સેલ્સ અને ખરીદી ઇન્વૉઇસેસ બનાવો
 DocType: Disease,Treatment Period,સારવાર સમયગાળો
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ઇમેઇલ સુયોજિત કરી રહ્યા છે
@@ -3962,7 +4002,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,વિદ્યાર્થીનું નામ:
 DocType: SMS Log,Sent On,મોકલ્યું
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,વેચાણ ભરતિયું
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,રિસ્પોન્સ સમય રીઝોલ્યુશન સમય કરતાં વધુ હોઈ શકતું નથી
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","અભ્યાસક્રમ આધારિત વિદ્યાર્થી જૂથ માટે, પ્રોગ્રામ નોંધણીમાં નોંધાયેલા અભ્યાસક્રમોમાંથી દરેક વિદ્યાર્થી માટે અભ્યાસક્રમ માન્ય કરવામાં આવશે."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,આંતરરાજ્ય પુરવઠા
 DocType: Employee,Create User Permission,વપરાશકર્તા પરવાનગી બનાવો
@@ -4001,6 +4040,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,વેચાણ અથવા ખરીદી માટે માનક કરાર શરતો.
 DocType: Sales Invoice,Customer PO Details,ગ્રાહક પી.ઓ. વિગતો
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,દર્દી મળ્યાં નથી
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,ડિફોલ્ટ પ્રાધાન્યતા પસંદ કરો.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,જો આઇટમ પર શુલ્ક લાગુ ન હોય તો વસ્તુને દૂર કરો
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ગ્રાહક જૂથ સમાન નામથી અસ્તિત્વમાં છે કૃપા કરીને કસ્ટમર નામ બદલો અથવા ગ્રાહક જૂથનું નામ બદલો
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4039,6 +4079,7 @@
 DocType: Quality Goal,Quality Goal,ગુણવત્તા લક્ષ્ય
 DocType: Support Settings,Support Portal,આધાર પોર્ટલ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},એમ્પ્લોયી {0} ચાલુ છે {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},આ સેવા સ્તર કરાર ગ્રાહક માટે વિશિષ્ટ છે {0}
 DocType: Employee,Held On,પર રાખવામાં
 DocType: Healthcare Practitioner,Practitioner Schedules,પ્રેક્ટિશનર શેડ્યૂલ
 DocType: Project Template Task,Begin On (Days),પ્રારંભ (દિવસો)
@@ -4046,6 +4087,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},વર્ક ઓર્ડર {0}
 DocType: Inpatient Record,Admission Schedule Date,પ્રવેશ શેડ્યૂલ તારીખ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,સંપત્તિ મૂલ્ય ગોઠવણ
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,આ પાળીને સોંપેલ કર્મચારીઓ માટે &#39;કર્મચારી ચેકિન&#39; પર આધારિત હાજરી હાજરી.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,અનિયંત્રિત વ્યક્તિઓને કરવામાં આવતી પુરવઠો
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,બધી નોકરીઓ
 DocType: Appointment Type,Appointment Type,નિમણૂંક પ્રકાર
@@ -4159,7 +4201,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),પેકેજનું કુલ વજન. સામાન્ય રીતે નેટ વજન + પેકેજિંગ સામગ્રી વજન. (છાપવા માટે)
 DocType: Plant Analysis,Laboratory Testing Datetime,લેબોરેટરી પરીક્ષણ ડેટાઇમ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,આઇટમ {0} પાસે બેચ ન હોઈ શકે
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,સ્ટેજ દ્વારા સેલ્સ પાઇપલાઇન
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,વિદ્યાર્થી જૂથ શક્તિ
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,બેંક સ્ટેટમેન્ટ ટ્રાન્ઝેક્શન એન્ટ્રી
 DocType: Purchase Order,Get Items from Open Material Requests,ઓપન મટિરિયલ અરજીઓમાંથી આઇટમ્સ મેળવો
@@ -4241,7 +4282,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,એગિંગ વેરહાઉસ-મુજબ બતાવો
 DocType: Sales Invoice,Write Off Outstanding Amount,બાકી રકમ લખો
 DocType: Payroll Entry,Employee Details,કર્મચારીની વિગતો
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,{0} માટે પ્રારંભ સમય કરતાં પ્રારંભ સમય વધારે હોઈ શકતો નથી.
 DocType: Pricing Rule,Discount Amount,ડિસ્કાઉન્ટ રકમ
 DocType: Healthcare Service Unit Type,Item Details,આઇટમ વિગતો
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},{0} સમયગાળા માટે {0} નું ડુપ્લિકેટ ટેક્સ ઘોષણા
@@ -4294,7 +4334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,નેટ પેજ નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,કોઈ ક્રિયાપ્રતિક્રિયા નથી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},પંક્તિ {0} # આઇટમ {1} ખરીદ ઓર્ડર {3} સામે {2} કરતાં વધુ સ્થાનાંતરિત કરી શકાતી નથી.
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,એકાઉન્ટ્સ અને પક્ષોના પ્રોસેસિંગ ચાર્ટ
 DocType: Stock Settings,Convert Item Description to Clean HTML,એચટીએમએલ સાફ કરવા માટે આઇટમ વર્ણન કન્વર્ટ
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,બધા પુરવઠોકર્તા જૂથો
@@ -4365,6 +4405,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,પિતૃ સેવા એકમ
 DocType: Sales Invoice,Include Payment (POS),ચુકવણી શામેલ કરો (પી.ઓ.એસ.)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,પ્રાઇવેટ ઇક્વિટી
+DocType: Shift Type,First Check-in and Last Check-out,પ્રથમ ચેક-ઇન અને છેલ્લું ચેક-આઉટ
 DocType: Landed Cost Item,Receipt Document,રસીદ દસ્તાવેજ
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,સપ્લાયર સ્કોરકાર્ડ પીરિયડ
 DocType: Employee Grade,Default Salary Structure,મૂળભૂત પગાર માળખું
@@ -4447,6 +4488,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,ખરીદી ઓર્ડર બનાવો
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,નાણાકીય વર્ષ માટે બજેટ વ્યાખ્યાયિત કરો.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,એકાઉન્ટ્સ કોષ્ટક ખાલી હોઈ શકતી નથી.
+DocType: Employee Checkin,Entry Grace Period Consequence,એન્ટ્રી ગ્રેસ પીરિયડ પરિણામ
 ,Payment Period Based On Invoice Date,ભરતિયું તારીખ પર આધારિત ચુકવણી સમયગાળો
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},આઇટમ {0} માટે ડિલીવરી તારીખ પહેલાં ઇન્સ્ટોલેશન તારીખ હોઈ શકતી નથી
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,મટીરીયલ વિનંતી લિંક
@@ -4455,6 +4497,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},પંક્તિ {0}: આ વેરહાઉસ માટે એક પુનઃક્રમાંકિત એન્ટ્રી પહેલેથી અસ્તિત્વમાં છે {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,ડોક તારીખ
 DocType: Monthly Distribution,Distribution Name,વિતરણ નામ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,વર્કડે {0} નું પુનરાવર્તન કરવામાં આવ્યું છે.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,ગ્રુપ ટુ નોન-ગ્રુપ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,પ્રગતિમાં સુધારો. તેમાં થોડો સમય લાગી શકે છે.
 DocType: Item,"Example: ABCD.#####
@@ -4467,6 +4510,7 @@
 DocType: Vehicle Log,Fuel Qty,ફ્યુઅલ Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,ગાર્ડિયન 1 મોબાઈલ નં
 DocType: Invoice Discounting,Disbursed,વિતરિત
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"શિફ્ટના અંત પછી સમય, જેમાં હાજરી માટે ચેક-આઉટ ગણવામાં આવે છે."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,ચૂકવવાપાત્ર ખાતાઓમાં નેટ ચેન્જ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,ઉપલબ્ધ નથી
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,ભાગ સમય
@@ -4480,7 +4524,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,પ્રિન્ટમાં પીડીસી બતાવો
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify સપ્લાયર
 DocType: POS Profile User,POS Profile User,પોસ પ્રોફાઇલ વપરાશકર્તા
-DocType: Student,Middle Name,પિતાનું નામ
 DocType: Sales Person,Sales Person Name,વેચાણ વ્યક્તિનું નામ
 DocType: Packing Slip,Gross Weight,સરેરાશ વજન
 DocType: Journal Entry,Bill No,બિલ નં
@@ -4489,7 +4532,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,એચઆર-વૉલ્ગ- .YYYY.-
 DocType: Student,A+,એ +
 DocType: Issue,Service Level Agreement,સેવા સ્તર કરાર
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,કૃપા કરીને કર્મચારી અને પ્રથમ તારીખ પસંદ કરો
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,જમીન મૂલ્યના વાઉચરની રકમ ધ્યાનમાં રાખીને આઇટમ મૂલ્યાંકન દરનું પુન: ગણતરી કરવામાં આવે છે
 DocType: Timesheet,Employee Detail,કર્મચારી વિગતવાર
 DocType: Tally Migration,Vouchers,વાઉચર્સ
@@ -4524,7 +4566,7 @@
 DocType: Additional Salary,Date on which this component is applied,તારીખ કે જેના પર આ ઘટક લાગુ થાય છે
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,ફોલિયો નંબર્સ સાથે ઉપલબ્ધ શેરધારકોની સૂચિ
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,સેટઅપ ગેટવે એકાઉન્ટ્સ.
-DocType: Service Level,Response Time Period,પ્રતિભાવ સમય પીરિયડ
+DocType: Service Level Priority,Response Time Period,પ્રતિભાવ સમય પીરિયડ
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ચાર્જ ખરીદી
 DocType: Course Activity,Activity Date,પ્રવૃત્તિ તારીખ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,નવું ગ્રાહક પસંદ કરો અથવા ઉમેરો
@@ -4549,6 +4591,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,નાણાકીય વર્ષ
 DocType: Sales Invoice Item,Deferred Revenue,સ્થગિત મહેસૂલ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,ઓછામાં ઓછું વેચાણ અથવા ખરીદવાનું એક પસંદ કરવું આવશ્યક છે
+DocType: Shift Type,Working Hours Threshold for Half Day,અર્ધ દિવસ માટે કામના કલાકો થ્રેશોલ્ડ
 ,Item-wise Purchase History,આઇટમ મુજબની ખરીદી ઇતિહાસ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},પંક્તિમાં આઇટમ માટે સેવા સ્ટોપ તારીખ બદલી શકાતી નથી {0}
 DocType: Production Plan,Include Subcontracted Items,ઉપગ્રહિત વસ્તુઓ શામેલ કરો
@@ -4581,6 +4624,7 @@
 DocType: BOM,Allow Same Item Multiple Times,મલ્ટીપલ ટાઇમ્સને સમાન આઇટમને મંજૂરી આપો
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,બોમ બનાવો
 DocType: Healthcare Practitioner,Charges,ચાર્જ
+DocType: Employee,Attendance and Leave Details,હાજરી અને રજા વિગતો
 DocType: Student,Personal Details,અંગત વિગતો
 DocType: Sales Order,Billing and Delivery Status,બિલિંગ અને ડિલિવરી સ્થિતિ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,પંક્તિ {0}: સપ્લાયર માટે {0} ઇમેઇલ સરનામું ઇમેઇલ મોકલવાની જરૂર છે
@@ -4632,7 +4676,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},મૂલ્ય betweeen {0} અને {1} દાખલ કરો
 DocType: Purchase Order,Order Confirmation Date,ઓર્ડર પુષ્ટિ તારીખ
 DocType: Delivery Trip,Calculate Estimated Arrival Times,અંદાજિત આગમન ટાઇમ્સની ગણતરી કરો
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ઉપભોક્તા
 DocType: Instructor,EDU-INS-.YYYY.-,એજ્યુ-આઈએનએસ- .YYYY.-
 DocType: Subscription,Subscription Start Date,ઉમેદવારી પ્રારંભ તારીખ
@@ -4655,7 +4698,7 @@
 DocType: Journal Entry Account,Journal Entry Account,જર્નલ એન્ટ્રી એકાઉન્ટ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,ચલ
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,ફોરમ પ્રવૃત્તિ
-DocType: Service Level,Resolution Time Period,ઠરાવ સમય પીરિયડ
+DocType: Service Level Priority,Resolution Time Period,ઠરાવ સમય પીરિયડ
 DocType: Request for Quotation,Supplier Detail,સપ્લાયર વિગતવાર
 DocType: Project Task,View Task,કાર્ય જુઓ
 DocType: Serial No,Purchase / Manufacture Details,ખરીદી / ઉત્પાદન વિગતો
@@ -4722,6 +4765,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,વેરહાઉસ ફક્ત સ્ટોક એન્ટ્રી / ડિલિવરી નોટ / ખરીદી રસીદ દ્વારા બદલી શકાય છે
 DocType: Support Settings,Close Issue After Days,દિવસો પછી ઇશ્યૂ બંધ કરો
 DocType: Payment Schedule,Payment Schedule,ચુકવણી સૂચિ
+DocType: Shift Type,Enable Entry Grace Period,એન્ટ્રી ગ્રેસ પીરિયડ સક્ષમ કરો
 DocType: Patient Relation,Spouse,જીવનસાથી
 DocType: Purchase Invoice,Reason For Putting On Hold,હોલ્ડ પર મૂકવા માટેનું કારણ
 DocType: Item Attribute,Increment,વધારો
@@ -4861,6 +4905,7 @@
 DocType: Vehicle Log,Invoice Ref,ભરતિયું રિફ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},ઇનવોઇસ માટે સી-ફોર્મ લાગુ પડતું નથી: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,ભરતિયું બનાવ્યું
+DocType: Shift Type,Early Exit Grace Period,પ્રારંભિક બહાર નીકળો ગ્રેસ પીરિયડ
 DocType: Patient Encounter,Review Details,સમીક્ષા વિગતો
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,પંક્તિ {0}: કલાક મૂલ્ય શૂન્ય કરતાં વધુ હોવું આવશ્યક છે.
 DocType: Account,Account Number,ખાતા નંબર
@@ -4872,7 +4917,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","કંપની SPA, SAPA અથવા SRL હોય તો લાગુ થાય છે"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,ઓવરલેપિંગ શરતો વચ્ચે મળી:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,ચુકવેલ અને વિતરિત નથી
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,વસ્તુ કોડ ફરજિયાત છે કારણ કે આઇટમ આપમેળે ક્રમાંકિત નથી
 DocType: GST HSN Code,HSN Code,એચએસએન કોડ
 DocType: GSTR 3B Report,September,સપ્ટેમ્બર
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,વહીવટી ખર્ચ
@@ -4908,6 +4952,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,સીડબલ્યુઆઈપી એકાઉન્ટ
 DocType: SMS Log,Sender Name,પ્રેષકનું નામ
 DocType: Pricing Rule,Supplier Group,સપ્લાયર ગ્રુપ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",ઈન્ડેક્સ {1} પર \ સપોર્ટ ડે માટે {0} પ્રારંભ સમય અને સમાપ્તિ સમય સેટ કરો.
 DocType: Employee,Date of Issue,ઇશ્યુની તારીખ
 ,Requested Items To Be Transferred,સ્થાનાંતરિત વસ્તુઓની વિનંતી કરી
 DocType: Employee,Contract End Date,કરાર સમાપ્તિ તારીખ
@@ -4918,6 +4964,7 @@
 DocType: Opportunity,Sales Stage,સેલ્સ સ્ટેજ
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,એકવાર તમે વેચાણ ઑર્ડર સાચવો તે પછી શબ્દોમાં દેખાશે.
 DocType: Item Reorder,Re-order Level,ફરીથી ક્રમ સ્તર
+DocType: Shift Type,Enable Auto Attendance,ઑટો એટેન્ડન્સ સક્ષમ કરો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,પસંદગી
 ,Department Analytics,વિભાગ ઍનલિટિક્સ
 DocType: Crop,Scientific Name,વૈજ્ઞાનિક નામ
@@ -4930,6 +4977,7 @@
 DocType: Quiz Activity,Quiz Activity,ક્વિઝ પ્રવૃત્તિ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} માન્ય પેરોલ પીરિયડમાં નથી
 DocType: Timesheet,Billed,બિલ
+apps/erpnext/erpnext/config/support.py,Issue Type.,ઇશ્યૂનો પ્રકાર
 DocType: Restaurant Order Entry,Last Sales Invoice,છેલ્લું વેચાણ ભરતિયું
 DocType: Payment Terms Template,Payment Terms,ચુકવણી શરતો
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","અનામત જથ્થો: વેચાણ માટે આદેશ આપ્યો જથ્થો, પરંતુ વિતરિત નથી."
@@ -5025,6 +5073,7 @@
 DocType: Account,Asset,સંપત્તિ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} પાસે હેલ્થકેર પ્રેક્ટિશનર શેડ્યૂલ નથી. તેને હેલ્થકેર પ્રેક્ટિશનર માસ્ટરમાં ઉમેરો
 DocType: Vehicle,Chassis No,ચેસિસ નં
+DocType: Employee,Default Shift,ડિફોલ્ટ શિફ્ટ
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,કંપની સંક્ષિપ્ત
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,સામગ્રીના બિલનું વૃક્ષ
 DocType: Article,LMS User,એલએમએસ વપરાશકર્તા
@@ -5073,6 +5122,7 @@
 DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
 DocType: Student Group Creation Tool,Get Courses,અભ્યાસક્રમો મેળવો
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","પંક્તિ # {0}: Qty એ 1 હોવી જોઈએ, કારણ કે આઇટમ એક નિશ્ચિત સંપત્તિ છે. કૃપા કરીને બહુવિધ ક્વિટી માટે અલગ પંક્તિનો ઉપયોગ કરો."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),કામના કલાકો જે નીચે ગેરહાજર છે. (ઝીરો નિષ્ક્રિય કરવા)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ટ્રાન્ઝેક્શનમાં ફક્ત પાન પર્ણની જ મંજૂરી છે
 DocType: Grant Application,Organization,સંસ્થા
 DocType: Fee Category,Fee Category,ફી કેટેગરી
@@ -5085,6 +5135,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,કૃપા કરીને આ તાલીમ ઇવેન્ટ માટે તમારી સ્થિતિ અપડેટ કરો
 DocType: Volunteer,Morning,મોર્નિંગ
 DocType: Quotation Item,Quotation Item,અવતરણ વસ્તુ
+apps/erpnext/erpnext/config/support.py,Issue Priority.,ઇશ્યૂ પ્રાધાન્યતા.
 DocType: Journal Entry,Credit Card Entry,ક્રેડિટ કાર્ડ એન્ટ્રી
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","ટાઇમ સ્લોટ અવગણવામાં, સ્લોટ {0} થી {1} એક્ઝિઝીટીંગ સ્લોટ {2} થી {3} ઓવરલેપ થાય છે"
 DocType: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ
@@ -5135,11 +5186,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,ડેટા આયાત અને સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","જો ઑટો ઑપ્ટ ઇન ચેક કરેલું છે, તો ગ્રાહકો સંબંધિત લૉયલ્ટી પ્રોગ્રામ (આપમેળે) સાથે આપમેળે જોડાયેલા રહેશે."
 DocType: Account,Expense Account,ખર્ચ એકાઉન્ટ
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,શિફ્ટ પહેલા સમય શરૂ થાય છે કે જેમાં કર્મચારીનું ચેક-ઇન હાજરી માટે માનવામાં આવે છે.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ગાર્ડિયન 1 સાથેનો સંબંધ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,ભરતિયું બનાવો
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},ચુકવણી વિનંતી પહેલાથી અસ્તિત્વમાં છે {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',એમ્પ્લોયી {0} પર રાહત મેળવવી આવશ્યક છે &#39;ડાબે&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},ચૂકવો {0} {1}
+DocType: Company,Sales Settings,વેચાણ સેટિંગ્સ
 DocType: Sales Order Item,Produced Quantity,ઉત્પાદિત જથ્થો
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,નીચેની લિંક પર ક્લિક કરીને અવતરણ માટેની વિનંતી ઍક્સેસ કરી શકાય છે
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણનું નામ
@@ -5218,6 +5271,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,વેચાણ અને ખરીદી માટે ડિફોલ્ટ ટેક્સ ટેમ્પલેટો બનાવવામાં આવે છે.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,છોડો પ્રકાર {0} ને આગળ ધપાવી શકાતા નથી
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,ડેબિટ એકાઉન્ટમાં પ્રાપ્ત થઈ શકે તેવું એકાઉન્ટ હોવું આવશ્યક છે
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,કરારની સમાપ્તિ તારીખ આજે કરતાં ઓછી હોઈ શકતી નથી.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},કૃપા કરીને કંપનીમાં વેરહાઉસ {0} અથવા ડિફોલ્ટ ઇન્વેન્ટરી એકાઉન્ટમાં એકાઉન્ટ સેટ કરો {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,મૂળભૂત તરીકે સેટ કરો
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),આ પેકેજનું ચોખ્ખું વજન. (વસ્તુઓના કુલ વજનના સરવાળે આપમેળે ગણાય છે)
@@ -5244,8 +5298,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,સમાપ્ત બૅચેસ
 DocType: Shipping Rule,Shipping Rule Type,શિપિંગ રૂલ પ્રકાર
 DocType: Job Offer,Accepted,સ્વીકાર્યું
-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> \ કાઢી નાખો"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,તમે આકારણી માપદંડ {} માટે પહેલાથી મૂલ્યાંકન કર્યું છે.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,બેચ નંબર પસંદ કરો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),ઉંમર (દિવસો)
@@ -5272,6 +5324,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,તમારા ડોમેન્સ પસંદ કરો
 DocType: Agriculture Task,Task Name,કાર્ય નામ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,વર્ક ઓર્ડર માટે પહેલાથી બનાવેલી સ્ટોક એન્ટ્રીઓ
+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> \ કાઢી નાખો"
 ,Amount to Deliver,પહોંચાડવા માટે રકમ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,કંપની {0} અસ્તિત્વમાં નથી
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,આપેલ વસ્તુઓ માટે લિંક કરવા માટે કોઈ બાકી સામગ્રી વિનંતીઓ મળી નથી.
@@ -5321,6 +5375,7 @@
 DocType: Lab Prescription,Test Code,ટેસ્ટ કોડ
 DocType: Purchase Taxes and Charges,On Previous Row Total,અગાઉના પંક્તિ પર કુલ
 DocType: Student,Student Email Address,વિદ્યાર્થી ઇમેઇલ સરનામું
+,Delayed Item Report,વિલંબિત આઇટમ રિપોર્ટ
 DocType: Academic Term,Education,શિક્ષણ
 DocType: Supplier Quotation,Supplier Address,સપ્લાયર સરનામું
 DocType: Salary Detail,Do not include in total,કુલ સમાવેલ નથી
@@ -5328,7 +5383,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} અસ્તિત્વમાં નથી
 DocType: Purchase Receipt Item,Rejected Quantity,નામંજૂર જથ્થો
 DocType: Cashier Closing,To TIme,ટીઆઇએમ માટે
-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: Daily Work Summary Group User,Daily Work Summary Group User,દૈનિક વર્ક સારાંશ ગ્રુપ વપરાશકર્તા
 DocType: Fiscal Year Company,Fiscal Year Company,ફિસ્કલ યર કંપની
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,વૈકલ્પિક વસ્તુ વસ્તુ કોડ તરીકે સમાન હોવી જોઈએ નહીં
@@ -5380,6 +5434,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,ડિલિવરી સ્ટોપ્સ વચ્ચે વિલંબ
 DocType: Stock Settings,Freeze Stocks Older Than [Days],સ્ટોઝ ફ્રીઝ થી વધુ [દિવસ]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,પ્રમોશનલ સ્કીમ પ્રોડક્ટ ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,ઇશ્યૂ પ્રાધાન્યતા પહેલાથી અસ્તિત્વમાં છે
 DocType: Account,Asset Received But Not Billed,સંપત્તિ પ્રાપ્ત થઈ પરંતુ બિલ નથી
 DocType: POS Closing Voucher,Total Collected Amount,કુલ એકત્રિત રકમ
 DocType: Course,Default Grading Scale,ડિફોલ્ટ ગ્રેડિંગ સ્કેલ
@@ -5421,6 +5476,7 @@
 DocType: Contract,Fulfilment Terms,પરિપૂર્ણતા શરતો
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ગ્રુપ ટુ ગ્રુપ
 DocType: Student Guardian,Mother,માતા
+DocType: Issue,Service Level Agreement Fulfilled,સેવા સ્તર કરાર પૂર્ણ
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,દાવો ન કરાયેલા કર્મચારી લાભો માટે કરવેરા
 DocType: Travel Request,Travel Funding,મુસાફરી ભંડોળ
 DocType: Shipping Rule,Fixed,સ્થિર
@@ -5450,10 +5506,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,કોઈ આઇટમ્સ મળી નથી.
 DocType: Item Attribute,From Range,શ્રેણીમાંથી
 DocType: Clinical Procedure,Consumables,ઉપભોક્તાઓ
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; અને &#39;ટાઇમસ્ટેમ્પ&#39; આવશ્યક છે.
 DocType: Purchase Taxes and Charges,Reference Row #,સંદર્ભ પંક્તિ #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},કૃપા કરીને કંપનીમાં &#39;એસેટ ડિપ્રેસીસ કોસ્ટ સેન્ટર&#39; સેટ કરો {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,પંક્તિ # {0}: ચૂકવણી દસ્તાવેજને સમાધાન પૂર્ણ કરવાની આવશ્યકતા છે
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,એમેઝોન MWS માંથી તમારા સેલ્સ ઑર્ડર ડેટાને ખેંચવા માટે આ બટનને ક્લિક કરો.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),કામના કલાકો કે જેની નીચે અડધા દિવસ ચિહ્નિત છે. (ઝીરો નિષ્ક્રિય કરવા)
 ,Assessment Plan Status,આકારણી યોજનાની સ્થિતિ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,કૃપા કરીને પહેલા {0} પસંદ કરો
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,કર્મચારીનું રેકોર્ડ બનાવવા માટે આ સબમિટ કરો
@@ -5524,6 +5582,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,સેટ ખોલો
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,ફિલ્ટર ટૉગલ કરો
 DocType: Production Plan,Material Request Detail,સામગ્રી વિનંતી વિગતવાર
+DocType: Shift Type,Process Attendance After,પ્રક્રિયા હાજરી પછી
 DocType: Material Request Item,Quantity and Warehouse,જથ્થો અને વેરહાઉસ
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,પ્રોગ્રામ્સ પર જાઓ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},પંક્તિ # {0}: સંદર્ભોમાં ડુપ્લિકેટ એન્ટ્રી {1} {2}
@@ -5581,6 +5640,7 @@
 DocType: Pricing Rule,Party Information,પાર્ટી માહિતી
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),દેવાદારો ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,કર્મચારીની રાહત તારીખ કરતાં વધુ હોઈ શકે નહીં
+DocType: Shift Type,Enable Exit Grace Period,બહાર નીકળો ગ્રેસ પીરિયડ સક્ષમ કરો
 DocType: Expense Claim,Employees Email Id,કર્મચારીનું ઇમેઇલ આઈડી
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Shopify થી ERPNext ભાવ સૂચિમાંથી અપડેટ ભાવ
 DocType: Healthcare Settings,Default Medical Code Standard,મૂળભૂત તબીબી કોડ ધોરણ
@@ -5611,7 +5671,6 @@
 DocType: Budget,Applicable on Material Request,મટીરીયલ વિનંતી પર લાગુ
 DocType: Support Settings,Search APIs,શોધ APIs
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,વેચાણ ઓર્ડર માટે ઓવરપ્રોડક્શન ટકાવારી
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,વિશિષ્ટતાઓ
 DocType: Purchase Invoice,Supplied Items,પુરવઠો આપેલ વસ્તુઓ
 DocType: Leave Control Panel,Select Employees,કર્મચારીઓ પસંદ કરો
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},લોનમાં વ્યાજ આવક ખાતા પસંદ કરો {0}
@@ -5637,7 +5696,7 @@
 ,Supplier-Wise Sales Analytics,સપ્લાયર-વાઈસ સેલ્સ ઍનલિટિક્સ
 DocType: GSTR 3B Report,February,ફેબ્રુઆરી
 DocType: Appraisal,For Employee,કર્મચારી માટે
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,વાસ્તવિક ડિલિવરી તારીખ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,વાસ્તવિક ડિલિવરી તારીખ
 DocType: Sales Partner,Sales Partner Name,વેચાણ પાર્ટનર નામ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,અવમૂલ્યન પંક્તિ {0}: અવમૂલ્યન પ્રારંભ તારીખ ભૂતકાળની તારીખ તરીકે દાખલ કરવામાં આવી છે
 DocType: GST HSN Code,Regional,પ્રાદેશિક
@@ -5676,6 +5735,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,સપ્લાયર સ્કોરકાર્ડ
 DocType: Travel Itinerary,Travel To,મુસાફરી
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,હાજરી એટેન્ડન્સ
+DocType: Shift Type,Determine Check-in and Check-out,ચેક-ઇન અને ચેક-આઉટ નક્કી કરો
 DocType: POS Closing Voucher,Difference,તફાવત
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,નાના
 DocType: Work Order Item,Work Order Item,કામ ઓર્ડર વસ્તુ
@@ -5709,6 +5769,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ડ્રગ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} બંધ છે
 DocType: Patient,Medical History,તબીબી ઇતિહાસ
+DocType: Expense Claim,Expense Taxes and Charges,ખર્ચ કર અને ચાર્જિસ
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,સબ્સ્ક્રિપ્શનને રદ કરતાં પહેલાં અથવા ભરપાઈ તરીકે સબ્સ્ક્રિપ્શનને ચિહ્નિત કર્યા પહેલાં ઇનવૉઇસ તારીખ સમાપ્ત થયાના દિવસોની સંખ્યા
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ઇન્સ્ટોલેશન નોંધ {0} પહેલેથી સબમિટ થઈ ગઈ છે
 DocType: Patient Relation,Family,કુટુંબ
@@ -5740,7 +5801,6 @@
 apps/erpnext/erpnext/config/accounting.py,Tax Withholding rates to be applied on transactions.,ટ્રાંઝેક્શન્સ પર ટેક્સ વિથોલ્ડિંગ રેટ્સ લાગુ કરવા.
 DocType: Dosage Strength,Strength,શક્તિ
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,બૅકફ્લાશ કાચો માલના પેટાકંપનીના આધારે
-DocType: Bank Guarantee,Customer,ગ્રાહક
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","જો સક્ષમ હોય, તો ક્ષેત્રની શૈક્ષણિક નોંધણી પ્રોગ્રામ નોંધણી સાધનમાં ફરજિયાત રહેશે."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","બેચ આધારિત સ્ટુડન્ટ ગ્રૂપ માટે, વિદ્યાર્થી નોંધણી પ્રોગ્રામ નોંધણીમાંથી દરેક વિદ્યાર્થી માટે માન્ય કરવામાં આવશે."
 DocType: Course,Topics,વિષયો
@@ -5820,6 +5880,7 @@
 DocType: Chapter,Chapter Members,પ્રકરણના સભ્યો
 DocType: Warranty Claim,Service Address,સેવાનું સરનામું
 DocType: Journal Entry,Remark,રીમાર્ક
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),પંક્તિ {0}: એન્ટ્રીના સમય ({2} {3} પર વેરહાઉસ {1} માં {4} માટે જથ્થો ઉપલબ્ધ નથી
 DocType: Patient Encounter,Encounter Time,એન્કાઉન્ટર સમય
 DocType: Serial No,Invoice Details,ભરતિયું વિગતો
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","જૂથો હેઠળ વધુ એકાઉન્ટ્સ બનાવી શકાય છે, પરંતુ નૉન-જૂથો સામે એન્ટ્રી કરી શકાય છે"
@@ -5898,6 +5959,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),બંધ (ખુલ્લું + કુલ)
 DocType: Supplier Scorecard Criteria,Criteria Formula,માપદંડ ફોર્મ્યુલા
 apps/erpnext/erpnext/config/support.py,Support Analytics,આધાર ઍનલિટિક્સ
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),એટેન્ડન્સ ઉપકરણ ID (બાયોમેટ્રિક / આરએફ ટૅગ ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,સમીક્ષા અને ક્રિયા
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","જો એકાઉન્ટ સ્થિર થઈ ગયું છે, તો પ્રતિબંધિત વપરાશકર્તાઓને પ્રવેશોની મંજૂરી છે."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,અવમૂલ્યન પછી રકમ
@@ -5919,6 +5981,7 @@
 DocType: Salary Slip,Loan Repayment,લોન ચુકવણી
 DocType: Employee Education,Major/Optional Subjects,મુખ્ય / વૈકલ્પિક વિષયો
 DocType: Soil Texture,Silt,સોલ્ટ
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,પુરવઠોકર્તા સરનામું અને સંપર્કો
 DocType: Bank Guarantee,Bank Guarantee Type,બેંક ગેરંટી પ્રકાર
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","જો અક્ષમ હોય, તો &#39;રૉઉન્ડ્ડ ટોટલ&#39; ફીલ્ડ કોઈપણ ટ્રાન્ઝેક્શનમાં દેખાશે નહીં"
 DocType: Pricing Rule,Min Amt,મિન એમટી
@@ -5957,6 +6020,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ખુલ્લા ઇનવોઇસ બનાવટ સાધન વસ્તુ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + એમજી) / કે
 DocType: Bank Reconciliation,Include POS Transactions,પી.ઓ.એસ. વ્યવહારો શામેલ કરો
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},આપેલ કર્મચારી ફીલ્ડ મૂલ્ય માટે કોઈ કર્મચારી મળ્યું નથી. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),રકમ પ્રાપ્ત થઈ (કંપની ચલણ)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","સ્થાનિક સ્ટોરેજ ભરાઈ ગયું છે, સાચવ્યું નથી"
 DocType: Chapter Member,Chapter Member,પ્રકરણના સભ્ય
@@ -5989,6 +6053,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,કોઈ વિદ્યાર્થી જૂથ બનાવ્યાં નથી.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},સમાન {1} સાથે ડુપ્લિકેટ પંક્તિ {0}
 DocType: Employee,Salary Details,પગારની વિગત
+DocType: Employee Checkin,Exit Grace Period Consequence,ગ્રેસ સમયગાળો બહાર નીકળો
 DocType: Bank Statement Transaction Invoice Item,Invoice,ભરતિયું
 DocType: Special Test Items,Particulars,વિશિષ્ટતાઓ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,કૃપા કરીને આઇટમ અથવા વેરહાઉસ પર આધારિત ફિલ્ટર સેટ કરો
@@ -6088,6 +6153,7 @@
 DocType: Serial No,Out of AMC,એએમસી બહાર
 DocType: Job Opening,"Job profile, qualifications required etc.","જોબ પ્રોફાઇલ, આવશ્યકતાઓ વગેરે."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,રાજ્ય માટે શિપ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,શું તમે સામગ્રી વિનંતી સબમિટ કરવા માંગો છો
 DocType: Opportunity Item,Basic Rate,મૂળભૂત દર
 DocType: Compensatory Leave Request,Work End Date,કાર્ય સમાપ્તિ તારીખ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,કાચો માલ માટે વિનંતી
@@ -6273,6 +6339,7 @@
 DocType: Sales Order Item,Gross Profit,કુલ નફો
 DocType: Quality Inspection,Item Serial No,આઇટમ સીરીયલ નં
 DocType: Asset,Insurer,વીમાદાતા
+DocType: Employee Checkin,OUT,બહાર
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,રકમ ખરીદી
 DocType: Asset Maintenance Task,Certificate Required,પ્રમાણપત્ર આવશ્યક છે
 DocType: Retention Bonus,Retention Bonus,રીટેન્શન બોનસ
@@ -6387,6 +6454,8 @@
 DocType: Invoice Discounting,Sanctioned,મંજૂર
 DocType: Course Enrollment,Course Enrollment,અભ્યાસક્રમ નોંધણી
 DocType: Item,Supplier Items,સપ્લાયર વસ્તુઓ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",{0} માટે પ્રારંભ સમય \ સમાપ્ત સમય કરતાં વધુ અથવા સમાન હોઈ શકતો નથી.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 DocType: Support Search Source,Response Options,પ્રતિભાવ વિકલ્પો
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} એ 0 અને 100 ની વચ્ચેનું મૂલ્ય હોવું જોઈએ
@@ -6473,7 +6542,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,"ચોક્કસ સંપતી, નક્કી કરેલી સંપતી"
 DocType: Purchase Order,Ref SQ,રેફ એસક્યૂ
 DocType: Salary Structure,Total Earning,કુલ કમાણી
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; પ્રદેશ
 DocType: Share Balance,From No,ના
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ચુકવણી સમાધાન ભરતિયું
 DocType: Purchase Invoice,Taxes and Charges Added,કર અને ચાર્જ ઉમેરાઈ
@@ -6581,6 +6649,7 @@
 DocType: POS Profile,Ignore Pricing Rule,પ્રાઇસીંગ નિયમ અવગણો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,ખોરાક
 DocType: Lost Reason Detail,Lost Reason Detail,ખોટો કારણ વિગતવાર
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},નીચે આપેલા ક્રમાંકની સંખ્યા બનાવવામાં આવી હતી: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,ગ્રાહક પ્રતિસાદ
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
 DocType: Issue,Opening Time,ખુલવાનો સમય
@@ -6630,6 +6699,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,કંપનીનું નામ સમાન નથી
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,પ્રમોશન તારીખ પહેલાં કર્મચારીનું પ્રમોશન સબમિટ કરી શકાતું નથી
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} કરતાં જૂના શેરના વ્યવહારોને અપડેટ કરવાની મંજૂરી નથી
+DocType: Employee Checkin,Employee Checkin,કર્મચારી ચેકિન
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},આઇટમ {0} માટે પ્રારંભ તારીખ કરતાં પ્રારંભ તારીખ ઓછી હોવી જોઈએ
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ગ્રાહક અવતરણ બનાવો
 DocType: Buying Settings,Buying Settings,ખરીદી સેટિંગ્સ
@@ -6650,6 +6720,7 @@
 DocType: Patient,Patient Demographics,દર્દી વસ્તી વિષયક
 DocType: Share Transfer,To Folio No,ફોલિયો નં
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,ઓપરેશન્સ માંથી કેશ ફ્લો
+DocType: Employee Checkin,Log Type,લૉગ પ્રકાર
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,કોઈ પણ વસ્તુમાં જથ્થા અથવા મૂલ્યમાં કોઈ ફેરફાર નથી.
 DocType: Asset,Purchase Date,ખરીદ તારીખ
@@ -6693,6 +6764,7 @@
 DocType: Vital Signs,Very Hyper,ખૂબ જ હાયપર
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,તમારા વ્યવસાયની પ્રકૃતિ પસંદ કરો.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,કૃપા કરીને મહિનો અને વર્ષ પસંદ કરો
+DocType: Service Level,Default Priority,ડિફૉલ્ટ પ્રાધાન્યતા
 DocType: Student Log,Student Log,વિદ્યાર્થી પ્રવેશ
 DocType: Shopping Cart Settings,Enable Checkout,ચેકઆઉટ સક્ષમ કરો
 apps/erpnext/erpnext/config/settings.py,Human Resources,માનવ સંસાધન
@@ -6721,7 +6793,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ERPNext સાથે Shopify ને કનેક્ટ કરો
 DocType: Homepage Section Card,Subtitle,ઉપશીર્ષક
 DocType: Soil Texture,Loam,લોમ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 DocType: BOM,Scrap Material Cost(Company Currency),સ્ક્રેપ મટીરીયલ કોસ્ટ (કંપની કરન્સી)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,ડિલિવરી નોટ {0} સબમિટ કરવી આવશ્યક નથી
 DocType: Task,Actual Start Date (via Time Sheet),વાસ્તવિક પ્રારંભ તારીખ (ટાઇમ શીટ દ્વારા)
@@ -6777,6 +6848,7 @@
 DocType: Drug Prescription,Dosage,ડોઝ
 DocType: Cheque Print Template,Starting position from top edge,ટોચની ધારથી શરૂ થતી સ્થિતિ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),નિમણૂંક અવધિ (મિનિટ)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},આ કર્મચારી પાસે પહેલાથી જ ટાઇમસ્ટેમ્પ સાથે લૉગ છે. {0}
 DocType: Accounting Dimension,Disable,અક્ષમ કરો
 DocType: Email Digest,Purchase Orders to Receive,ખરીદી ઓર્ડર પ્રાપ્ત કરવા માટે
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઉભા કરી શકાતા નથી:
@@ -6792,7 +6864,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,ઉપગ્રહ માટે સ્થાનાંતરિત સામગ્રી
 DocType: Job Card,Timing Detail,સમયનો વિગતવાર
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,આવશ્યક
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{1} નું {0} આયાત કરવું
 DocType: Job Offer Term,Job Offer Term,જોબ ઓફર ટર્મ
 DocType: SMS Center,All Contact,બધા સંપર્ક
 DocType: Project Task,Project Task,પ્રોજેક્ટ કાર્ય
@@ -6843,7 +6914,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,આઇટમ {0} સીરીયલ નંબર માટે સેટ નથી. આઇટમ માસ્ટર તપાસો
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,રાજ્ય પ્રતિ
 DocType: Leave Type,Maximum Continuous Days Applicable,મહત્તમ સતત દિવસો લાગુ
-apps/erpnext/erpnext/config/support.py,Support Team.,સપોર્ટ ટીમ.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,કૃપા કરીને પ્રથમ કંપની નામ દાખલ કરો
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,આયાત સફળ
 DocType: Guardian,Alternate Number,વૈકલ્પિક નંબર
@@ -6935,6 +7005,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,પંક્તિ # {0}: વસ્તુ ઉમેરાઈ
 DocType: Student Admission,Eligibility and Details,લાયકાત અને વિગતો
 DocType: Staffing Plan,Staffing Plan Detail,સ્ટાફિંગ પ્લાન વિગતવાર
+DocType: Shift Type,Late Entry Grace Period,લેટ એન્ટ્રી ગ્રેસ પીરિયડ
 DocType: Email Digest,Annual Income,વાર્ષિક આવક
 DocType: Journal Entry,Subscription Section,સબ્સ્ક્રિપ્શન વિભાગ
 DocType: Salary Slip,Payment Days,ચુકવણી દિવસો
@@ -6984,6 +7055,7 @@
 DocType: Journal Entry Account,Account Balance,એકાઉન્ટ બેલેન્સ
 DocType: Asset Maintenance Log,Periodicity,સમયાંતરે
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,તબીબી રેકોર્ડ
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,શિફ્ટમાં આવતા ચેક-ઇન્સ માટે લૉગ પ્રકાર આવશ્યક છે: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,અમલ
 DocType: Item,Valuation Method,મૂલ્યાંકન પદ્ધતિ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} સેલ્સ ઇનવોઇસ સામે {1}
@@ -7068,6 +7140,7 @@
 DocType: Loan Type,Loan Name,લોન નામ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,ચુકવણીના ડિફૉલ્ટ મોડને સેટ કરો
 DocType: Quality Goal,Revision,પુનરાવર્તન
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,શિફ્ટનો સમય સમાપ્ત થાય તે પહેલાંનો સમય ચેક-આઉટને પ્રારંભિક (મિનિટમાં) ગણવામાં આવે છે.
 DocType: Healthcare Service Unit,Service Unit Type,સેવા એકમ પ્રકાર
 DocType: Purchase Invoice,Return Against Purchase Invoice,ખરીદી ભરતિયું સામે વળતર
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,સિક્રેટ જનરેટ કરો
@@ -7221,12 +7294,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,પ્રસાધનો
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,જો તમે વપરાશકર્તાને બચત કરતા પહેલા સિરીઝ પસંદ કરવા દબાણ કરવા માંગતા હોવ તો આ તપાસો. જો તમે આ તપાસો તો કોઈ ડિફોલ્ટ રહેશે નહીં.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,આ ભૂમિકાવાળા વપરાશકર્તાઓને ફ્રોઝન એકાઉન્ટ્સ સેટ કરવા અને સ્થિર એકાઉન્ટ્સ સામે એકાઉન્ટિંગ એન્ટ્રીઝ બનાવવા / સંશોધિત કરવાની મંજૂરી છે
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 DocType: Expense Claim,Total Claimed Amount,કુલ દાવો કરેલ રકમ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},ઑપરેશન {0} દિવસ માટે આગામી {0} દિવસોમાં ટાઇમ સ્લોટ શોધવા માટે અસમર્થ.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,લપેટવું
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,જો તમારી સદસ્યતા 30 દિવસની અંદર સમાપ્ત થઈ જાય તો તમે ફક્ત નવીકરણ કરી શકો છો
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},મૂલ્ય {0} અને {1} ની વચ્ચે હોવું આવશ્યક છે
 DocType: Quality Feedback,Parameters,પરિમાણો
+DocType: Shift Type,Auto Attendance Settings,ઑટો એટેન્ડન્સ સેટિંગ્સ
 ,Sales Partner Transaction Summary,સેલ્સ પાર્ટનર ટ્રાંઝેક્શન સારાંશ
 DocType: Asset Maintenance,Maintenance Manager Name,જાળવણી મેનેજર નામ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,આઇટમ વિગતો મેળવવા માટે તે જરૂરી છે.
@@ -7317,10 +7392,10 @@
 DocType: Pricing Rule,Validate Applied Rule,એપ્લાઇડ રૂલ માન્ય કરો
 DocType: Job Card Item,Job Card Item,જોબ કાર્ડ આઇટમ
 DocType: Homepage,Company Tagline for website homepage,વેબસાઇટ હોમપેજ માટે કંપની ટૅગલાઇન
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,સૂચકાંક {1} પર પ્રાધાન્યતા {0} માટે પ્રતિસાદ સમય અને ઠરાવ સેટ કરો.
 DocType: Company,Round Off Cost Center,રાઉન્ડ ઑફ કોસ્ટ સેન્ટર
 DocType: Supplier Scorecard Criteria,Criteria Weight,માપદંડ વજન
 DocType: Asset,Depreciation Schedules,અવમૂલ્યન શેડ્યૂલ
-DocType: Expense Claim Detail,Claim Amount,દાવાની રકમ
 DocType: Subscription,Discounts,ડિસ્કાઉન્ટ
 DocType: Shipping Rule,Shipping Rule Conditions,શિપિંગ નિયમ શરતો
 DocType: Subscription,Cancelation Date,રદ કરવાની તારીખ
@@ -7348,7 +7423,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,શૂન્ય મૂલ્યો બતાવો
 DocType: Employee Onboarding,Employee Onboarding,કર્મચારી ઓનબોર્ડિંગ
 DocType: POS Closing Voucher,Period End Date,પીરિયડ સમાપ્તિ તારીખ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,સોર્સ દ્વારા વેચાણ તકો
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,સૂચિમાં પ્રથમ રજા એપ્રોવર ડિફોલ્ટ લીવ એપ્રોવર તરીકે સેટ કરવામાં આવશે.
 DocType: POS Settings,POS Settings,પોસ સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,બધા એકાઉન્ટ્સ
@@ -7368,7 +7442,6 @@
 apps/erpnext/erpnext/accounts/doctype/bank/bank_dashboard.py,Bank Deatils,બેંક ડેટીલ્સ
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,એચએલસી-સીપીઆર- .YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,હેલ્થકેર સર્વિસ આઈટમ્સ
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,કોઈ રેકોર્ડ મળ્યાં નથી
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,એજિંગ રેંજ 3
 DocType: Vital Signs,Blood Pressure,લોહિનુ દબાણ
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,લક્ષ્યાંક ચાલુ
@@ -7415,6 +7488,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,બેટ્સ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,સંરક્ષણ
 DocType: Item,Has Batch No,બેચ નંબર છે
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,વિલંબિત દિવસો
 DocType: Lead,Person Name,વ્યક્તિનું નામ
 DocType: Item Variant,Item Variant,આઇટમ ચલ
 DocType: Training Event Employee,Invited,આમંત્રિત
@@ -7436,7 +7510,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","પ્રારંભિક અને સમાપ્તિ તારીખો માન્ય પેરોલ અવધિમાં નથી, {0} ની ગણતરી કરી શકાતી નથી."
 DocType: POS Profile,Only show Customer of these Customer Groups,ફક્ત આ ગ્રાહક જૂથોના ગ્રાહકને બતાવો
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,ઇન્વૉઇસ સાચવવા માટે આઇટમ્સ પસંદ કરો
-DocType: Service Level,Resolution Time,ઠરાવ સમય
+DocType: Service Level Priority,Resolution Time,ઠરાવ સમય
 DocType: Grading Scale Interval,Grade Description,ગ્રેડ વર્ણન
 DocType: Homepage Section,Cards,કાર્ડ્સ
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ગુણવત્તા સભા મિનિટ
@@ -7462,6 +7536,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,સામાન્ય લેજર મુજબ બેંક સ્ટેટમેન્ટ બેલેન્સ
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),હેલ્થકેર (બીટા)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,સેલ્સ ઓર્ડર અને ડિલિવરી નોટ બનાવવાની ડિફોલ્ટ વેરહાઉસ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,અનુક્રમણિકા {0} પરનો પ્રતિભાવ સમય {0} ઠરાવ સમય કરતાં વધુ હોઈ શકતો નથી.
 DocType: Opportunity,Customer / Lead Name,ગ્રાહક / લીડ નામ
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU- .YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,દાવો ન કરેલ રકમ
@@ -7508,7 +7583,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,આયાતી પક્ષો અને સરનામાંઓ
 DocType: Item,List this Item in multiple groups on the website.,વેબસાઇટ પર બહુવિધ જૂથોમાં આ આઇટમની સૂચિ.
 DocType: Request for Quotation,Message for Supplier,સપ્લાયર માટે સંદેશ
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,આઇટમ {1} માટે સ્ટોક ટ્રાંઝેક્શન તરીકે {0} ને બદલી શકતા નથી.
 DocType: Healthcare Practitioner,Phone (R),ફોન (આર)
 DocType: Maintenance Team Member,Team Member,ટુકડી નો સભ્ય
 DocType: Asset Category Account,Asset Category Account,સંપત્તિ કેટેગરી એકાઉન્ટ
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 5b0a999..f682a8d 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,नियुक्ति {0} और बिक्री चालान {1} रद्द
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,आपका ईमेल पता...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,डिफ़ॉल्ट बुक प्रविष्टियाँ शामिल करें
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,डिफ़ॉल्ट बुक प्रविष्टियाँ शामिल करें
 DocType: Activity Cost,Activity Type,क्रिया के प्रकार
 DocType: Purchase Invoice,Get Advances Paid,एडवांस पेड लगवाओ
 DocType: Company,Gain/Loss Account on Asset Disposal,परिसंपत्ति निपटान पर लाभ / हानि खाता
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,भुगतान प्रविष्टियां
 DocType: Employee Education,Class / Percentage,कक्षा / प्रतिशत
 ,Electronic Invoice Register,इलेक्ट्रॉनिक चालान रजिस्टर
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,घटना की संख्या जिसके बाद परिणाम निष्पादित किया जाता है।
 DocType: Sales Invoice,Is Return (Credit Note),रिटर्न (क्रेडिट नोट)
+DocType: Price List,Price Not UOM Dependent,मूल्य नहीं UOM आश्रित
 DocType: Lab Test Sample,Lab Test Sample,लैब टेस्ट का नमूना
 DocType: Shopify Settings,status html,स्थिति html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","उदाहरण के लिए 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,कुल भुगतान
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,कुल चालान Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,उपभोगता अलग से चालान
+DocType: Shift Type,Working Hours Threshold for Absent,अनुपस्थित के लिए कार्य के घंटे
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM।
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},समूह खाता {0} के खिलाफ बजट नहीं सौंपा जा सकता
 DocType: Purchase Receipt Item,Rate and Amount,दर और राशि
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,रोगी सेटिंग्स से बाहर
 DocType: Asset,Insurance End Date,बीमा समाप्ति तिथि
 DocType: Bank Account,Branch Code,शाखा क्र्मांक
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,जवाब देने का समय
 apps/erpnext/erpnext/public/js/conf.js,User Forum,उपयोगकर्ता मंच
 DocType: Landed Cost Item,Landed Cost Item,लैंडेड कॉस्ट आइटम
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,विक्रेता और खरीदार समान नहीं हो सकते
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,स्थानांतरण
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),खोज आइटम (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} परिणाम उपविभाजित
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,तिथि से तिथि से अधिक नहीं हो सकती है
 DocType: Supplier,Supplier of Goods or Services.,माल या सेवाओं का आपूर्तिकर्ता।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,नए खाते का नाम। नोट: कृपया ग्राहक और आपूर्तिकर्ता के लिए खाते न बनाएँ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,छात्र समूह या पाठ्यक्रम अनुसूची अनिवार्य है
@@ -882,7 +885,6 @@
 DocType: Skill,Skill Name,कौशल का नाम
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,रिपोर्ट कार्ड प्रिंट करें
 DocType: Soil Texture,Ternary Plot,टर्नरी प्लॉट
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,समर्थन टिकट
 DocType: Asset Category Account,Fixed Asset Account,फिक्स्ड एसेट अकाउंट
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,नवीनतम
@@ -895,6 +897,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,बैलेंस शीट के लिए अनिवार्य
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त करें
+DocType: Shift Type,Last Sync of Checkin,चेकिन का अंतिम सिंक
 DocType: Student,B-,बी
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,आइटम कर राशि मूल्य में शामिल है
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -903,7 +906,9 @@
 DocType: Student,Blood Group,रक्त समूह
 apps/erpnext/erpnext/config/healthcare.py,Masters,मास्टर्स
 DocType: Crop,Crop Spacing UOM,फसल का अंतर UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,शिफ्ट शुरू होने के बाद का समय जब चेक-इन देर से (मिनटों में) माना जाता है।
 apps/erpnext/erpnext/templates/pages/home.html,Explore,अन्वेषण
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,कोई बकाया चालान नहीं मिला
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} रिक्तियां और {2} के लिए {1} बजट {3} की सहायक कंपनियों के लिए पहले से ही योजना बनाई गई है। \ _ आप केवल मूल कंपनी {5} के लिए {4} रिक्तियों और बजट {5} के लिए स्टाफिंग प्लान {6} के अनुसार योजना बना सकते हैं।
 DocType: Promotional Scheme,Product Discount Slabs,उत्पाद डिस्काउंट स्लैब
@@ -1005,6 +1010,7 @@
 DocType: Item,Moving Average,सामान्य गति
 DocType: Employee Attendance Tool,Unmarked Attendance,अचिह्नित उपस्थिति
 DocType: Homepage Section,Number of Columns,स्तंभों की संख्या
+DocType: Issue Priority,Issue Priority,मुद्दा प्राथमिकता
 DocType: Holiday List,Add Weekly Holidays,साप्ताहिक अवकाश जोड़ें
 DocType: Shopify Log,Shopify Log,शॉपिफाई लॉग
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,वेतन पर्ची बनाएँ
@@ -1013,6 +1019,7 @@
 DocType: Warranty Claim,Issue Date,जारी करने की तिथि
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आइटम {0} के लिए एक बैच चुनें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,बाएं कर्मचारियों के लिए अवधारण बोनस नहीं बनाया जा सकता
+DocType: Employee Checkin,Location / Device ID,स्थान / डिवाइस आईडी
 DocType: Purchase Order,To Receive,प्राप्त करने के लिए
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"आप ऑफ़लाइन मोड में हैं। जब तक आपके पास नेटवर्क नहीं होगा, आप पुनः लोड नहीं कर पाएंगे।"
 DocType: Course Activity,Enrollment,उपस्थिति पंजी
@@ -1021,7 +1028,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},अधिकतम: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ई-चालान सूचना गुम
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,कोई सामग्री अनुरोध नहीं बनाया गया
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Loan,Total Amount Paid,भुगतान की गई कुल राशि
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,इन सभी वस्तुओं का पहले ही चालान किया जा चुका है
 DocType: Training Event,Trainer Name,ट्रेनर का नाम
@@ -1132,6 +1138,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},कृपया लीड लीड का नाम {0} में बताएं
 DocType: Employee,You can enter any date manually,आप किसी भी तारीख को मैन्युअल रूप से दर्ज कर सकते हैं
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,स्टॉक सुलह मद
+DocType: Shift Type,Early Exit Consequence,प्रारंभिक निकास परिणाम
 DocType: Item Group,General Settings,सामान्य सेटिंग्स
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,देय तिथि पोस्टिंग / आपूर्तिकर्ता चालान तिथि से पहले नहीं हो सकती
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,सबमिट करने से पहले लाभार्थी का नाम दर्ज करें।
@@ -1170,6 +1177,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,भुगतान की पुष्टि
 ,Available Stock for Packing Items,पैकिंग आइटम के लिए उपलब्ध स्टॉक
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},कृपया इस चालान {0} को C-Form {1} से हटा दें
+DocType: Shift Type,Every Valid Check-in and Check-out,हर वैध चेक-इन और चेक-आउट
 DocType: Support Search Source,Query Route String,क्वेरी रूट स्ट्रिंग
 DocType: Customer Feedback Template,Customer Feedback Template,ग्राहक प्रतिक्रिया टेम्पलेट
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,उद्धरण या ग्राहक के लिए उद्धरण।
@@ -1204,6 +1212,7 @@
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 ,Daily Work Summary Replies,दैनिक कार्य सारांश उत्तर
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},आपको परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
+DocType: Issue,Response By Variance,वैरियन द्वारा प्रतिक्रिया
 DocType: Item,Sales Details,बिक्री विवरण
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,प्रिंट टेम्पलेट्स के लिए पत्र प्रमुख।
 DocType: Salary Detail,Tax on additional salary,अतिरिक्त वेतन पर कर
@@ -1327,6 +1336,7 @@
 DocType: Project,Task Progress,कार्य प्रगति
 DocType: Journal Entry,Opening Entry,ओपनिंग एंट्री
 DocType: Bank Guarantee,Charges Incurred,आरोप लगाए गए
+DocType: Shift Type,Working Hours Calculation Based On,कार्य के घंटे की गणना के आधार पर
 DocType: Work Order,Material Transferred for Manufacturing,विनिर्माण के लिए सामग्री हस्तांतरित
 DocType: Products Settings,Hide Variants,वेरिएंट छिपाएं
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,क्षमता योजना और समय ट्रैकिंग अक्षम करें
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,रूचियाँ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,खपत मात्रा
 DocType: Education Settings,Education Manager,शिक्षा प्रबंधक
+DocType: Employee Checkin,Shift Actual Start,वास्तविक शुरुआत शिफ्ट करें
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,वर्कस्टेशन वर्किंग ऑवर्स के बाहर प्लान टाइम लॉग।
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},वफादारी अंक: {0}
 DocType: Healthcare Settings,Registration Message,पंजीकरण संदेश
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,पहले से ही सभी बिलिंग घंटों के लिए चालान बनाया गया
 DocType: Sales Partner,Contact Desc,Desc से संपर्क करें
 DocType: Purchase Invoice,Pricing Rules,मूल्य निर्धारण नियम
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","चूंकि आइटम {0} के खिलाफ मौजूदा लेनदेन हैं, आप {1} का मूल्य नहीं बदल सकते हैं"
 DocType: Hub Tracked Item,Image List,छवि सूची
 DocType: Item Variant Settings,Allow Rename Attribute Value,नाम बदलने की अनुमति दें
-DocType: Price List,Price Not UOM Dependant,मूल्य नहीं UOM आश्रित
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),समय (मिनट में)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,बुनियादी
 DocType: Loan,Interest Income Account,ब्याज आय खाता
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POS प्रोफाइल का चयन करें
 DocType: Support Settings,Get Latest Query,नवीनतम क्वेरी प्राप्त करें
 DocType: Employee Incentive,Employee Incentive,कर्मचारी प्रोत्साहन
+DocType: Service Level,Priorities,प्राथमिकताएं
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,मुखपृष्ठ पर कार्ड या कस्टम अनुभाग जोड़ें
 DocType: Homepage,Hero Section Based On,हीरो सेक्शन पर आधारित
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद लागत (खरीद चालान के माध्यम से)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,आदेश दिया मात्रा
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: अस्वीकृत वेयरहाउस अनिवार्य है अस्वीकृत आइटम {1} के खिलाफ
 ,Received Items To Be Billed,बिल प्राप्त करने के लिए प्राप्त आइटम
-DocType: Salary Slip Timesheet,Working Hours,काम करने के घंटे
+DocType: Attendance,Working Hours,काम करने के घंटे
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,भुगतान का प्रकार
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,खरीद आदेश आइटम समय पर नहीं मिले
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,दिनों में अवधि
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,सांविधिक जानकारी और आपके आपूर्तिकर्ता के बारे में अन्य सामान्य जानकारी
 DocType: Item Default,Default Selling Cost Center,डिफॉल्ट सेलिंग कॉस्ट सेंटर
 DocType: Sales Partner,Address & Contacts,पता और संपर्क
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 DocType: Subscriber,Subscriber,ग्राहक
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# फॉर्म / आइटम / {0}) आउट ऑफ स्टॉक है
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,कृपया पोस्टिंग तिथि पहले चुनें
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,कार्य बनाए गए
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट BOM ({0}) इस आइटम या इसके टेम्पलेट के लिए सक्रिय होना चाहिए
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,आयोग दर %
-DocType: Service Level,Response Time,जवाब देने का समय
+DocType: Service Level Priority,Response Time,जवाब देने का समय
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce सेटिंग्स
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,मात्रा सकारात्मक होनी चाहिए
 DocType: Contract,CRM,सीआरएम
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,लेन-देन डेटा मानचित्रण
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,लीड के लिए किसी व्यक्ति के नाम या संगठन के नाम की आवश्यकता होती है
 DocType: Student,Guardians,रखवालों
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ब्रांड चुनें ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,मध्य आय
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},उपस्थिति रिकॉर्ड {0} छात्र के खिलाफ मौजूद है {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,लेन-देन की तारीख
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,सदस्यता रद्द
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,सेवा स्तर अनुबंध {0} सेट नहीं किया जा सका।
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,शुद्ध वेतन राशि
 DocType: Account,Liability,देयता
 DocType: Employee,Bank A/C No.,बैंक A / C No.
@@ -1701,7 +1712,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चा माल आइटम कोड
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,खरीद इनवॉइस {0} पहले से सबमिट की गई है
 DocType: Fees,Student Email,छात्र ईमेल
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM पुनरावर्तन: {0} माता-पिता या {2} का बच्चा नहीं हो सकता
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,हेल्थकेयर सेवाओं से आइटम प्राप्त करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं की गई है
 DocType: Item Attribute Value,Item Attribute Value,आइटम विशेषता मान
@@ -1726,7 +1736,6 @@
 DocType: Production Plan,Select Items to Manufacture,निर्माण के लिए आइटम का चयन करें
 DocType: Leave Application,Leave Approver Name,स्वीकृति नाम छोड़ दें
 DocType: Shareholder,Shareholder,शेयरहोल्डर
-DocType: Issue,Agreement Status,समझौते की स्थिति
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,लेनदेन बेचने के लिए डिफ़ॉल्ट सेटिंग्स।
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,कृपया छात्र प्रवेश का चयन करें जो भुगतान किए गए छात्र आवेदक के लिए अनिवार्य है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM का चयन करें
@@ -1989,6 +1998,7 @@
 DocType: Account,Income Account,आय खाता
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,सभी गोदाम
 DocType: Contract,Signee Details,सांकेतिक विवरण
+DocType: Shift Type,Allow check-out after shift end time (in minutes),शिफ्ट समाप्ति समय (मिनटों में) के बाद चेक-आउट की अनुमति दें
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,वसूली
 DocType: Item Group,Check this if you want to show in website,यदि आप वेबसाइट में दिखाना चाहते हैं तो इसे देखें
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,वित्तीय वर्ष {0} नहीं मिला
@@ -2055,6 +2065,7 @@
 DocType: Activity Cost,Billing Rate,बिलिंग दर
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},चेतावनी: स्टॉक प्रविष्टि {2} के खिलाफ एक और {0} # {1} मौजूद है
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,मार्गों का अनुमान लगाने और अनुकूलन करने के लिए कृपया Google मानचित्र सेटिंग सक्षम करें
+DocType: Purchase Invoice Item,Page Break,पृष्ठ ब्रेक
 DocType: Supplier Scorecard Criteria,Max Score,अधिकतम स्कोर
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,चुकौती प्रारंभ तिथि संवितरण तिथि से पहले नहीं हो सकती।
 DocType: Support Search Source,Support Search Source,समर्थन खोज स्रोत
@@ -2121,6 +2132,7 @@
 DocType: Employee Transfer,Employee Transfer,कर्मचारी स्थानांतरण
 ,Sales Funnel,बिक्री फ़नल
 DocType: Agriculture Analysis Criteria,Water Analysis,जल विश्लेषण
+DocType: Shift Type,Begin check-in before shift start time (in minutes),पारी शुरू होने से पहले चेक-इन शुरू करें (मिनटों में)
 DocType: Accounts Settings,Accounts Frozen Upto,जमे हुए तक खाते
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है।
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","कार्य केंद्र {1} में किसी भी उपलब्ध कार्य समय की तुलना में ऑपरेशन {0}, ऑपरेशन को कई ऑपरेशनों में तोड़ देते हैं"
@@ -2134,7 +2146,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),भुगतान में देरी (दिन)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,मूल्यह्रास विवरण दर्ज करें
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,ग्राहक पीओ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,अपेक्षित डिलीवरी की तारीख बिक्री आदेश तिथि के बाद होनी चाहिए
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,आइटम की मात्रा शून्य नहीं हो सकती
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,अमान्य विशेषता
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},कृपया आइटम {0} के खिलाफ BOM का चयन करें
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,चालान प्रकार
@@ -2144,6 +2158,7 @@
 DocType: Volunteer,Afternoon,दोपहर
 DocType: Vital Signs,Nutrition Values,पोषण मूल्य
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),बुखार की उपस्थिति (अस्थायी&gt; 38.5 ° C / 101.3 ° F या निरंतर गति&gt; 38 ° C / 100.4 °)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC उलट गया
 DocType: Project,Collect Progress,प्रगति लीजिए
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ऊर्जा
@@ -2194,6 +2209,7 @@
 ,Ordered Items To Be Billed,बिल किए जाने का आदेश दिया
 DocType: Taxable Salary Slab,To Amount,राशि के लिए
 DocType: Purchase Invoice,Is Return (Debit Note),रिटर्न (डेबिट नोट)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/config/desktop.py,Getting Started,शुरू करना
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,मर्ज
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,फिस्कल ईयर के सेव होते ही फिस्कल ईयर स्टार्ट डेट और फिस्कल ईयर एंड डेट को नहीं बदल सकते।
@@ -2212,8 +2228,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},सीरियल नंबर {0} के लिए डिलीवरी की तारीख से पहले रखरखाव शुरू करने की तारीख नहीं हो सकती
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,पंक्ति {0}: विनिमय दर अनिवार्य है
 DocType: Purchase Invoice,Select Supplier Address,प्रदायक पता चुनें
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","उपलब्ध मात्रा {0} है, आपको {1} की आवश्यकता है"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,कृपया एपीआई उपभोक्ता रहस्य दर्ज करें
 DocType: Program Enrollment Fee,Program Enrollment Fee,कार्यक्रम नामांकन शुल्क
+DocType: Employee Checkin,Shift Actual End,शिफ्ट वास्तविक अंत
 DocType: Serial No,Warranty Expiry Date,वारंटी समाप्ति की तारीख
 DocType: Hotel Room Pricing,Hotel Room Pricing,होटल का कमरा मूल्य निर्धारण
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","बाहरी कर योग्य आपूर्ति (शून्य रेटेड, शून्य रेटेड और छूट के अलावा)"
@@ -2273,6 +2291,7 @@
 DocType: Quality Inspection Reading,Reading 5,पढ़ना ५
 DocType: Shopping Cart Settings,Display Settings,प्रदर्शन सेटिंग्स
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,कृपया बुक किए गए मूल्यह्रास की संख्या निर्धारित करें
+DocType: Shift Type,Consequence after,परिणाम के बाद
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,तुम्हें किसमें मदद चाहिए?
 DocType: Journal Entry,Printing Settings,मुद्रण सेटिंग्स
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,बैंकिंग
@@ -2282,6 +2301,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,बिलिंग पता शिपिंग पते के समान है
 DocType: Account,Cash,कैश
 DocType: Employee,Leave Policy,नीति को छोड़ दें
+DocType: Shift Type,Consequence,परिणाम
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,छात्र का पता
 DocType: GST Account,CESS Account,उपकर खाता
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: लागत केंद्र &#39;लाभ और हानि&#39; खाते के लिए आवश्यक है {2}। कृपया कंपनी के लिए एक डिफ़ॉल्ट लागत केंद्र स्थापित करें।
@@ -2346,6 +2366,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,अवधि समापन वाउचर
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,संरक्षक २ नाम
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,कृपया व्यय खाता दर्ज करें
+DocType: Issue,Resolution By Variance,वारिस द्वारा संकल्प
 DocType: Employee,Resignation Letter Date,त्याग पत्र दिनांक
 DocType: Soil Texture,Sandy Clay,सैंडी क्ले
 DocType: Upload Attendance,Attendance To Date,आज तक की उपस्थिति
@@ -2358,6 +2379,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,अभी देखो
 DocType: Item Price,Valid Upto,तक वैध है
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},संदर्भ सिद्धांत {0} में से एक होना चाहिए
+DocType: Employee Checkin,Skip Auto Attendance,ऑटो अटेंडेंस छोड़ें
 DocType: Payment Request,Transaction Currency,लेनदेन मुद्रा
 DocType: Loan,Repayment Schedule,पुनः भुगतान कार्यक्रम
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,नमूना प्रतिधारण स्टॉक प्रविष्टि बनाएँ
@@ -2429,6 +2451,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,पीओएस क्लोजिंग वाउचर टैक्स
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,कार्रवाई शुरू की
 DocType: POS Profile,Applicable for Users,उपयोगकर्ताओं के लिए लागू है
+,Delayed Order Report,विलंबित आदेश रिपोर्ट
 DocType: Training Event,Exam,परीक्षा
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,सामान्य लेज़र प्रविष्टियों की गलत संख्या मिली। आपने लेनदेन में गलत खाते का चयन किया होगा।
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,बिक्री की पाईपलाइन
@@ -2443,10 +2466,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,सभी चयनित वस्तुओं पर शर्तों को लागू किया जाएगा।
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,कॉन्फ़िगर
 DocType: Hotel Room,Capacity,क्षमता
+DocType: Employee Checkin,Shift End,शिफ्ट एंड
 DocType: Installation Note Item,Installed Qty,स्थापित किया गया मात्रा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,आइटम {1} का बैच {0} अक्षम है।
 DocType: Hotel Room Reservation,Hotel Reservation User,होटल आरक्षण उपयोगकर्ता
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,कार्यदिवस दो बार दोहराया गया है
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,एंटिटी टाइप {0} और एंटिटी {1} सर्विस लेवल एग्रीमेंट पहले से मौजूद है।
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},आइटम समूह का उल्लेख आइटम मास्टर के लिए आइटम {0} में नहीं है
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},नाम त्रुटि: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,POS प्रोफाइल में क्षेत्र आवश्यक है
@@ -2493,6 +2517,7 @@
 DocType: Depreciation Schedule,Schedule Date,कार्यक्रम दिनांक
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
 DocType: Job Applicant,Job Opening,रोजगार अवसर
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,कर्मचारी चेकइन के अंतिम ज्ञात सफल सिंक। इसे तभी रीसेट करें जब आप सुनिश्चित हों कि सभी लॉग सभी स्थानों से सिंक किए गए हैं। यदि आप अनिश्चित हैं तो कृपया इसे संशोधित न करें।
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,वास्तविक लागत
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ऑर्डर {1} के विरुद्ध कुल अग्रिम ({0}) ग्रैंड टोटल ({2}) से अधिक नहीं हो सकता है
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,आइटम वेरिएंट अपडेट किया गया
@@ -2537,6 +2562,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,चालान प्राप्त करें
 DocType: Tally Migration,Is Day Book Data Imported,क्या डे बुक डेटा आयात किया गया है
 ,Sales Partners Commission,बिक्री भागीदार आयोग
+DocType: Shift Type,Enable Different Consequence for Early Exit,प्रारंभिक निकास के लिए विभिन्न परिणाम सक्षम करें
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,कानूनी
 DocType: Loan Application,Required by Date,दिनांक द्वारा आवश्यक
 DocType: Quiz Result,Quiz Result,प्रश्नोत्तरी परिणाम
@@ -2596,7 +2622,6 @@
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},वैकल्पिक अवकाश सूची {0} के लिए निर्धारित नहीं है
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,कर्मचारी रोल सेट करने के लिए कृपया एक कर्मचारी रिकॉर्ड में उपयोगकर्ता आईडी फ़ील्ड सेट करें
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,संकल्प करने का समय
 DocType: Training Event,Training Event,प्रशिक्षण कार्यक्रम
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","एक वयस्क में सामान्य आराम रक्तचाप लगभग 120 mmHg सिस्टोलिक है, और 80 mmHg डायस्टोलिक, संक्षिप्त रूप से &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"यदि सीमा मान शून्य है, तो सिस्टम सभी प्रविष्टियाँ लाएगा।"
@@ -2640,6 +2665,7 @@
 DocType: Student Applicant,Approved,मंजूर की
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},दिनांक से वित्तीय वर्ष के भीतर होना चाहिए। दिनांक = {0} से मान लिया गया
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,कृपया आपूर्तिकर्ता समूह को सेटिंग सेटिंग में सेट करें।
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} एक अमान्य उपस्थिति स्थिति है।
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,अस्थायी खाता खोलना
 DocType: Purchase Invoice,Cash/Bank Account,नकद / बैंक खाता
 DocType: Quality Meeting Table,Quality Meeting Table,गुणवत्ता बैठक की मेज
@@ -2675,6 +2701,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","खाद्य, पेय और तम्बाकू"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,पाठ्यक्रम अनुसूची
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आइटम समझदार कर विवरण
+DocType: Shift Type,Attendance will be marked automatically only after this date.,इस तिथि के बाद ही उपस्थिति को स्वचालित रूप से चिह्नित किया जाएगा।
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,यूआईएन धारकों को आपूर्ति की जाती है
 apps/erpnext/erpnext/hooks.py,Request for Quotations,कोटेशन के लिए अनुरोध
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,कुछ अन्य मुद्रा का उपयोग करके प्रविष्टियां करने के बाद मुद्रा को बदला नहीं जा सकता है
@@ -2723,7 +2750,6 @@
 DocType: Item,Is Item from Hub,हब से आइटम है
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,गुणवत्ता की प्रक्रिया।
 DocType: Share Balance,No of Shares,शेयरों की नहीं
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),पंक्ति {0}: गोदाम में {4} के लिए उपलब्ध नहीं है {1} प्रवेश के समय ({2} {3})
 DocType: Quality Action,Preventive,निवारक
 DocType: Support Settings,Forum URL,फोरम का URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,कर्मचारी और उपस्थिति
@@ -2945,7 +2971,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,डिफ़ॉल्ट कर और शुल्क
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,यह इस आपूर्तिकर्ता के खिलाफ लेनदेन पर आधारित है। विवरण के लिए नीचे समयरेखा देखें
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,समझौते के लिए प्रारंभ और समाप्ति तिथि दर्ज करें।
 DocType: Delivery Note Item,Against Sales Invoice,बिक्री चालान के खिलाफ
 DocType: Loyalty Point Entry,Purchase Amount,खरीद राशि
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,सेल्स ऑर्डर के रूप में लॉस्ट सेट नहीं किया जा सकता है।
@@ -2969,7 +2994,7 @@
 DocType: Lead,Organization Name,संस्था का नाम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,संचयी क्षेत्र के लिए मान्य और मान्य फ़ील्ड तक अनिवार्य हैं
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच संख्या {1} {2} के समान नहीं होनी चाहिए
-DocType: Employee,Leave Details,विवरण छोड़ दें
+DocType: Employee Checkin,Shift Start,प्रारंभ बदलाव
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0} से पहले स्टॉक लेनदेन जमे हुए हैं
 DocType: Driver,Issuing Date,जारी करने की तारीख
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,निवेदन कर्ता
@@ -3014,9 +3039,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,कैश फ्लो मैपिंग टेम्प्लेट विवरण
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,भर्ती और प्रशिक्षण
 DocType: Drug Prescription,Interval UOM,अंतराल UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,ऑटो अटेंडेंस के लिए ग्रेस पीरियड सेटिंग्स
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,मुद्रा और मुद्रा से समान नहीं हो सकते
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,फार्मास्यूटिकल्स
 DocType: Employee,HR-EMP-,मानव संसाधन-EMP-
+DocType: Service Level,Support Hours,समर्थन घंटे
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} रद्द या बंद है
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम क्रेडिट होना चाहिए
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),वाउचर द्वारा समूह (समेकित)
@@ -3126,6 +3153,7 @@
 DocType: Territory,Territory Manager,क्षेत्र प्रबंधक
 DocType: Lab Test,Sample ID,नमूना आईडी
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,कार्ट खाली है
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,उपस्थिति को कर्मचारी चेक-इन के अनुसार चिह्नित किया गया है
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,एसेट {0} सबमिट करना होगा
 ,Absent Student Report,अनुपस्थित छात्र की रिपोर्ट
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,सकल लाभ में शामिल
@@ -3133,7 +3161,9 @@
 DocType: Travel Request Costing,Funded Amount,धन राशि
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} प्रस्तुत नहीं किया गया है, इसलिए कार्रवाई पूरी नहीं की जा सकती है"
 DocType: Subscription,Trial Period End Date,ट्रायल अवधि समाप्ति तिथि
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,एक ही पारी के दौरान IN और OUT जैसी वैकल्पिक प्रविष्टियाँ
 DocType: BOM Update Tool,The new BOM after replacement,प्रतिस्थापन के बाद नया बीओएम
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,आइटम 5
 DocType: Employee,Passport Number,पासपोर्ट संख्या
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,अस्थायी उद्घाटन
@@ -3249,6 +3279,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,संभव आपूर्तिकर्ता
 ,Issued Items Against Work Order,वर्क ऑर्डर के खिलाफ जारी किए गए आइटम
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} चालान बनाना
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 DocType: Student,Joining Date,कार्यग्रहण तिथि
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,अनुरोध स्थल
 DocType: Purchase Invoice,Against Expense Account,व्यय खाते के खिलाफ
@@ -3288,6 +3319,7 @@
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्क
 ,Point of Sale,बिक्री केन्द्र
 DocType: Authorization Rule,Approving User  (above authorized value),उपयोक्ता को अनुमोदन (अधिकृत मूल्य से ऊपर)
+DocType: Service Level Agreement,Entity,सत्ता
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} {2} से {3} में स्थानांतरित की गई
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,पार्टी के नाम से
@@ -3334,6 +3366,7 @@
 DocType: Soil Texture,Sand Composition (%),रेत संरचना (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-पीपी-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,इम्पोर्ट डे बुक डेटा
+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} के लिए नामकरण श्रृंखला निर्धारित करें
 DocType: Asset,Asset Owner Company,एसेट ओनर कंपनी
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,लागत केंद्र को एक व्यय दावा बुक करने के लिए आवश्यक है
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} आइटम {1} के लिए वैध सीरियल नग
@@ -3392,7 +3425,6 @@
 DocType: Asset,Asset Owner,मालिक का मालिक
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},वेयरहाउस स्टॉक के लिए अनिवार्य है आइटम {0} पंक्ति में {1}
 DocType: Stock Entry,Total Additional Costs,कुल अतिरिक्त लागत
-DocType: Marketplace Settings,Last Sync On,अंतिम सिंक पर
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,कृपया कर और शुल्क तालिका में कम से कम एक पंक्ति निर्धारित करें
 DocType: Asset Maintenance Team,Maintenance Team Name,रखरखाव टीम का नाम
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,लागत केंद्रों का चार्ट
@@ -3408,12 +3440,12 @@
 DocType: Job Card,WIP Warehouse,WIP वेयरहाउस
 DocType: Payment Request,ACC-PRQ-.YYYY.-,एसीसी-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},उपयोगकर्ता आईडी कर्मचारी {0} के लिए सेट नहीं है
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","उपलब्ध मात्रा {0} है, आपको {1} की आवश्यकता है"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,उपयोगकर्ता {0} बनाया गया
 DocType: Stock Settings,Item Naming By,आइटम नामकरण द्वारा
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,आदेश दिया
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और इसे संपादित नहीं किया जा सकता है।
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,सामग्री अनुरोध {0} को रद्द या रोक दिया गया है
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,कर्मचारी चेकइन में लॉग प्रकार पर आधारित सख्ती
 DocType: Purchase Order Item Supplied,Supplied Qty,आपूर्ति की गई मात्रा
 DocType: Cash Flow Mapper,Cash Flow Mapper,कैश फ्लो मैपर
 DocType: Soil Texture,Sand,रेत
@@ -3472,6 +3504,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,आइटम समूह तालिका में पाया गया डुप्लिकेट आइटम समूह
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,वार्षिक वेतन
 DocType: Supplier Scorecard,Weighting Function,भारोत्तोलन समारोह
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,मापदंड सूत्र का मूल्यांकन करने में त्रुटि
 ,Lab Test Report,लैब टेस्ट रिपोर्ट
 DocType: BOM,With Operations,संचालन के साथ
@@ -3485,6 +3518,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,जर्नल एंट्री के लिए कोई पुनर्भुगतान उपलब्ध नहीं है
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} निष्क्रिय छात्र है
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,स्टॉक एंट्री करें
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM पुनरावर्तन: {0} माता-पिता या {1} का बच्चा नहीं हो सकता
 DocType: Employee Onboarding,Activities,क्रियाएँ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,कम से कम एक गोदाम अनिवार्य है
 ,Customer Credit Balance,ग्राहक क्रेडिट शेष
@@ -3497,9 +3531,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,एकाधिक वफादारी कार्यक्रम ग्राहक के लिए मिला। कृपया मैन्युअल रूप से चयन करें।
 DocType: Patient,Medication,इलाज
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,वफादारी कार्यक्रम का चयन करें
+DocType: Employee Checkin,Attendance Marked,उपस्थिति चिह्नित की गई
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,कच्चा माल
 DocType: Sales Order,Fully Billed,पूरी तरह से बिल दिया
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},कृपया {} पर होटल के कमरे की दर निर्धारित करें
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,डिफ़ॉल्ट के रूप में केवल एक प्राथमिकता का चयन करें।
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},कृपया प्रकार के लिए खाता (लेजर) की पहचान / निर्माण - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,कुल क्रेडिट / डेबिट राशि लिंक्ड जर्नल एंट्री के समान होनी चाहिए
 DocType: Purchase Invoice Item,Is Fixed Asset,निश्चित संपत्ति है
@@ -3520,6 +3556,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,अपॅइंटमेंट की पुष्टि
 DocType: Shopping Cart Settings,Orders,आदेश
 DocType: HR Settings,Retirement Age,सेवानिवृत्ति आयु
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,अनुमानित मात्रा
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},देश के लिए विचलन की अनुमति नहीं है {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},रो # {0}: एसेट {1} पहले से ही {2} है
@@ -3603,11 +3640,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,मुनीम
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},पीओएस क्लोजिंग वाउचर अल्डरेड {0} के लिए दिनांक {1} और {2} के बीच मौजूद है
 apps/erpnext/erpnext/config/help.py,Navigating,नेविगेट करना
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,किसी भी बकाया चालान में विनिमय दर के पुनर्मूल्यांकन की आवश्यकता नहीं होती है
 DocType: Authorization Rule,Customer / Item Name,ग्राहक / मद का नाम
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नए सीरियल नंबर में वेयरहाउस नहीं हो सकता है। वेयरहाउस को स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Issue,Via Customer Portal,ग्राहक पोर्टल
 DocType: Work Order Operation,Planned Start Time,योजना प्रारंभ समय
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} है {२}
+DocType: Service Level Priority,Service Level Priority,सेवा स्तर की प्राथमिकता
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,मूल्यह्रास की बुक की गई संख्या कुल मूल्यह्रास से अधिक नहीं हो सकती है
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,शेयर लेजर
 DocType: Journal Entry,Accounts Payable,देय खाते
@@ -3718,7 +3757,6 @@
 DocType: Delivery Note,Delivery To,वितरण के लिए
 DocType: Bank Statement Transaction Settings Item,Bank Data,बैंक डेटा
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,अनुसूचित तक
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Timesheet पर बिलिंग घंटे और कार्य समय समान रखें
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,लीड सोर्स द्वारा ट्रैक लीड्स।
 DocType: Clinical Procedure,Nursing User,नर्सिंग उपयोगकर्ता
 DocType: Support Settings,Response Key List,प्रतिक्रिया कुंजी सूची
@@ -3886,6 +3924,7 @@
 DocType: Work Order Operation,Actual Start Time,वास्तविक प्रारंभ समय
 DocType: Antibiotic,Laboratory User,प्रयोगशाला उपयोगकर्ता
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,ऑनलाइन नीलामी
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,प्राथमिकता {0} दोहराई गई है।
 DocType: Fee Schedule,Fee Creation Status,शुल्क सृजन की स्थिति
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,सॉफ्टवेयर्स
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,भुगतान के लिए बिक्री आदेश
@@ -3952,6 +3991,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} के लिए जानकारी पुनर्प्राप्त नहीं की जा सकी।
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट कंपनी की मुद्रा या पार्टी खाता मुद्रा के बराबर होनी चाहिए
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,कृपया इस विक्रय व्यक्ति का कर्मचारी क्रमांक दर्ज करें
+DocType: Shift Type,Early Exit Consequence after,प्रारंभिक निकास परिणाम के बाद
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,ओपनिंग सेल्स और परचेज इनवॉइस बनाएं
 DocType: Disease,Treatment Period,उपचार की अवधि
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ईमेल सेट करना
@@ -3969,7 +4009,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,छात्र का नाम:
 DocType: SMS Log,Sent On,पर भेजा गया
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,बिक्री चालान
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,रिस्पॉन्स टाइम रेसोल्यूशन टाइम से अधिक नहीं हो सकता
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","कोर्स आधारित छात्र समूह के लिए, कार्यक्रम नामांकन में नामांकित पाठ्यक्रम से प्रत्येक छात्र के लिए पाठ्यक्रम को मान्य किया जाएगा।"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,इंट्रा-स्टेट आपूर्ति
 DocType: Employee,Create User Permission,उपयोगकर्ता अनुमति बनाएँ
@@ -4008,6 +4047,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,बिक्री या खरीद के लिए मानक अनुबंध शर्तें।
 DocType: Sales Invoice,Customer PO Details,ग्राहक पीओ विवरण
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,रोगी नहीं मिला
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,एक डिफ़ॉल्ट प्राथमिकता चुनें।
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"यदि आइटम उस आइटम पर लागू नहीं है, तो आइटम निकालें"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक समूह एक ही नाम के साथ मौजूद है कृपया ग्राहक का नाम बदलें या ग्राहक समूह का नाम बदलें
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4047,6 +4087,7 @@
 DocType: Support Settings,Support Portal,समर्थन पोर्टल
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,कार्य की अंतिम तिथि <b>{0}</b> से कम नहीं हो सकती है <b>{1}</b> अपेक्षित आरंभ तिथि <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},कर्मचारी {0} छुट्टी पर है {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},यह सेवा स्तर समझौता ग्राहक {0} के लिए विशिष्ट है
 DocType: Employee,Held On,पर आयोजित
 DocType: Healthcare Practitioner,Practitioner Schedules,प्रैक्टिशनर शेड्यूल
 DocType: Project Template Task,Begin On (Days),पर शुरू (दिन)
@@ -4054,6 +4095,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},वर्क ऑर्डर {0} किया गया है
 DocType: Inpatient Record,Admission Schedule Date,एडमिशन शेड्यूल डेट
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,एसेट वैल्यू एडजस्टमेंट
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,इस शिफ्ट के लिए नियुक्त कर्मचारियों के लिए &#39;कर्मचारी जाँचकर्ता&#39; के आधार पर मार्क की उपस्थिति
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,अपंजीकृत व्यक्तियों को की गई आपूर्ति
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,सारी नौकरियां
 DocType: Appointment Type,Appointment Type,नियुक्ति प्रकार
@@ -4167,7 +4209,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज का सकल वजन। आमतौर पर शुद्ध वजन + पैकेजिंग सामग्री वजन। (प्रिंट के लिए)
 DocType: Plant Analysis,Laboratory Testing Datetime,प्रयोगशाला परीक्षण डेटाटाइम
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,आइटम {0} में बैच नहीं हो सकता है
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,स्टेज द्वारा बिक्री पाइपलाइन
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,छात्र समूह की ताकत
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,बैंक स्टेटमेंट ट्रांजेक्शन एंट्री
 DocType: Purchase Order,Get Items from Open Material Requests,ओपन मटेरियल रिक्वेस्ट से आइटम प्राप्त करें
@@ -4249,7 +4290,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,एजिंग वेयरहाउस-वार दिखाएं
 DocType: Sales Invoice,Write Off Outstanding Amount,बकाया राशि लिखें
 DocType: Payroll Entry,Employee Details,कर्मचारी विवरण
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,प्रारंभ समय {0} के लिए समाप्ति समय से अधिक नहीं हो सकता है।
 DocType: Pricing Rule,Discount Amount,छूट राशि
 DocType: Healthcare Service Unit Type,Item Details,आइटम विवरण
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},अवधि {1} के लिए {0} की डुप्लीकेट कर घोषणा
@@ -4302,7 +4342,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,नेट पे नेगेटिव नहीं हो सकता
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,कोई सहभागिता नहीं
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},पंक्ति {0} # आइटम {1} खरीद आदेश {3} के खिलाफ {2} से अधिक हस्तांतरित नहीं किया जा सकता है
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,खिसक जाना
+DocType: Attendance,Shift,खिसक जाना
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,लेखा और दलों का प्रसंस्करण चार्ट
 DocType: Stock Settings,Convert Item Description to Clean HTML,कन्वर्ट आइटम विवरण HTML को साफ करने के लिए
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,सभी आपूर्तिकर्ता समूह
@@ -4373,6 +4413,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,जनक सेवा इकाई
 DocType: Sales Invoice,Include Payment (POS),भुगतान (पीओएस) शामिल करें
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,निजी इक्विटी
+DocType: Shift Type,First Check-in and Last Check-out,पहला चेक-इन और अंतिम चेक-आउट
 DocType: Landed Cost Item,Receipt Document,रसीद दस्तावेज़
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,आपूर्तिकर्ता स्कोरकार्ड अवधि
 DocType: Employee Grade,Default Salary Structure,डिफ़ॉल्ट वेतन संरचना
@@ -4455,6 +4496,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,क्रय आदेश बनाएँ
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,एक वित्तीय वर्ष के लिए बजट को परिभाषित करें।
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,लेखा तालिका रिक्त नहीं हो सकती।
+DocType: Employee Checkin,Entry Grace Period Consequence,प्रवेश काल अवधि परिणाम
 ,Payment Period Based On Invoice Date,भुगतान की अवधि चालान तिथि के आधार पर
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},स्थापना दिनांक आइटम {0} के लिए डिलीवरी की तारीख से पहले नहीं हो सकती
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,सामग्री अनुरोध के लिए लिंक
@@ -4463,6 +4505,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: इस गोदाम के लिए पहले से ही मौजूद एक रिकॉर्डर प्रविष्टि {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,डॉक्टर तिथि
 DocType: Monthly Distribution,Distribution Name,वितरण नाम
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,कार्यदिवस {0} दोहराया गया है।
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,ग्रुप टू नॉन ग्रुप
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,अपडेट जारी है। इसमें समय लग सकता है।
 DocType: Item,"Example: ABCD.#####
@@ -4475,6 +4518,7 @@
 DocType: Vehicle Log,Fuel Qty,ईंधन मात्रा
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,गार्जियन 1 मोबाइल नं
 DocType: Invoice Discounting,Disbursed,संवितरित
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,पारी की समाप्ति के बाद का समय जिसके दौरान चेक-आउट को उपस्थिति के लिए माना जाता है।
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,देय खातों में शुद्ध परिवर्तन
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,उपलब्ध नहीं है
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,पार्ट टाईम
@@ -4488,7 +4532,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,प्रिंट में पीडीसी दिखाएं
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify प्रदायक
 DocType: POS Profile User,POS Profile User,पीओएस प्रोफ़ाइल उपयोगकर्ता
-DocType: Student,Middle Name,मध्य नाम
 DocType: Sales Person,Sales Person Name,बिक्री व्यक्ति का नाम
 DocType: Packing Slip,Gross Weight,कुल भार
 DocType: Journal Entry,Bill No,बिल नहीं
@@ -4497,7 +4540,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,मानव संसाधन-vlog-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,सेवा स्तर समझौता
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,कृपया पहले कर्मचारी और तिथि चुनें
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,वस्तु मूल्यांकन दर को भूमि की लागत वाले वाउचर राशि पर विचार करके पुनर्गणना की जाती है
 DocType: Timesheet,Employee Detail,कर्मचारी विस्तार से
 DocType: Tally Migration,Vouchers,वाउचर
@@ -4532,7 +4574,7 @@
 DocType: Additional Salary,Date on which this component is applied,वह दिनांक जिस पर यह घटक लागू होता है
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,उपलब्ध शेयरहोल्डर्स की सूची फोलियो संख्या के साथ
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,गेटवे खाते सेट करें।
-DocType: Service Level,Response Time Period,प्रतिक्रिया समय अवधि
+DocType: Service Level Priority,Response Time Period,प्रतिक्रिया समय अवधि
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
 DocType: Course Activity,Activity Date,गतिविधि दिनांक
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,नए ग्राहक का चयन करें या जोड़ें
@@ -4557,6 +4599,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,वित्तीय वर्ष
 DocType: Sales Invoice Item,Deferred Revenue,आस्थगित राजस्व
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,कम से कम एक बेचना या खरीदना का चयन करना चाहिए
+DocType: Shift Type,Working Hours Threshold for Half Day,हाफ डे के लिए वर्किंग ऑवर्स थ्रेसहोल्ड
 ,Item-wise Purchase History,आइटम-वार खरीद इतिहास
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},पंक्ति {0} में आइटम के लिए सेवा रोक दिनांक नहीं बदल सकते
 DocType: Production Plan,Include Subcontracted Items,उपमहाद्वीप आइटम शामिल करें
@@ -4589,6 +4632,7 @@
 DocType: BOM,Allow Same Item Multiple Times,एक ही आइटम एकाधिक टाइम्स की अनुमति दें
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOM बनाएँ
 DocType: Healthcare Practitioner,Charges,प्रभार
+DocType: Employee,Attendance and Leave Details,उपस्थिति और विवरण छोड़ें
 DocType: Student,Personal Details,व्यक्तिगत विवरण
 DocType: Sales Order,Billing and Delivery Status,बिलिंग और वितरण की स्थिति
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,पंक्ति {0}: आपूर्तिकर्ता के लिए {0} ईमेल पता ईमेल भेजने के लिए आवश्यक है
@@ -4640,7 +4684,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},मान betweeen {0} और {1} दर्ज करें
 DocType: Purchase Order,Order Confirmation Date,आदेश की पुष्टि की तारीख
 DocType: Delivery Trip,Calculate Estimated Arrival Times,अनुमानित आगमन टाइम्स की गणना करें
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,उपभोज्य
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-आईएनएस-.YYYY.-
 DocType: Subscription,Subscription Start Date,सदस्यता प्रारंभ दिनांक
@@ -4663,7 +4706,7 @@
 DocType: Journal Entry Account,Journal Entry Account,जर्नल एंट्री अकाउंट
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,प्रकार
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,फोरम गतिविधि
-DocType: Service Level,Resolution Time Period,संकल्प समय अवधि
+DocType: Service Level Priority,Resolution Time Period,संकल्प समय अवधि
 DocType: Request for Quotation,Supplier Detail,आपूर्तिकर्ता विस्तार
 DocType: Project Task,View Task,टास्क देखें
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
@@ -4730,6 +4773,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,वेयरहाउस को केवल स्टॉक एंट्री / डिलीवरी नोट / खरीद रसीद के माध्यम से बदला जा सकता है
 DocType: Support Settings,Close Issue After Days,दिनों के बाद समस्या बंद करें
 DocType: Payment Schedule,Payment Schedule,भुगतान अनुसूची
+DocType: Shift Type,Enable Entry Grace Period,प्रवेश अनुग्रह अवधि सक्षम करें
 DocType: Patient Relation,Spouse,पति या पत्नी
 DocType: Purchase Invoice,Reason For Putting On Hold,धारण करने का कारण
 DocType: Item Attribute,Increment,वेतन वृद्धि
@@ -4869,6 +4913,7 @@
 DocType: Vehicle Log,Invoice Ref,चालान रेफरी
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},चालान के लिए सी-फॉर्म लागू नहीं है: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,चालान बनाया गया
+DocType: Shift Type,Early Exit Grace Period,प्रारंभिक निकास अनुग्रह अवधि
 DocType: Patient Encounter,Review Details,विवरण की समीक्षा करें
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे का मान शून्य से अधिक होना चाहिए।
 DocType: Account,Account Number,खाता संख्या
@@ -4880,7 +4925,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","लागू अगर कंपनी SpA, SApA या SRL है"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,इसके बीच पाई जाने वाली ओवरलैपिंग की स्थिति:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,भुगतान किया और वितरित नहीं किया गया
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,आइटम कोड अनिवार्य है क्योंकि आइटम स्वचालित रूप से क्रमांकित नहीं है
 DocType: GST HSN Code,HSN Code,HSN कोड
 DocType: GSTR 3B Report,September,सितंबर
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,प्रशासनिक व्यय
@@ -4916,6 +4960,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,सीडब्ल्यूआईपी खाता
 DocType: SMS Log,Sender Name,भेजने वाले का नाम
 DocType: Pricing Rule,Supplier Group,आपूर्तिकर्ता समूह
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",अनुक्रमणिका {1} पर प्रारंभ समय और अंत समय \ समर्थन दिवस {0} के लिए सेट करें।
 DocType: Employee,Date of Issue,जारी करने की तारिख
 ,Requested Items To Be Transferred,हस्तांतरित होने के लिए आवश्यक वस्तुएँ
 DocType: Employee,Contract End Date,अनुबंध की अंतिम तिथि
@@ -4926,6 +4972,7 @@
 DocType: Opportunity,Sales Stage,बिक्री चरण
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,एक बार जब आप विक्रय आदेश सहेज लेंगे तो शब्द दिखाई देंगे।
 DocType: Item Reorder,Re-order Level,स्तर पुनः क्रमित करें
+DocType: Shift Type,Enable Auto Attendance,ऑटो अटेंडेंस सक्षम करें
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,पसंद
 ,Department Analytics,विभाग विश्लेषिकी
 DocType: Crop,Scientific Name,वैज्ञानिक नाम
@@ -4938,6 +4985,7 @@
 DocType: Quiz Activity,Quiz Activity,प्रश्नोत्तरी गतिविधि
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} वैध पेरोल अवधि में नहीं है
 DocType: Timesheet,Billed,बिल भेजा गया
+apps/erpnext/erpnext/config/support.py,Issue Type.,समस्या का प्रकार।
 DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम बिक्री चालान
 DocType: Payment Terms Template,Payment Terms,भुगतान की शर्तें
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","आरक्षित मात्रा: बिक्री के लिए मात्रा का आदेश दिया गया, लेकिन वितरित नहीं किया गया।"
@@ -5033,6 +5081,7 @@
 DocType: Account,Asset,एसेट
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} में हेल्थकेयर प्रैक्टिशनर शेड्यूल नहीं है। इसे हेल्थकेयर प्रैक्टिशनर मास्टर में जोड़ें
 DocType: Vehicle,Chassis No,चास्सिस संख्या
+DocType: Employee,Default Shift,डिफ़ॉल्ट शिफ्ट
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,कंपनी संक्षिप्त
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,सामग्री के बिल का पेड़
 DocType: Article,LMS User,एलएमएस उपयोगकर्ता
@@ -5081,6 +5130,7 @@
 DocType: Sales Person,Parent Sales Person,जनक बिक्री व्यक्ति
 DocType: Student Group Creation Tool,Get Courses,पाठ्यक्रम प्राप्त करें
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा 1 होनी चाहिए, क्योंकि आइटम एक निश्चित संपत्ति है। कृपया एकाधिक मात्रा के लिए अलग पंक्ति का उपयोग करें।"
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),अनुपस्थित के नीचे काम के घंटे चिह्नित हैं। (निष्क्रिय करने के लिए शून्य)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,लेन-देन में केवल पत्ती नोड्स की अनुमति है
 DocType: Grant Application,Organization,संगठन
 DocType: Fee Category,Fee Category,शुल्क श्रेणी
@@ -5093,6 +5143,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,कृपया इस प्रशिक्षण कार्यक्रम के लिए अपनी स्थिति अपडेट करें
 DocType: Volunteer,Morning,सुबह
 DocType: Quotation Item,Quotation Item,उद्धरण आइटम
+apps/erpnext/erpnext/config/support.py,Issue Priority.,मुद्दा प्राथमिकता।
 DocType: Journal Entry,Credit Card Entry,क्रेडिट कार्ड से प्रवेश
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","समय स्लॉट को छोड़ दिया गया, स्लॉट {0} से {1} ओवरलैपिंग स्लॉट स्लॉट {2} से {3}"
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
@@ -5143,11 +5194,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,डेटा आयात और सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","यदि ऑटो ऑप्ट इन की जाँच की जाती है, तो ग्राहक संबंधित लॉयल्टी प्रोग्राम (सेव पर) से स्वतः जुड़ जाएंगे।"
 DocType: Account,Expense Account,खर्च का हिसाब
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,पारी शुरू होने से पहले का समय जिसके दौरान कर्मचारी चेक-इन उपस्थिति के लिए माना जाता है।
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,गार्जियन 1 के साथ संबंध
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,इनवॉयस बनाएँ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},भुगतान अनुरोध पहले से मौजूद है {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0} पर राहत देने वाले कर्मचारी को &#39;वाम&#39; के रूप में सेट किया जाना चाहिए
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},वेतन {0} {1}
+DocType: Company,Sales Settings,बिक्री सेटिंग्स
 DocType: Sales Order Item,Produced Quantity,उत्पादित मात्रा
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,निम्नलिखित लिंक पर क्लिक करके उद्धरण के लिए अनुरोध तक पहुँचा जा सकता है
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
@@ -5226,6 +5279,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,बिक्री और खरीद के लिए डिफ़ॉल्ट कर टेम्पलेट बनाए जाते हैं।
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,टाइप टाइप {0} को आगे नहीं बढ़ाया जा सकता है
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,डेबिट टू अकाउंट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,अनुबंध की अंतिम तिथि आज से कम नहीं हो सकती।
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},कृपया गोदाम में खाता सेट करें {0} या कंपनी में डिफ़ॉल्ट इन्वेंट्री खाता {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,डिफाल्ट के रूप में सेट
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),इस पैकेज का शुद्ध वजन। (वस्तुओं के शुद्ध वजन के योग के रूप में स्वचालित रूप से गणना)
@@ -5252,8 +5306,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,एक्सपायरी बैच
 DocType: Shipping Rule,Shipping Rule Type,शिपिंग नियम प्रकार
 DocType: Job Offer,Accepted,स्वीकार किए जाते हैं
-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> \ _ हटाएं"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,आप पहले से ही मूल्यांकन मानदंड {} के लिए मूल्यांकन कर चुके हैं।
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,बैच नंबर चुनें
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),आयु (दिन)
@@ -5279,6 +5331,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,अपने डोमेन का चयन करें
 DocType: Agriculture Task,Task Name,कार्य का नाम
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,स्टॉक एंट्री पहले से ही वर्क ऑर्डर के लिए बनाई गई हैं
+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> \ _ हटाएं"
 ,Amount to Deliver,वितरित करने के लिए राशि
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,कंपनी {0} मौजूद नहीं है
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,दिए गए मदों के लिए लिंक करने के लिए कोई भी लंबित सामग्री अनुरोध नहीं मिला।
@@ -5328,6 +5382,7 @@
 DocType: Lab Prescription,Test Code,टेस्ट कोड
 DocType: Purchase Taxes and Charges,On Previous Row Total,पिछले रो कुल पर
 DocType: Student,Student Email Address,छात्र ईमेल पता
+,Delayed Item Report,देरी से आई रिपोर्ट
 DocType: Academic Term,Education,शिक्षा
 DocType: Supplier Quotation,Supplier Address,आपूर्तिकर्ता पता
 DocType: Salary Detail,Do not include in total,कुल में शामिल न करें
@@ -5335,7 +5390,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} मौजूद नहीं है
 DocType: Purchase Receipt Item,Rejected Quantity,अस्वीकृत मात्रा
 DocType: Cashier Closing,To TIme,समय पर
-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: Daily Work Summary Group User,Daily Work Summary Group User,दैनिक कार्य सारांश समूह उपयोगकर्ता
 DocType: Fiscal Year Company,Fiscal Year Company,फिस्कल ईयर कंपनी
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,वैकल्पिक आइटम आइटम कोड के समान नहीं होना चाहिए
@@ -5387,6 +5441,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,डिलीवरी स्टॉप के बीच देरी
 DocType: Stock Settings,Freeze Stocks Older Than [Days],फ्रीज स्टॉक्स पुराने दिनों से [दिन]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,प्रचार योजना उत्पाद छूट
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,मुद्दा प्राथमिकता पहले से ही मौजूद है
 DocType: Account,Asset Received But Not Billed,एसेट प्राप्त हुआ लेकिन बिल नहीं दिया गया
 DocType: POS Closing Voucher,Total Collected Amount,कुल एकत्रित राशि
 DocType: Course,Default Grading Scale,डिफ़ॉल्ट ग्रेडिंग स्केल
@@ -5428,6 +5483,7 @@
 DocType: Contract,Fulfilment Terms,पूर्ति की शर्तें
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,नॉन-ग्रुप टू ग्रुप
 DocType: Student Guardian,Mother,मां
+DocType: Issue,Service Level Agreement Fulfilled,सेवा स्तर का समझौता पूरा हुआ
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,लावारिस कर्मचारी लाभों के लिए डिडक्ट टैक्स
 DocType: Travel Request,Travel Funding,यात्रा निधि
 DocType: Shipping Rule,Fixed,स्थिर
@@ -5457,10 +5513,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,कुछ नहीं मिला।
 DocType: Item Attribute,From Range,रेंज से
 DocType: Clinical Procedure,Consumables,उपभोग्य
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;कर्मचारी_फील्ड_वल्यू&#39; और &#39;टाइमस्टैम्प&#39; आवश्यक हैं।
 DocType: Purchase Taxes and Charges,Reference Row #,संदर्भ पंक्ति #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी {0} में &#39;एसेट डेप्रिसिएशन कॉस्ट सेंटर&#39; सेट करें।
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,रो # {0}: ट्रैस्लेशन को पूरा करने के लिए भुगतान दस्तावेज़ की आवश्यकता होती है
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Amazon MWS से अपने विक्रय आदेश डेटा को खींचने के लिए इस बटन पर क्लिक करें।
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),आधे घंटे के नीचे काम के घंटे चिह्नित हैं। (निष्क्रिय करने के लिए शून्य)
 ,Assessment Plan Status,मूल्यांकन योजना की स्थिति
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,कृपया पहले {0} का चयन करें
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,कर्मचारी रिकॉर्ड बनाने के लिए इसे सबमिट करें
@@ -5531,6 +5589,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,ओपन सेट करें
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,टॉगल फिल्टर
 DocType: Production Plan,Material Request Detail,सामग्री अनुरोध विस्तार
+DocType: Shift Type,Process Attendance After,प्रक्रिया उपस्थिति के बाद
 DocType: Material Request Item,Quantity and Warehouse,मात्रा और गोदाम
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,प्रोग्राम पर जाएं
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},पंक्ति # {0}: संदर्भों में डुप्लिकेट प्रविष्टि {1} {2}
@@ -5588,6 +5647,7 @@
 DocType: Pricing Rule,Party Information,पार्टी की जानकारी
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),देनदार ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,तिथि करने के लिए कर्मचारी की राहत की तारीख से अधिक नहीं हो सकता है
+DocType: Shift Type,Enable Exit Grace Period,अनुग्रह अवधि से बाहर निकलें
 DocType: Expense Claim,Employees Email Id,कर्मचारी ईमेल आईडी
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Shopify से ERPNext Price List में अपडेट मूल्य
 DocType: Healthcare Settings,Default Medical Code Standard,डिफ़ॉल्ट चिकित्सा कोड मानक
@@ -5618,7 +5678,6 @@
 DocType: Budget,Applicable on Material Request,सामग्री अनुरोध पर लागू
 DocType: Support Settings,Search APIs,एपीआई खोजें
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,बिक्री आदेश के लिए ओवरप्रोडक्शन प्रतिशत
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,विशेष विवरण
 DocType: Purchase Invoice,Supplied Items,आपूर्ति की गई वस्तु
 DocType: Leave Control Panel,Select Employees,कर्मचारियों का चयन करें
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},ऋण में ब्याज आय खाते का चयन करें {0}
@@ -5644,7 +5703,7 @@
 ,Supplier-Wise Sales Analytics,आपूर्तिकर्ता-समझदार बिक्री विश्लेषिकी
 DocType: GSTR 3B Report,February,फरवरी
 DocType: Appraisal,For Employee,कर्मचारी के लिए
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,वास्तविक वितरण तिथि
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,वास्तविक वितरण तिथि
 DocType: Sales Partner,Sales Partner Name,सेल्स पार्टनर का नाम
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,मूल्यह्रास पंक्ति {0}: मूल्यह्रास प्रारंभ तिथि पिछली तिथि के रूप में दर्ज की गई है
 DocType: GST HSN Code,Regional,क्षेत्रीय
@@ -5683,6 +5742,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,आपूर्तिकर्ता स्कोरकार्ड
 DocType: Travel Itinerary,Travel To,को यात्रा
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,मार्क अटेंडेंस
+DocType: Shift Type,Determine Check-in and Check-out,चेक-इन और चेक-आउट का निर्धारण करें
 DocType: POS Closing Voucher,Difference,अंतर
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,छोटा
 DocType: Work Order Item,Work Order Item,वर्क ऑर्डर आइटम
@@ -5716,6 +5776,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,दवा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} बंद है
 DocType: Patient,Medical History,चिकित्सा का इतिहास
+DocType: Expense Claim,Expense Taxes and Charges,व्यय कर और शुल्क
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,सदस्यता रद्द करने या सदस्यता को अवैतनिक के रूप में चिह्नित करने से पहले चालान तिथि समाप्त होने के कुछ दिनों के बाद
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,स्थापना नोट {0} पहले ही सबमिट किया जा चुका है
 DocType: Patient Relation,Family,परिवार
@@ -5747,7 +5808,6 @@
 apps/erpnext/erpnext/config/accounting.py,Tax Withholding rates to be applied on transactions.,लेनदेन पर लगाए जाने वाले कर की रोक।
 DocType: Dosage Strength,Strength,शक्ति
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,उप-आधार के बैकफ्लश रॉ मटेरियल पर आधारित
-DocType: Bank Guarantee,Customer,ग्राहक
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","यदि सक्षम है, तो क्षेत्र शैक्षणिक शब्द प्रोग्राम एनरोलमेंट टूल में अनिवार्य होगा।"
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","बैच आधारित छात्र समूह के लिए, छात्र नामांकन कार्यक्रम नामांकन से प्रत्येक छात्र के लिए मान्य होगा।"
 DocType: Course,Topics,विषय
@@ -5907,6 +5967,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),समापन (उद्घाटन + कुल)
 DocType: Supplier Scorecard Criteria,Criteria Formula,मानदंड सूत्र
 apps/erpnext/erpnext/config/support.py,Support Analytics,एनालिटिक्स का समर्थन करें
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),उपस्थिति डिवाइस आईडी (बॉयोमीट्रिक / आरएफ टैग आईडी)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,समीक्षा और कार्रवाई
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","यदि खाता जमे हुए है, तो प्रविष्टियों को प्रतिबंधित उपयोगकर्ताओं को अनुमति दी जाती है।"
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,मूल्यह्रास के बाद की राशि
@@ -5928,6 +5989,7 @@
 DocType: Salary Slip,Loan Repayment,ऋण भुगतान
 DocType: Employee Education,Major/Optional Subjects,प्रमुख / वैकल्पिक विषय
 DocType: Soil Texture,Silt,गाद
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,आपूर्तिकर्ता पते और संपर्क
 DocType: Bank Guarantee,Bank Guarantee Type,बैंक गारंटी प्रकार
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","यदि अक्षम किया गया है, तो &#39;राउंडेड टोटल&#39; फ़ील्ड किसी भी लेनदेन में दिखाई नहीं देगा"
 DocType: Pricing Rule,Min Amt,मिन एमटी
@@ -5966,6 +6028,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,उद्घाटन निर्माण उपकरण आइटम
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए मिलीग्राम +) / कश्मीर
 DocType: Bank Reconciliation,Include POS Transactions,पीओएस लेनदेन शामिल करें
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},दिए गए कर्मचारी फ़ील्ड मान के लिए कोई कर्मचारी नहीं मिला। &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त राशि (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","लोकलस्टोरेज भरा हुआ है, बचा नहीं"
 DocType: Chapter Member,Chapter Member,अध्याय सदस्य
@@ -5998,6 +6061,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,कोई छात्र समूह नहीं बनाया गया।
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},एक ही {1} के साथ डुप्लीकेट पंक्ति {0}
 DocType: Employee,Salary Details,वेतन विवरण
+DocType: Employee Checkin,Exit Grace Period Consequence,ग्रेस अवधि परिणाम से बाहर निकलें
 DocType: Bank Statement Transaction Invoice Item,Invoice,बीजक
 DocType: Special Test Items,Particulars,विवरण
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,कृपया आइटम या वेयरहाउस के आधार पर फ़िल्टर सेट करें
@@ -6099,6 +6163,7 @@
 DocType: Serial No,Out of AMC,एएमसी से बाहर
 DocType: Job Opening,"Job profile, qualifications required etc.","जॉब प्रोफाइल, आवश्यक योग्यता आदि।"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,शिप टू स्टेट
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,क्या आप सामग्री अनुरोध सबमिट करना चाहते हैं
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: Compensatory Leave Request,Work End Date,कार्य समाप्ति तिथि
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,कच्चे माल के लिए अनुरोध
@@ -6282,6 +6347,7 @@
 DocType: Sales Order Item,Gross Profit,सकल लाभ
 DocType: Quality Inspection,Item Serial No,आइटम सीरियल नं
 DocType: Asset,Insurer,बीमा कंपनी
+DocType: Employee Checkin,OUT,बाहर
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,खरीद राशि
 DocType: Asset Maintenance Task,Certificate Required,प्रमाणपत्र आवश्यक है
 DocType: Retention Bonus,Retention Bonus,अवधारण अभिलाभ
@@ -6396,6 +6462,8 @@
 DocType: Invoice Discounting,Sanctioned,स्वीकृत
 DocType: Course Enrollment,Course Enrollment,पाठ्यक्रम नामांकन
 DocType: Item,Supplier Items,आपूर्तिकर्ता आइटम
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",प्रारंभ समय {0} के लिए एंड टाइम \ _ से अधिक या बराबर नहीं हो सकता।
 DocType: Sales Order,Not Applicable,लागू नहीं
 DocType: Support Search Source,Response Options,प्रतिक्रिया विकल्प
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} 0 और 100 के बीच का मान होना चाहिए
@@ -6482,7 +6550,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,अचल सम्पत्ति
 DocType: Purchase Order,Ref SQ,रेफरी एसक्यू
 DocType: Salary Structure,Total Earning,कुल कमाई
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Share Balance,From No,से नहीं
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,भुगतान सुलह चालान
 DocType: Purchase Invoice,Taxes and Charges Added,कर और शुल्क जोड़ा गया
@@ -6590,6 +6657,7 @@
 DocType: POS Profile,Ignore Pricing Rule,मूल्य निर्धारण नियम पर ध्यान न दें
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,भोजन
 DocType: Lost Reason Detail,Lost Reason Detail,खोया कारण विस्तार से
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},निम्नलिखित सीरियल नंबर बनाए गए थे: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,उपभोक्ता की राय
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
 DocType: Issue,Opening Time,खुलने का समय
@@ -6639,6 +6707,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,कंपनी का नाम ही नहीं
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,पदोन्नति तिथि से पहले कर्मचारी पदोन्नति प्रस्तुत नहीं की जा सकती
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} से पुराने स्टॉक लेनदेन को अपडेट करने की अनुमति नहीं है
+DocType: Employee Checkin,Employee Checkin,कर्मचारी चेकइन
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},प्रारंभ दिनांक आइटम {0} के लिए अंतिम तिथि से कम होनी चाहिए
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ग्राहक उद्धरण बनाएँ
 DocType: Buying Settings,Buying Settings,सेटिंग खरीदना
@@ -6660,6 +6729,7 @@
 DocType: Patient,Patient Demographics,रोगी जनसांख्यिकी
 DocType: Share Transfer,To Folio No,फोलियो नं
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,संचालन से नकदी प्रवाह
+DocType: Employee Checkin,Log Type,लॉग प्रकार
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,किसी भी वस्तु में मात्रा या मूल्य में कोई परिवर्तन नहीं होता है।
 DocType: Asset,Purchase Date,खरीद की तारीख
@@ -6704,6 +6774,7 @@
 DocType: Vital Signs,Very Hyper,बहुत हाइपर है
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,अपने व्यवसाय की प्रकृति का चयन करें।
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,कृपया महीने और वर्ष का चयन करें
+DocType: Service Level,Default Priority,डिफ़ॉल्ट प्राथमिकता
 DocType: Student Log,Student Log,छात्र लॉग
 DocType: Shopping Cart Settings,Enable Checkout,चेकआउट सक्षम करें
 apps/erpnext/erpnext/config/settings.py,Human Resources,मानव संसाधन
@@ -6732,7 +6803,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Shopify को ERPNext से कनेक्ट करें
 DocType: Homepage Section Card,Subtitle,उपशीर्षक
 DocType: Soil Texture,Loam,चिकनी बलुई मिट्टी
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 DocType: BOM,Scrap Material Cost(Company Currency),स्क्रैप सामग्री लागत (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,डिलीवरी नोट {0} प्रस्तुत नहीं किया जाना चाहिए
 DocType: Task,Actual Start Date (via Time Sheet),वास्तविक प्रारंभ तिथि (टाइम शीट के माध्यम से)
@@ -6788,6 +6858,7 @@
 DocType: Drug Prescription,Dosage,मात्रा बनाने की विधि
 DocType: Cheque Print Template,Starting position from top edge,शीर्ष किनारे से स्थिति शुरू करना
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),नियुक्ति अवधि (मिनट)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},इस कर्मचारी के पास पहले से ही समान टाइमस्टैम्प है। {0}
 DocType: Accounting Dimension,Disable,अक्षम
 DocType: Email Digest,Purchase Orders to Receive,खरीद आदेश प्राप्त करने के लिए
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,प्रस्तुतियों के लिए आदेश नहीं उठाए जा सकते हैं:
@@ -6803,7 +6874,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,सब-कॉन्ट्रैक्ट के लिए ट्रांसफर की गई सामग्री
 DocType: Job Card,Timing Detail,समय सारिणी
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,आवश्यक है
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} का {0} आयात करना
 DocType: Job Offer Term,Job Offer Term,नौकरी की पेशकश अवधि
 DocType: SMS Center,All Contact,सभी संपर्क करें
 DocType: Project Task,Project Task,प्रोजेक्ट टास्क
@@ -6854,7 +6924,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,आइटम {0} सीरियल नग के लिए सेटअप नहीं है। आइटम मास्टर की जाँच करें
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,राज्य से
 DocType: Leave Type,Maximum Continuous Days Applicable,अधिकतम निरंतर दिन लागू
-apps/erpnext/erpnext/config/support.py,Support Team.,टीम का समर्थन।
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,कृपया पहले कंपनी का नाम दर्ज करें
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,आयात सफल
 DocType: Guardian,Alternate Number,वैकल्पिक नंबर
@@ -6946,6 +7015,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,पंक्ति # {0}: आइटम जोड़ा गया
 DocType: Student Admission,Eligibility and Details,पात्रता और विवरण
 DocType: Staffing Plan,Staffing Plan Detail,स्टाफिंग योजना विस्तार
+DocType: Shift Type,Late Entry Grace Period,देर से प्रवेश अनुग्रह अवधि
 DocType: Email Digest,Annual Income,वार्षिक आय
 DocType: Journal Entry,Subscription Section,सदस्यता अनुभाग
 DocType: Salary Slip,Payment Days,भुगतान के दिन
@@ -6996,6 +7066,7 @@
 DocType: Journal Entry Account,Account Balance,खाते में शेष
 DocType: Asset Maintenance Log,Periodicity,दौरा
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,मेडिकल रिकॉर्ड
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,शिफ्ट में गिरने वाले चेक-इन के लिए लॉग टाइप आवश्यक है: {0}।
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,क्रियान्वयन
 DocType: Item,Valuation Method,मूल्यांकन विधि
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
@@ -7080,6 +7151,7 @@
 DocType: Loan Type,Loan Name,ऋण का नाम
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,भुगतान का डिफ़ॉल्ट मोड सेट करें
 DocType: Quality Goal,Revision,संशोधन
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,पारी समाप्त होने से पहले का समय जब चेक-आउट को शुरुआती (मिनटों में) माना जाता है।
 DocType: Healthcare Service Unit,Service Unit Type,सेवा इकाई प्रकार
 DocType: Purchase Invoice,Return Against Purchase Invoice,खरीद चालान के खिलाफ लौटें
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,गुप्त उत्पन्न करें
@@ -7235,12 +7307,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,प्रसाधन सामग्री
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,यदि आप सहेजने से पहले किसी श्रृंखला का चयन करने के लिए उपयोगकर्ता को बाध्य करना चाहते हैं तो यह जांचें। इसे चेक करने पर कोई डिफॉल्ट नहीं होगा।
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका वाले उपयोगकर्ताओं को जमे हुए खातों को सेट करने और जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को बनाने / संशोधित करने की अनुमति है
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Expense Claim,Total Claimed Amount,कुल दावा राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन {1} के लिए अगले {0} दिनों में समय स्लॉट खोजने में असमर्थ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,समेट रहा हु
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,आप केवल तभी नवीनीकरण कर सकते हैं जब आपकी सदस्यता 30 दिनों के भीतर समाप्त हो जाए
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},मान {0} और {1} के बीच होना चाहिए
 DocType: Quality Feedback,Parameters,पैरामीटर
+DocType: Shift Type,Auto Attendance Settings,ऑटो उपस्थिति सेटिंग्स
 ,Sales Partner Transaction Summary,बिक्री भागीदार लेनदेन सारांश
 DocType: Asset Maintenance,Maintenance Manager Name,रखरखाव प्रबंधक का नाम
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,यह आइटम विवरण लाने के लिए आवश्यक है।
@@ -7332,10 +7406,10 @@
 DocType: Pricing Rule,Validate Applied Rule,मान्य नियम लागू
 DocType: Job Card Item,Job Card Item,जॉब कार्ड मद
 DocType: Homepage,Company Tagline for website homepage,वेबसाइट होमपेज के लिए कंपनी टैगलाइन
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,इंडेक्स {1} पर प्रायोरिटी {0} के लिए रिस्पॉन्स टाइम और रेजोल्यूशन सेट करें।
 DocType: Company,Round Off Cost Center,राउंड ऑफ कॉस्ट सेंटर
 DocType: Supplier Scorecard Criteria,Criteria Weight,मानदंड
 DocType: Asset,Depreciation Schedules,मूल्यह्रास अनुसूचियां
-DocType: Expense Claim Detail,Claim Amount,दावा राशि
 DocType: Subscription,Discounts,छूट
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम
 DocType: Subscription,Cancelation Date,रद्द करने की तारीख
@@ -7363,7 +7437,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,शून्य मान दिखाएं
 DocType: Employee Onboarding,Employee Onboarding,कर्मचारी जहाज पर
 DocType: POS Closing Voucher,Period End Date,अवधि समाप्ति तिथि
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,स्रोत द्वारा बिक्री के अवसर
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,सूची में पहला अवकाश अनुमोदन डिफ़ॉल्ट अवकाश अनुमोदन के रूप में सेट किया जाएगा।
 DocType: POS Settings,POS Settings,पीओएस सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,सभी खाते हैं
@@ -7384,7 +7457,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,पंक्ति # {0}: दर {1}: {2} ({3} / {4}) के समान होनी चाहिए
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,उच्च स्तरीय समिति-सीपीआर-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,हेल्थकेयर सेवा आइटम
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,कोई रिकॉर्ड नहीं मिला
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,आयु सीमा 3
 DocType: Vital Signs,Blood Pressure,रक्त चाप
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,लक्ष्य पर
@@ -7431,6 +7503,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,बैचों
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,रक्षा
 DocType: Item,Has Batch No,बैच नं
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,विलंबित दिन
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Item Variant,Item Variant,आइटम वेरिएंट
 DocType: Training Event Employee,Invited,आमंत्रित
@@ -7452,7 +7525,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","मान्य पेरोल अवधि में प्रारंभ और समाप्ति तिथियां, {0} की गणना नहीं कर सकती हैं।"
 DocType: POS Profile,Only show Customer of these Customer Groups,केवल इन ग्राहक समूहों के ग्राहक दिखाएं
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,चालान को बचाने के लिए आइटम का चयन करें
-DocType: Service Level,Resolution Time,संकल्प समय
+DocType: Service Level Priority,Resolution Time,संकल्प समय
 DocType: Grading Scale Interval,Grade Description,ग्रेड विवरण
 DocType: Homepage Section,Cards,पत्ते
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,गुणवत्ता बैठक मिनट
@@ -7479,6 +7552,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,सामान्य लेज़र के अनुसार बैंक स्टेटमेंट शेष
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),हेल्थकेयर (बीटा)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,बिक्री आदेश और वितरण नोट बनाने के लिए डिफ़ॉल्ट वेयरहाउस
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,अनुक्रमणिका {1} पर {0} का रिस्पॉन्स टाइम रेसोल्यूशन टाइम से अधिक नहीं हो सकता है।
 DocType: Opportunity,Customer / Lead Name,ग्राहक / लीड नाम
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,लावारिस राशि
@@ -7525,7 +7599,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,आयात पार्टियों और पते
 DocType: Item,List this Item in multiple groups on the website.,इस आइटम को वेबसाइट पर कई समूहों में सूचीबद्ध करें।
 DocType: Request for Quotation,Message for Supplier,आपूर्तिकर्ता के लिए संदेश
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,आइटम {1} के लिए स्टॉक लेन-देन के रूप में {0} बदल नहीं सकते।
 DocType: Healthcare Practitioner,Phone (R),फ़ोन (R)
 DocType: Maintenance Team Member,Team Member,टीम के सदस्य
 DocType: Asset Category Account,Asset Category Account,एसेट श्रेणी खाता
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 09bb2ff..dfca07e 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Sastanak {0} i dostavnica-faktura {1} otkazana
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Vaša email adresa...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Uključi zadane unose u knjigu
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Uključi zadane unose u knjigu
 DocType: Activity Cost,Activity Type,Vrsta aktivnosti
 DocType: Purchase Invoice,Get Advances Paid,Plaćeni predujmi
 DocType: Company,Gain/Loss Account on Asset Disposal,Račun dobiti / gubitka na raspolaganju
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Unosi za plaćanje
 DocType: Employee Education,Class / Percentage,Klasa / postotak
 ,Electronic Invoice Register,Elektronički registar računa
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Broj pojavljivanja nakon kojega je posljedica izvršena.
 DocType: Sales Invoice,Is Return (Credit Note),Je li povrat (kreditna napomena)
+DocType: Price List,Price Not UOM Dependent,Cijena nije UOM Zavisna
 DocType: Lab Test Sample,Lab Test Sample,Uzorak laboratorijskog ispitivanja
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Za npr. 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Neto plaća
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Ukupni fakturirani amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Potrošna roba Faktura odvojeno
+DocType: Shift Type,Working Hours Threshold for Absent,Prag rada za odsutan
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti grupi računa {0}
 DocType: Purchase Receipt Item,Rate and Amount,Stopa i iznos
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Postavke bolesnika
 DocType: Asset,Insurance End Date,Datum završetka osiguranja
 DocType: Bank Account,Branch Code,Kôd podružnice
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Vrijeme za odgovor
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Korisnički forum
 DocType: Landed Cost Item,Landed Cost Item,Stavka selenog troška
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Prodavatelj i kupac ne mogu biti isti
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Prijenos
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Stavka pretraživanja (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Rezultat je poslan
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od datuma ne može biti veći od datuma Do
 DocType: Supplier,Supplier of Goods or Services.,Dobavljač robe ili usluga.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naziv novog računa. Napomena: nemojte stvarati račune za klijente i dobavljače
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentska grupa ili raspored tečaja je obavezan
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Naziv vještine
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Ispis izvješćne kartice
 DocType: Soil Texture,Ternary Plot,Trostruka parcela
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Podesite serije Naming za {0} putem postavke&gt; Postavke&gt; Serije imenovanja
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Ulaznice za podršku
 DocType: Asset Category Account,Fixed Asset Account,Račun fiksnih sredstava
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Najnoviji
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obvezno za bilancu
 DocType: Payment Entry,Total Allocated Amount,Ukupni dodijeljeni iznos
 DocType: Sales Invoice,Get Advances Received,Primite primljene predujmove
+DocType: Shift Type,Last Sync of Checkin,Zadnja sinkronizacija prijave
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Iznos poreza uključen u vrijednost
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Krvna grupa
 apps/erpnext/erpnext/config/healthcare.py,Masters,majstori
 DocType: Crop,Crop Spacing UOM,Izrezivanje razmaka UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Vrijeme nakon početka smjene, kada se prijava smatra zakašnjelom (u minutama)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Istražiti
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Nisu pronađene nepodmirene dostavnice
 DocType: Promotional Scheme,Product Discount Slabs,Ploče s popustom za proizvode
 DocType: Hotel Room Package,Amenities,Sadržaji
 DocType: Lab Test Groups,Add Test,Dodaj test
@@ -1004,6 +1009,7 @@
 DocType: Item,Moving Average,Pokretna prosječna brzina
 DocType: Employee Attendance Tool,Unmarked Attendance,Neoznačena nazočnost
 DocType: Homepage Section,Number of Columns,Broj stupaca
+DocType: Issue Priority,Issue Priority,Prioritet problema
 DocType: Holiday List,Add Weekly Holidays,Dodajte tjedne praznike
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Napravite popunjavanje plaća
@@ -1012,6 +1018,7 @@
 DocType: Warranty Claim,Issue Date,Datum izdavanja
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći niti jedan paket koji ispunjava ovaj zahtjev
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Bonus za zadržavanje za preostale zaposlenike nije moguće izraditi
+DocType: Employee Checkin,Location / Device ID,ID lokacije / uređaja
 DocType: Purchase Order,To Receive,Primiti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Nalazite se u izvanmrežnom načinu rada. Nećete se moći ponovno učitati dok ne dobijete mrežu.
 DocType: Course Activity,Enrollment,Upis
@@ -1020,7 +1027,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maks.: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informacije o e-fakturiranju nedostaju
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nije napravljen nikakav zahtjev za materijal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Šifra artikla&gt; Grupa proizvoda&gt; Marka
 DocType: Loan,Total Amount Paid,Ukupno plaćeni iznos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Sve su te stavke već fakturirane
 DocType: Training Event,Trainer Name,Ime trenera
@@ -1131,6 +1137,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Navedite ime olova u olovu {0}
 DocType: Employee,You can enter any date manually,Možete unijeti bilo koji datum ručno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stavka pomirenja dionica
+DocType: Shift Type,Early Exit Consequence,Posljedica ranog izlaza
 DocType: Item Group,General Settings,Opće postavke
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Datum dospijeća ne može biti prije knjiženja / datuma fakture dobavljača
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Unesite ime Korisnika prije slanja.
@@ -1169,6 +1176,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Potvrda uplate
 ,Available Stock for Packing Items,Raspoloživa zaliha za pakiranje predmeta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Uklonite ovaj račun {0} iz C-obrasca {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Svaka valjana prijava i odjava
 DocType: Support Search Source,Query Route String,Niz upita za rutu
 DocType: Customer Feedback Template,Customer Feedback Template,Predložak za povratne informacije klijenta
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citati za voditelje ili klijente.
@@ -1203,6 +1211,7 @@
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 ,Daily Work Summary Replies,Svakodnevni radni sažetak odgovora
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Pozvani ste na suradnju na projektu: {0}
+DocType: Issue,Response By Variance,Odziv po varijansi
 DocType: Item,Sales Details,Pojedinosti o prodaji
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Glave slova za predloške za ispis.
 DocType: Salary Detail,Tax on additional salary,Porez na dodatnu plaću
@@ -1326,6 +1335,7 @@
 DocType: Project,Task Progress,Napredak zadatka
 DocType: Journal Entry,Opening Entry,Otvaranje unosa
 DocType: Bank Guarantee,Charges Incurred,Naplaćene pristojbe
+DocType: Shift Type,Working Hours Calculation Based On,Izračun radnog vremena na temelju
 DocType: Work Order,Material Transferred for Manufacturing,Materijal prenesen za proizvodnju
 DocType: Products Settings,Hide Variants,Sakrij varijante
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Onemogući planiranje kapaciteta i praćenje vremena
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,interesi
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Potrošena količina
 DocType: Education Settings,Education Manager,Upravitelj obrazovanja
+DocType: Employee Checkin,Shift Actual Start,Pomakni stvarni početak
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planiranje dnevnika vremena izvan radnog vremena radne stanice.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Bodovi lojalnosti: {0}
 DocType: Healthcare Settings,Registration Message,Poruka registracije
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Faktura je već izrađena za sve sate naplate
 DocType: Sales Partner,Contact Desc,Kontaktirajte nas
 DocType: Purchase Invoice,Pricing Rules,Pravila određivanja cijena
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Budući da postoje stavke s stavkom {0}, ne možete promijeniti vrijednost {1}"
 DocType: Hub Tracked Item,Image List,Popis slika
 DocType: Item Variant Settings,Allow Rename Attribute Value,Dopusti promjenu vrijednosti atributa
-DocType: Price List,Price Not UOM Dependant,Cijena nije UOM Zavisna
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Vrijeme (u min)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,"Osnovni, temeljni"
 DocType: Loan,Interest Income Account,Račun prihoda od kamata
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Odaberite POS profil
 DocType: Support Settings,Get Latest Query,Nabavite najnovije upite
 DocType: Employee Incentive,Employee Incentive,Poticaj zaposlenika
+DocType: Service Level,Priorities,prioriteti
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Dodajte kartice ili prilagođene odjeljke na početnu stranicu
 DocType: Homepage,Hero Section Based On,Hero Section na temelju
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupni trošak kupnje (putem dostavnice)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Naručena količina
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijena skladišta obavezna su za odbijenu stavku {1}
 ,Received Items To Be Billed,Primljene stavke za naplatu
-DocType: Salary Slip Timesheet,Working Hours,Radni sati
+DocType: Attendance,Working Hours,Radni sati
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Način plaćanja
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Stavke narudžbenice nisu primljene na vrijeme
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Trajanje u danima
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Zakonske informacije i ostale opće informacije o Vašem Dobavljaču
 DocType: Item Default,Default Selling Cost Center,Zadano mjesto troška prodaje
 DocType: Sales Partner,Address & Contacts,Adresa i kontakti
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite nizove brojeva za nazočnost putem postavke&gt; Brojčane serije
 DocType: Subscriber,Subscriber,Pretplatnik
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) nema na skladištu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Prvo odaberite Datum knjiženja
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,Poslovi su izrađeni
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Zadana sastavnica ({0}) mora biti aktivna za ovu stavku ili njezin predložak
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Stopa provizije%
-DocType: Service Level,Response Time,Vrijeme odziva
+DocType: Service Level Priority,Response Time,Vrijeme odziva
 DocType: Woocommerce Settings,Woocommerce Settings,Postavke Woocommercea
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Količina mora biti pozitivna
 DocType: Contract,CRM,CRM
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Mapiranje podataka o transakcijama
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Olovo zahtijeva ili ime osobe ili ime organizacije
 DocType: Student,Guardians,čuvari
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u obrazovanju&gt; Postavke obrazovanja
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Odaberite robnu marku ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Srednji dohodak
 DocType: Shipping Rule,Calculate Based On,Izračunajte na temelju
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Zapis o prisustvu {0} postoji protiv studenta {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Datum transakcije
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Otkaži pretplatu
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Nije moguće postaviti ugovor o razini usluge {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Neto iznos plaće
 DocType: Account,Liability,Odgovornost
 DocType: Employee,Bank A/C No.,Bankarski A / C broj
@@ -1701,7 +1712,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Šifra stavke sirovine
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Faktura kupovine {0} već je poslana
 DocType: Fees,Student Email,Studentska e-pošta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Rekurzija sastavnica: {0} ne može biti roditelj ili dijete od {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Nabavite artikle iz zdravstvenih usluga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Unos dionica {0} nije poslan
 DocType: Item Attribute Value,Item Attribute Value,Vrijednost atributa stavke
@@ -1726,7 +1736,6 @@
 DocType: Production Plan,Select Items to Manufacture,Odaberite stavke za izradu
 DocType: Leave Application,Leave Approver Name,Ostavite ime ovlaštenika
 DocType: Shareholder,Shareholder,dioničar
-DocType: Issue,Agreement Status,Status sporazuma
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Zadane postavke za transakcije prodaje.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Molimo odaberite Prijem studenata koji je obvezan za plaćenog studenta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Odaberite BOM
@@ -1989,6 +1998,7 @@
 DocType: Account,Income Account,Račun prihoda
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Svi skladišta
 DocType: Contract,Signee Details,Pojedinosti o znaku
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Dopusti odjavu nakon završetka smjene (u minutama)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,nabavka
 DocType: Item Group,Check this if you want to show in website,Označite ovo ako želite prikazati na web-lokaciji
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiskalna godina {0} nije pronađena
@@ -2055,6 +2065,7 @@
 DocType: Activity Cost,Billing Rate,Stopa naplate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Upozorenje: postoji još {0} # {1} protiv stavke zaliha {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Omogućite Google Maps Settings za procjenu i optimizaciju ruta
+DocType: Purchase Invoice Item,Page Break,Prijelom stranice
 DocType: Supplier Scorecard Criteria,Max Score,Najveći broj bodova
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Datum početka otplate ne može biti prije datuma isplate.
 DocType: Support Search Source,Support Search Source,Podrška za izvor pretraživanja
@@ -2123,6 +2134,7 @@
 DocType: Employee Transfer,Employee Transfer,Prijenos zaposlenika
 ,Sales Funnel,Tok za prodaju
 DocType: Agriculture Analysis Criteria,Water Analysis,Analiza vode
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Započnite prijavu prije početka smjene (u minutama)
 DocType: Accounts Settings,Accounts Frozen Upto,Računi zamrznuti do
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Nema ništa za uređivanje.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dulja od svih raspoloživih radnih sati na radnoj stanici {1}, razbiti operaciju u više operacija"
@@ -2136,7 +2148,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Prodajni nalog {0} je {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Odgoda plaćanja (Dani)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Unesite detalje amortizacije
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Korisnička PO
 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 prodajnog naloga
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Količina stavke ne može biti nula
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Nevažeći atribut
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Odaberite BOM u odnosu na stavku {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Vrsta dostavnice
@@ -2146,6 +2160,7 @@
 DocType: Volunteer,Afternoon,Poslijepodne
 DocType: Vital Signs,Nutrition Values,Vrijednosti prehrane
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Prisutnost vrućice (temp&gt; 38,5 ° C / 101,3 ° F ili produžena temp&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u ljudskim resursima&gt; Postavke ljudskih resursa
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC obrnuto
 DocType: Project,Collect Progress,Prikupi napredak
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,energija
@@ -2196,6 +2211,7 @@
 ,Ordered Items To Be Billed,Naručene stavke za naplatu
 DocType: Taxable Salary Slab,To Amount,Na iznos
 DocType: Purchase Invoice,Is Return (Debit Note),Je li povrat (zaduženje)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička grupa&gt; Teritorij
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Početak rada
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sjediniti
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Nije moguće promijeniti datum početka fiskalne godine i datum završetka fiskalne godine nakon spremanja fiskalne godine.
@@ -2214,8 +2230,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Datum početka održavanja ne može biti prije datuma isporuke za serijski broj {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Redak {0}: Tečaj je obvezan
 DocType: Purchase Invoice,Select Supplier Address,Odaberite adresu dobavljača
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Dostupna količina je {0}, trebate {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Unesite tajnu API-ja za API
 DocType: Program Enrollment Fee,Program Enrollment Fee,Naknada za upis programa
+DocType: Employee Checkin,Shift Actual End,Pomakni stvarni kraj
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Hotel Room Pricing,Hotel Room Pricing,Cijene hotelskih soba
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Vanjski oporezivi isporuke (osim nultih, nulti i izuzeti)"
@@ -2275,6 +2293,7 @@
 DocType: Quality Inspection Reading,Reading 5,Čitanje 5
 DocType: Shopping Cart Settings,Display Settings,Postavke prikaza
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Postavite broj knjiženih amortizacija
+DocType: Shift Type,Consequence after,Posljedica nakon
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Za što vam je potrebna pomoć?
 DocType: Journal Entry,Printing Settings,Postavke ispisa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bankarstvo
@@ -2284,6 +2303,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Adresa za naplatu jednaka je adresi dostave
 DocType: Account,Cash,Unovčiti
 DocType: Employee,Leave Policy,Politika napuštanja
+DocType: Shift Type,Consequence,Posljedica
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Adresa učenika
 DocType: GST Account,CESS Account,Račun CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Mjesto troška je potrebno za račun &quot;Dobit i gubitak&quot; {2}. Postavite zadano mjesto troška za tvrtku.
@@ -2348,6 +2368,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Voucher za zatvaranje razdoblja
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Ime Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Unesite račun troškova
+DocType: Issue,Resolution By Variance,Rezolucija po varijanti
 DocType: Employee,Resignation Letter Date,Datum pisma ostavke
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Prisustvo na datum
@@ -2360,6 +2381,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Prikaži sada
 DocType: Item Price,Valid Upto,Valjan do
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Reference Doctype mora biti jedna od {0}
+DocType: Employee Checkin,Skip Auto Attendance,Preskoči automatsko posjećivanje
 DocType: Payment Request,Transaction Currency,Valuta transakcije
 DocType: Loan,Repayment Schedule,Raspored otplate
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Izradite unos zaliha uzorka
@@ -2431,6 +2453,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Porez na vaučer za zatvaranje POS terminala
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Postupak inicijaliziran
 DocType: POS Profile,Applicable for Users,Primjenjivo za korisnike
+,Delayed Order Report,Izvješće o odgođenoj narudžbi
 DocType: Training Event,Exam,Ispit
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Pronađen je pogrešan broj unosa glavne knjige. Možda ste u transakciji odabrali pogrešan račun.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Cjevovod prodaje
@@ -2445,10 +2468,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Uvjeti će se primjenjivati na sve odabrane stavke zajedno.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigurirati
 DocType: Hotel Room,Capacity,Kapacitet
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Instalirani broj
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Paket {0} stavke {1} je onemogućen.
 DocType: Hotel Room Reservation,Hotel Reservation User,Korisnik rezervacije hotela
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Radni je dan ponovljen dva puta
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ugovor o razini usluge s vrstom entiteta {0} i entitetom {1} već postoji.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Grupa stavki koja nije navedena u glavnom stavku za stavku {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Pogreška imena: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Teritorij je potreban u POS profilu
@@ -2496,6 +2520,7 @@
 DocType: Depreciation Schedule,Schedule Date,Datum rasporeda
 DocType: Packing Slip,Package Weight Details,Pojedinosti o težini paketa
 DocType: Job Applicant,Job Opening,Otvaranje posla
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Posljednja poznata uspješna sinkronizacija zaposlenika Checkin. Poništite ovo samo ako ste sigurni da su svi zapisi sinkronizirani sa svih lokacija. Nemojte mijenjati ovo ako niste sigurni.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Stvarna cijena
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Ukupni iznos ({0}) protiv narudžbe {1} ne može biti veći od ukupnog iznosa ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Stavke su ažurirane
@@ -2540,6 +2565,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Nabavite račune
 DocType: Tally Migration,Is Day Book Data Imported,Podaci o danu knjige su uvezeni
 ,Sales Partners Commission,Komisija za prodajne partnere
+DocType: Shift Type,Enable Different Consequence for Early Exit,Omogući različite posljedice za rani izlazak
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,pravni
 DocType: Loan Application,Required by Date,Potrebno po datumu
 DocType: Quiz Result,Quiz Result,Rezultat kviza
@@ -2599,7 +2625,6 @@
 DocType: Pricing Rule,Pricing Rule,Pravilo o određivanju cijena
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Neobavezna lista praznika nije postavljena za razdoblje odlaska {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Postavite polje ID korisnika u zapis zaposlenika da biste postavili ulogu zaposlenika
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Vrijeme je za rješavanje
 DocType: Training Event,Training Event,Trening događaj
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normalan krvni tlak u mirovanju kod odrasle osobe je približno 120 mmHg sistolički, a 80 mmHg dijastolički, skraćeno &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Sustav će dohvatiti sve unose ako je granična vrijednost jednaka nuli.
@@ -2643,6 +2668,7 @@
 DocType: Student Applicant,Approved,Odobren
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Od datuma treba biti unutar fiskalne godine. Pretpostavljajući od datuma = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Podesite grupu dobavljača u postavkama kupnje.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} je nevažeći status nazočnosti.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Privremeni otvarajući račun
 DocType: Purchase Invoice,Cash/Bank Account,Novčani / bankovni račun
 DocType: Quality Meeting Table,Quality Meeting Table,Tablica kvalitete sastanka
@@ -2678,6 +2704,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Hrana, piće i duhan"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Raspored tečajeva
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Sudionici će biti automatski označeni tek nakon tog datuma.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Potrošači za UIN nositelje
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Zahtjev za ponudu
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Valuta se ne može mijenjati nakon unosa neke druge valute
@@ -2726,7 +2753,6 @@
 DocType: Item,Is Item from Hub,Je li stavka iz središta
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Postupak kvalitete.
 DocType: Share Balance,No of Shares,Broj dionica
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Redak {0}: Količina nije dostupna za {4} u skladištu {1} u vrijeme knjiženja unosa ({2} {3})
 DocType: Quality Action,Preventive,preventivan
 DocType: Support Settings,Forum URL,URL foruma
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Zaposlenici i nazočni
@@ -2948,7 +2974,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Zadani porezi i naknade
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,To se temelji na transakcijama protiv ovog dobavljača. Detalje potražite u donjoj crti
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimalni iznos naknade zaposlenika {0} premašuje {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Unesite datum početka i završetka ugovora.
 DocType: Delivery Note Item,Against Sales Invoice,Protiv fakture prodaje
 DocType: Loyalty Point Entry,Purchase Amount,Iznos kupnje
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Ne može se postaviti kao izgubljeno kao izvršen prodajni nalog.
@@ -2972,7 +2997,7 @@
 DocType: Lead,Organization Name,Naziv organizacije
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Važeća polja s valjanošću i valjani upto polja obvezna su za kumulativ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Redak {{0}: serijski broj mora biti isti kao i {1} {2}
-DocType: Employee,Leave Details,Ostavite pojedinosti
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Stock transakcije prije {0} su zamrznute
 DocType: Driver,Issuing Date,Datum izdavanja
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Podnositelj zahtjeva
@@ -3017,9 +3042,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Detalji predloška za mapiranje novčanog toka
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Zapošljavanje i obuka
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Postavke razdoblja mirovanja za automatsko posjećivanje
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Iz valute i valute ne mogu biti isti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Lijekovi
 DocType: Employee,HR-EMP-,HR-Poslodavci
+DocType: Service Level,Support Hours,Radno vrijeme podrške
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} je otkazan ili zatvoren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Red {0}: predujam protiv klijenta mora biti odobren
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grupiraj po vaučeru (konsolidirano)
@@ -3129,6 +3156,7 @@
 DocType: Territory,Territory Manager,Upravitelj teritorija
 DocType: Lab Test,Sample ID,ID uzorka
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Košarica je prazna
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Sudjelovanje je označeno kao prijave po zaposleniku
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Imovina {0} mora biti poslana
 ,Absent Student Report,Odsutni studentski izvještaj
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Uključeno u bruto dobit
@@ -3136,7 +3164,9 @@
 DocType: Travel Request Costing,Funded Amount,Iznos financiranja
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nije poslan tako da se radnja ne može dovršiti
 DocType: Subscription,Trial Period End Date,Datum završetka probnog razdoblja
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Naizmjenični unosi kao IN i OUT tijekom iste smjene
 DocType: BOM Update Tool,The new BOM after replacement,Nova sastavnica nakon zamjene
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Tačka 5
 DocType: Employee,Passport Number,Broj putovnice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Privremeno otvaranje
@@ -3252,6 +3282,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Mogući dobavljač
 ,Issued Items Against Work Order,Izdane stavke protiv radnog naloga
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Izrada fakture {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u obrazovanju&gt; Postavke obrazovanja
 DocType: Student,Joining Date,Datum pridruženja
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Tražite web-lokaciju
 DocType: Purchase Invoice,Against Expense Account,Protiv računa troškova
@@ -3291,6 +3322,7 @@
 DocType: Landed Cost Item,Applicable Charges,Primjenjive naknade
 ,Point of Sale,Prodajno mjesto
 DocType: Authorization Rule,Approving User  (above authorized value),Odobravanje korisnika (iznad ovlaštene vrijednosti)
+DocType: Service Level Agreement,Entity,entiteta
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Klijent {0} ne pripada projektu {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Iz naziva stranke
@@ -3337,6 +3369,7 @@
 DocType: Soil Texture,Sand Composition (%),Sastav pijeska (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Uvoz podataka o knjizi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Podesite serije Naming za {0} putem postavke&gt; Postavke&gt; Serije imenovanja
 DocType: Asset,Asset Owner Company,Društvo vlasnika imovine
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Mjesto troška je potrebno za knjiženje troškova potraživanja
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} važećih serijskih brojeva za stavku {1}
@@ -3397,7 +3430,6 @@
 DocType: Asset,Asset Owner,Vlasnik imovine
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Skladište je obvezno za stavku stavke {0} u retku {1}
 DocType: Stock Entry,Total Additional Costs,Ukupni dodatni troškovi
-DocType: Marketplace Settings,Last Sync On,Zadnja sinkronizacija uključena
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Postavite barem jedan redak u tablici Porezi i troškovi
 DocType: Asset Maintenance Team,Maintenance Team Name,Ime tima za održavanje
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Grafikon mjesta troška
@@ -3413,12 +3445,12 @@
 DocType: Job Card,WIP Warehouse,WIP skladište
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID korisnika nije postavljen za zaposlenika {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Dostupna količina je {0}, trebate {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Korisnik {0} je izrađen
 DocType: Stock Settings,Item Naming By,Stavka imenovanja
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Ž
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ovo je korijenska grupa korisnika i ne može se uređivati.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Zahtjev za materijal {0} je otkazan ili zaustavljen
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Strogo se temelji na zapisu tipa Zapisnik zaposlenika
 DocType: Purchase Order Item Supplied,Supplied Qty,Isporučena količina
 DocType: Cash Flow Mapper,Cash Flow Mapper,Maper novčanog toka
 DocType: Soil Texture,Sand,Pijesak
@@ -3477,6 +3509,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Udvostručena grupa stavki pronađena u tablici grupe stavki
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Godišnja plaća
 DocType: Supplier Scorecard,Weighting Function,Funkcija vaganja
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzijski faktor ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Pogreška pri procjeni formule kriterija
 ,Lab Test Report,Izvješće laboratorijskog testa
 DocType: BOM,With Operations,S operacijama
@@ -3490,6 +3523,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Nema otplata za unos dnevnika
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} je neaktivan student
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Unos dionica
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Rekurzija sastavnica: {0} ne može biti roditelj ili dijete od {1}
 DocType: Employee Onboarding,Activities,djelatnost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,U najmanju ruku jedno skladište je obvezno
 ,Customer Credit Balance,Stanje kredita za klijente
@@ -3502,9 +3536,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Pronašli smo više programa vjernosti za klijenta. Odaberite ručno.
 DocType: Patient,Medication,liječenje
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Odaberite Program lojalnosti
+DocType: Employee Checkin,Attendance Marked,Sudionici su označeni
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Sirovine
 DocType: Sales Order,Fully Billed,Naplaćuje se u potpunosti
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Molimo vas da postavite cijenu za hotelsku sobu na {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Odaberite samo jedan prioritet kao zadani.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Prepoznajte / stvorite račun (knjigu) za vrstu - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Ukupni iznos kredita / zaduženja trebao bi biti isti kao i unos u dnevnik
 DocType: Purchase Invoice Item,Is Fixed Asset,Je fiksno sredstvo
@@ -3525,6 +3561,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Potvrda sastanka
 DocType: Shopping Cart Settings,Orders,Narudžbe
 DocType: HR Settings,Retirement Age,Dob umirovljenja
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite nizove brojeva za nazočnost putem postavke&gt; Brojčane serije
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Predviđena količina
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Brisanje nije dopušteno za zemlju {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Redak # {0}: Svojstvo {1} je već {2}
@@ -3608,11 +3645,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovođa
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Trajanje kupona za POS terminale postoji za {0} između datuma {1} i {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Kretanje
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Nijedna nepodmirena faktura ne zahtijeva revalorizaciju tečaja
 DocType: Authorization Rule,Customer / Item Name,Naziv kupca / stavke
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Novi serijski broj ne može imati skladište. Skladište mora biti postavljeno putem unosa dionica ili potvrde o kupnji
 DocType: Issue,Via Customer Portal,Preko korisničkog portala
 DocType: Work Order Operation,Planned Start Time,Planirano vrijeme početka
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
+DocType: Service Level Priority,Service Level Priority,Prioritet razine usluge
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj knjiženih amortizacija ne može biti veći od ukupnog broja amortizacije
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Podijelite Ledger
 DocType: Journal Entry,Accounts Payable,Obveze prema dobavljačima
@@ -3723,7 +3762,6 @@
 DocType: Delivery Note,Delivery To,Dostava u
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankovni podaci
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,U planu je
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Održavajte sate za naplatu i radno vrijeme na obrascu timesheet
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Pratite trag pomoću glavnog izvora.
 DocType: Clinical Procedure,Nursing User,Korisnik skrbi
 DocType: Support Settings,Response Key List,Popis ključnih odgovora
@@ -3891,6 +3929,7 @@
 DocType: Work Order Operation,Actual Start Time,Stvarno vrijeme početka
 DocType: Antibiotic,Laboratory User,Korisnik laboratorija
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online aukcije
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Ponovljen je prioritet {0}.
 DocType: Fee Schedule,Fee Creation Status,Status stvaranja naknade
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Software
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Prodajni nalog do plaćanja
@@ -3957,6 +3996,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Nije moguće dohvatiti informacije za {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Valuta za naplatu mora biti jednaka zadanoj valuti tvrtke ili valuti računa stranke
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Unesite Id zaposlenika te osobe za prodaju
+DocType: Shift Type,Early Exit Consequence after,Posljedica nakon izlaska
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Stvorite otvorene fakture prodaje i kupnje
 DocType: Disease,Treatment Period,Razdoblje liječenja
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Postavljanje e-pošte
@@ -3974,7 +4014,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Ime studenta:
 DocType: SMS Log,Sent On,Poslano uključeno
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Račun za prodaju
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Vrijeme odgovora ne može biti veće od vremena rezolucije
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Za studentsku grupu temeljenu na tečaju, tečaj će biti validiran za svakog studenta iz upisanih kolegija u upis u program."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Unutar državne potrošnje
 DocType: Employee,Create User Permission,Stvaranje korisničkog dopuštenja
@@ -4013,6 +4052,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standardni uvjeti ugovora za prodaju ili kupnju.
 DocType: Sales Invoice,Customer PO Details,Pojedinosti narudžbe kupaca
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacijent nije pronađen
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Odaberite zadani prioritet.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Uklonite stavku ako se troškovi ne odnose na tu stavku
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Postoji korisnička grupa s istim imenom, promijenite ime klijenta ili promijenite naziv grupe korisnika"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4052,6 +4092,7 @@
 DocType: Support Settings,Support Portal,Portal za podršku
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Datum završetka zadatka <b>{0}</b> ne može biti manji od <b>{1}</b> očekivanog datuma početka <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Zaposlenik {0} je ostavio na {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Ovaj ugovor o razini usluge specifičan je za klijenta {0}
 DocType: Employee,Held On,Održanoj
 DocType: Healthcare Practitioner,Practitioner Schedules,Raspored praktičara
 DocType: Project Template Task,Begin On (Days),Počni (dana)
@@ -4059,6 +4100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Radni nalog je bio {0}
 DocType: Inpatient Record,Admission Schedule Date,Datum rasporeda upisa
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Prilagodba vrijednosti imovine
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Označite posjećenost na temelju &#39;Checking zaposlenika&#39; za zaposlenike dodijeljene ovoj smjeni.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Zalihe napravljene neregistriranim osobama
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Svi poslovi
 DocType: Appointment Type,Appointment Type,Vrsta sastanka
@@ -4172,7 +4214,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + težina ambalaže. (za ispis)
 DocType: Plant Analysis,Laboratory Testing Datetime,Datetime test laboratorijskog ispitivanja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Stavka {0} ne može imati paket
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Prodajni cjevovod prema stupnju
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Snaga učeničke grupe
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Upis transakcije bankovnog izvoda
 DocType: Purchase Order,Get Items from Open Material Requests,Nabavite stavke iz zahtjeva otvorenog materijala
@@ -4254,7 +4295,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Pokazati starenje skladišta
 DocType: Sales Invoice,Write Off Outstanding Amount,Ispisati nepodmireni iznos
 DocType: Payroll Entry,Employee Details,Detalji o zaposleniku
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Vrijeme početka ne može biti veće od završnog vremena za {0}.
 DocType: Pricing Rule,Discount Amount,Iznos popusta
 DocType: Healthcare Service Unit Type,Item Details,Pojedinosti o stavci
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Ponovljena porezna izjava od {0} za razdoblje {1}
@@ -4307,7 +4347,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Neto plaća ne može biti negativna
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Broj interakcija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Redak {0} # Stavka {1} ne može se prenijeti više od {2} prema Narudžbenici {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,smjena
+DocType: Attendance,Shift,smjena
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Obrada kontnog plana i stranaka
 DocType: Stock Settings,Convert Item Description to Clean HTML,Pretvori opis stavke u Clean HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Sve grupe dobavljača
@@ -4378,6 +4418,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Jedinica za roditeljsku uslugu
 DocType: Sales Invoice,Include Payment (POS),Uključi plaćanje (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Privatni kapital
+DocType: Shift Type,First Check-in and Last Check-out,Prva prijava i posljednja odjava
 DocType: Landed Cost Item,Receipt Document,Dokument o primitku
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Razdoblje popisa dobavljača
 DocType: Employee Grade,Default Salary Structure,Struktura primarne plaće
@@ -4460,6 +4501,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Izradite narudžbenicu
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definirati proračun za financijsku godinu.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Tablica računa ne može biti prazna.
+DocType: Employee Checkin,Entry Grace Period Consequence,Posljedica prijelaznog razdoblja ulaska
 ,Payment Period Based On Invoice Date,Razdoblje plaćanja na temelju datuma fakture
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Datum instalacije ne može biti prije datuma isporuke za stavku {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Veza na Zahtjev materijala
@@ -4468,6 +4510,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Redak {0}: stavka za promjenu redoslijeda već postoji za ovo skladište {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Datum dokumenta
 DocType: Monthly Distribution,Distribution Name,Naziv distribucije
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Radni dan {0} je ponovljen.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Grupirajte u neku grupu
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Ažuriranje u tijeku. Može potrajati.
 DocType: Item,"Example: ABCD.#####
@@ -4480,6 +4523,7 @@
 DocType: Vehicle Log,Fuel Qty,Količina goriva
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile br
 DocType: Invoice Discounting,Disbursed,isplaćeni
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Vrijeme nakon završetka smjene tijekom kojeg se smatra da je check-out prisutan.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Neto promjena obveza prema dobavljačima
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nije dostupno
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Skraćeno radno vrijeme
@@ -4493,7 +4537,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Prikaži PDC u ispisu
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Dobavljač
 DocType: POS Profile User,POS Profile User,Korisnik POS profila
-DocType: Student,Middle Name,Srednje ime
 DocType: Sales Person,Sales Person Name,Ime prodavača
 DocType: Packing Slip,Gross Weight,Bruto težina
 DocType: Journal Entry,Bill No,Bill No
@@ -4502,7 +4545,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-Vlogu-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Ugovor o razini usluge
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Najprije odaberite zaposlenika i datum
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Stopa procjene stavke preračunava se s obzirom na iznos voucher-a za zemljišne troškove
 DocType: Timesheet,Employee Detail,Pojedinosti zaposlenika
 DocType: Tally Migration,Vouchers,bonovi
@@ -4537,7 +4579,7 @@
 DocType: Additional Salary,Date on which this component is applied,Datum na koji se primjenjuje ova komponenta
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Popis dostupnih dioničara s brojevima dionica
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Postavite račune pristupnika.
-DocType: Service Level,Response Time Period,Razdoblje odgovora
+DocType: Service Level Priority,Response Time Period,Razdoblje odgovora
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja poreza i naknada
 DocType: Course Activity,Activity Date,Datum aktivnosti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Odaberite ili dodajte novog kupca
@@ -4562,6 +4604,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Financijska godina
 DocType: Sales Invoice Item,Deferred Revenue,Odgođeni prihod
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,"U svakom slučaju, mora se odabrati jedna od prodaja ili kupnja"
+DocType: Shift Type,Working Hours Threshold for Half Day,Prag rada za pola dana
 ,Item-wise Purchase History,Povijest nabave
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Nije moguće promijeniti datum zaustavljanja usluge za stavku u retku {0}
 DocType: Production Plan,Include Subcontracted Items,Uključite stavke podugovora
@@ -4594,6 +4637,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Dopusti istu stavku više puta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Stvorite sastavnicu
 DocType: Healthcare Practitioner,Charges,Troškovi
+DocType: Employee,Attendance and Leave Details,Pohađanje i ostavljanje podataka
 DocType: Student,Personal Details,Osobni podatci
 DocType: Sales Order,Billing and Delivery Status,Status naplate i isporuke
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Red {0}: Za dobavljača {0} E-mail adresa je potrebna za slanje e-pošte
@@ -4645,7 +4689,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Unesite vrijednost između {0} i {1}
 DocType: Purchase Order,Order Confirmation Date,Datum potvrde narudžbe
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Izračunaj procijenjeno vrijeme dolaska
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u ljudskim resursima&gt; Postavke ljudskih resursa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,potrošni
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Datum početka pretplate
@@ -4668,7 +4711,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Račun za unos dnevnika
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Varijanta
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Aktivnost foruma
-DocType: Service Level,Resolution Time Period,Razdoblje razlučivosti
+DocType: Service Level Priority,Resolution Time Period,Razdoblje razlučivosti
 DocType: Request for Quotation,Supplier Detail,Pojedinosti dobavljača
 DocType: Project Task,View Task,Prikaži zadatak
 DocType: Serial No,Purchase / Manufacture Details,Pojedinosti o kupnji / proizvodnji
@@ -4735,6 +4778,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo putem unosa / isporuke dionica / potvrde o kupnji
 DocType: Support Settings,Close Issue After Days,Zatvori izdanje nakon nekoliko dana
 DocType: Payment Schedule,Payment Schedule,Raspored plaćanja
+DocType: Shift Type,Enable Entry Grace Period,Omogući produljenje razdoblja ulaska
 DocType: Patient Relation,Spouse,suprug
 DocType: Purchase Invoice,Reason For Putting On Hold,Razlog stavljanja na čekanje
 DocType: Item Attribute,Increment,povećanje
@@ -4874,6 +4918,7 @@
 DocType: Vehicle Log,Invoice Ref,Račun Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-obrazac nije primjenjiv za dostavnicu: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Račun je izrađen
+DocType: Shift Type,Early Exit Grace Period,Rani izlazak Grace Period
 DocType: Patient Encounter,Review Details,Pojedinosti pregleda
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Red {0}: Vrijednost sata mora biti veća od nule.
 DocType: Account,Account Number,Broj računa
@@ -4885,7 +4930,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Primjenjivo ako je tvrtka SpA, SApA ili SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Uvjeti preklapanja pronađeni između:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Plaćeno i nije isporučeno
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Šifra artikla je obavezna jer stavka nije automatski numerirana
 DocType: GST HSN Code,HSN Code,HSN kod
 DocType: GSTR 3B Report,September,rujan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administrativni troškovi
@@ -4921,6 +4965,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Račun CWIP
 DocType: SMS Log,Sender Name,Ime pošiljatelja
 DocType: Pricing Rule,Supplier Group,Grupa dobavljača
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Postavite vrijeme početka i završno vrijeme za dan podrške {0} u indeksu {1}.
 DocType: Employee,Date of Issue,Datum izdavanja
 ,Requested Items To Be Transferred,Tražene stavke koje treba prenijeti
 DocType: Employee,Contract End Date,Datum završetka ugovora
@@ -4931,6 +4977,7 @@
 DocType: Opportunity,Sales Stage,Stupanj prodaje
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječima će biti vidljivo kada spremite prodajni nalog.
 DocType: Item Reorder,Re-order Level,Razina ponovnog narudžbe
+DocType: Shift Type,Enable Auto Attendance,Omogući automatsko posjećivanje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Prednost
 ,Department Analytics,Analitika odjela
 DocType: Crop,Scientific Name,Znanstveno ime
@@ -4943,6 +4990,7 @@
 DocType: Quiz Activity,Quiz Activity,Kviz aktivnost
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} nije u valjanom obračunskom razdoblju
 DocType: Timesheet,Billed,naplaćeno
+apps/erpnext/erpnext/config/support.py,Issue Type.,Vrsta problema.
 DocType: Restaurant Order Entry,Last Sales Invoice,Posljednja dostavnica
 DocType: Payment Terms Template,Payment Terms,Uvjeti plaćanja
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervirano Količina: Količina naručena za prodaju, ali ne isporučena."
@@ -5038,6 +5086,7 @@
 DocType: Account,Asset,Imovina
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} nema raspored liječnika. Dodajte ga u majstora liječnika
 DocType: Vehicle,Chassis No,Šasija br
+DocType: Employee,Default Shift,Zadani pomak
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Kratica tvrtke
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Stablo materijala
 DocType: Article,LMS User,LMS korisnik
@@ -5086,6 +5135,7 @@
 DocType: Sales Person,Parent Sales Person,Matična prodajna osoba
 DocType: Student Group Creation Tool,Get Courses,Nabavite tečajeve
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti 1, jer je stavka fiksno sredstvo. Upotrijebite zasebni redak za višestruku količinu."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Radno vrijeme ispod kojeg je odsutno označeno. (Nula do onemogućavanja)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Samo su čvorovi listova dopušteni u transakciji
 DocType: Grant Application,Organization,Organizacija
 DocType: Fee Category,Fee Category,Kategorija naknade
@@ -5098,6 +5148,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Ažurirajte svoj status za ovaj trening događaj
 DocType: Volunteer,Morning,Jutro
 DocType: Quotation Item,Quotation Item,Stavka ponude
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Prioritet problema.
 DocType: Journal Entry,Credit Card Entry,Unos kreditne kartice
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Vremenski razmak je preskočen, utor {0} do {1} preklapa postojeći prorez {2} do {3}"
 DocType: Journal Entry Account,If Income or Expense,Ako je prihod ili trošak
@@ -5148,11 +5199,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Uvoz podataka i postavke
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Ako je označena opcija Auto Opt In, klijenti će se automatski povezati s dotičnim programom vjernosti (na spremanje)"
 DocType: Account,Expense Account,Račun troškova
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Vrijeme prije početka smjene, tijekom kojeg se smatra da je prijavljivanje zaposlenika uključeno."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Odnos s Guardianom1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Izradite dostavnicu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Osoba oslobođena na {0} mora biti postavljena kao &quot;Lijevo&quot;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Platite {0} {1}
+DocType: Company,Sales Settings,Postavke prodaje
 DocType: Sales Order Item,Produced Quantity,Proizvedena količina
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Zahtjev za ponudu možete pristupiti klikom na sljedeći link
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
@@ -5231,6 +5284,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Izrađuju se predlošci za poreze za prodaju i kupnju.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Vrsta ostavljanja {0} ne može se prenijeti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Zaduženje Račun mora biti račun potraživanja
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Datum završetka ugovora ne može biti manji nego danas.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Postavite račun na skladištu {0} ili zadani račun inventara u tvrtki {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Postavi kao zadano
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Neto težina ovog paketa. (izračunava se automatski kao zbroj neto težine stavki)
@@ -5257,8 +5311,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Istekle serije
 DocType: Shipping Rule,Shipping Rule Type,Vrsta pravila slanja
 DocType: Job Offer,Accepted,prihvaćeno
-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"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Već ste procijenili kriterije procjene {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Odaberite Serijski brojevi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Dob (Dani)
@@ -5285,6 +5337,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Odaberite svoje domene
 DocType: Agriculture Task,Task Name,Naziv zadatka
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Ulazne stavke su već kreirane za radni nalog
+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"
 ,Amount to Deliver,Iznos za isporuku
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Tvrtka {0} ne postoji
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nije pronađen nijedan zahtjev za materijalom za povezivanje za navedene stavke.
@@ -5334,6 +5388,7 @@
 DocType: Lab Prescription,Test Code,Test Code
 DocType: Purchase Taxes and Charges,On Previous Row Total,Ukupno na prethodnom redu
 DocType: Student,Student Email Address,Adresa e-pošte studenta
+,Delayed Item Report,Izvješće o odgođenoj stavci
 DocType: Academic Term,Education,Obrazovanje
 DocType: Supplier Quotation,Supplier Address,Adresa dobavljača
 DocType: Salary Detail,Do not include in total,Ne uključujte ukupno
@@ -5341,7 +5396,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ne postoji
 DocType: Purchase Receipt Item,Rejected Quantity,Odbijena količina
 DocType: Cashier Closing,To TIme,U VRIJEME
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzijski faktor ({0} -&gt; {1}) nije pronađen za stavku: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Dnevni korisnik grupe sažetka rada
 DocType: Fiscal Year Company,Fiscal Year Company,Tvrtka fiskalne godine
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternativna stavka ne smije biti ista kao i kod stavke
@@ -5393,6 +5447,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Kašnjenje između zaustavljanja isporuke
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamrzavanje zaliha starije od [dana]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Popust na proizvode za promotivne sheme
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Već postoji prioritet problema
 DocType: Account,Asset Received But Not Billed,"Imovina primljena, ali ne naplaćena"
 DocType: POS Closing Voucher,Total Collected Amount,Ukupni prikupljeni iznos
 DocType: Course,Default Grading Scale,Zadana skala ocjenjivanja
@@ -5435,6 +5490,7 @@
 DocType: Contract,Fulfilment Terms,Uvjeti ispunjenja
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ne-grupa u grupu
 DocType: Student Guardian,Mother,Majka
+DocType: Issue,Service Level Agreement Fulfilled,Ispunjen je ugovor o razini usluge
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Odbitak poreza za nenaplaćene naknade zaposlenicima
 DocType: Travel Request,Travel Funding,Financiranje putovanja
 DocType: Shipping Rule,Fixed,fiksni
@@ -5464,10 +5520,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nema pronađenih stavki.
 DocType: Item Attribute,From Range,Iz raspona
 DocType: Clinical Procedure,Consumables,Potrošni
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; i &#39;timestamp&#39; su obavezni.
 DocType: Purchase Taxes and Charges,Reference Row #,Referentni redak #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Postavite &quot;Središte troškova troškova amortizacije&quot; u tvrtki {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Red # {0}: dokument za plaćanje potreban je za dovršenje transakcije
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Kliknite ovaj gumb da biste povukli podatke o prodajnom nalogu s Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Radno vrijeme ispod kojeg je označen pola dana. (Nula do onemogućavanja)
 ,Assessment Plan Status,Status plana ocjenjivanja
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Prvo odaberite {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Pošaljite ovo kako biste stvorili zapis zaposlenika
@@ -5538,6 +5596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Postavite Otvori
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Prebaci filtre
 DocType: Production Plan,Material Request Detail,Pojedinosti zahtjeva za materijal
+DocType: Shift Type,Process Attendance After,Posjećivanje procesa nakon
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladište
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Idite na Programi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Redak # {0}: Dvostruki unos u literaturi {1} {2}
@@ -5595,6 +5654,7 @@
 DocType: Pricing Rule,Party Information,Informacije o stranci
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Dužnici ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Do danas ne može biti veći od datuma otpuštanja zaposlenika
+DocType: Shift Type,Enable Exit Grace Period,Omogući izlazno razdoblje odgode
 DocType: Expense Claim,Employees Email Id,Id zaposlenika e-pošte
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Ažuriraj cijenu iz Shopify U ERPNext cjenik
 DocType: Healthcare Settings,Default Medical Code Standard,Standardni standardni medicinski kod
@@ -5625,7 +5685,6 @@
 DocType: Budget,Applicable on Material Request,Primjenjivo na zahtjev za materijal
 DocType: Support Settings,Search APIs,API-ji za pretraživanje
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Postotak prekomjerne proizvodnje za prodajni nalog
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Tehnički podaci
 DocType: Purchase Invoice,Supplied Items,Isporučeni artikli
 DocType: Leave Control Panel,Select Employees,Odaberite Zaposlenici
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Odaberite račun prihoda od kamata u zajmu {0}
@@ -5651,7 +5710,7 @@
 ,Supplier-Wise Sales Analytics,Analitika prodaje po dobavljaču
 DocType: GSTR 3B Report,February,veljača
 DocType: Appraisal,For Employee,Za zaposlenika
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Stvarni datum isporuke
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Stvarni datum isporuke
 DocType: Sales Partner,Sales Partner Name,Naziv prodajnog partnera
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Redoslijed amortizacije {0}: Početni datum amortizacije unesen je kao prošli datum
 DocType: GST HSN Code,Regional,Regionalni
@@ -5690,6 +5749,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Preglednik dobavljača
 DocType: Travel Itinerary,Travel To,Putovati u
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Označite nazočnost
+DocType: Shift Type,Determine Check-in and Check-out,Odredite prijavu i odjavu
 DocType: POS Closing Voucher,Difference,Razlika
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Mali
 DocType: Work Order Item,Work Order Item,Stavka radnog naloga
@@ -5723,6 +5783,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Droga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} je zatvoreno
 DocType: Patient,Medical History,Povijest bolesti
+DocType: Expense Claim,Expense Taxes and Charges,Troškovi poreza i naknada
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Broj dana nakon isteka datuma fakture prije otkazivanja pretplate ili označavanja pretplate kao neplaćene
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Napomena za instalaciju {0} već je poslana
 DocType: Patient Relation,Family,Obitelj
@@ -5755,7 +5816,6 @@
 DocType: Dosage Strength,Strength,snaga
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,Za dovršetak ove transakcije potrebno je {0} jedinica {1} u {2}.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush sirovine na temelju podugovora
-DocType: Bank Guarantee,Customer,kupac
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ako je omogućeno, polje Academic Term će biti obavezno u alatu za upis programa."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Za studentsku skupinu temeljenu na serijama, Studentova serija će biti validirana za svakog učenika iz Pristupnice za Program."
 DocType: Course,Topics,Teme
@@ -5835,6 +5895,7 @@
 DocType: Chapter,Chapter Members,Članovi poglavlja
 DocType: Warranty Claim,Service Address,Adresa usluge
 DocType: Journal Entry,Remark,Napomena
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Redak {0}: količina nije dostupna za {4} u skladištu {1} u vrijeme knjiženja unosa ({2} {3})
 DocType: Patient Encounter,Encounter Time,Vrijeme susreta
 DocType: Serial No,Invoice Details,Pojedinosti dostavnice
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnji računi mogu se izraditi u grupi, ali unosi se mogu vršiti protiv ne-grupa"
@@ -5915,6 +5976,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Zatvaranje (otvaranje + ukupno)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formula kriterija
 apps/erpnext/erpnext/config/support.py,Support Analytics,Podrška Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID uređaja za nazočnost (ID biometrijske / RF oznake)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pregled i radnja
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut, unosi su dopušteni ograničenim korisnicima."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Iznos nakon amortizacije
@@ -5936,6 +5998,7 @@
 DocType: Salary Slip,Loan Repayment,Otplata kredita
 DocType: Employee Education,Major/Optional Subjects,Glavni / izborni predmeti
 DocType: Soil Texture,Silt,Mulj
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Adrese i kontakti dobavljača
 DocType: Bank Guarantee,Bank Guarantee Type,Vrsta bankovne garancije
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ako je onemogućeno, polje &quot;Zaokruženo ukupno&quot; neće biti vidljivo ni u jednoj transakciji"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5974,6 +6037,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Otvaranje stavke alata za izradu računa
 DocType: Soil Analysis,(Ca+Mg)/K,(+ Ca Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Uključite POS transakcije
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Nije pronađen zaposlenik za navedenu vrijednost polja zaposlenika. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni iznos (valuta tvrtke)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage je pun, nije spremio"
 DocType: Chapter Member,Chapter Member,Član poglavlja
@@ -6006,6 +6070,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nije izrađena nijedna studentska grupa.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Ponovljeni redak {0} s istim {1}
 DocType: Employee,Salary Details,Detalji plaća
+DocType: Employee Checkin,Exit Grace Period Consequence,Izlazak posljedice grace perioda
 DocType: Bank Statement Transaction Invoice Item,Invoice,Dostavnica
 DocType: Special Test Items,Particulars,Pojedinosti
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Postavite filtar na temelju stavke ili skladišta
@@ -6107,6 +6172,7 @@
 DocType: Serial No,Out of AMC,Izvan AMC-a
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, potrebne kvalifikacije itd."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Otpremi na državu
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Želite li poslati zahtjev za materijal
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: Compensatory Leave Request,Work End Date,Datum završetka posla
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Zahtjev za sirovine
@@ -6292,6 +6358,7 @@
 DocType: Sales Order Item,Gross Profit,Bruto dobit
 DocType: Quality Inspection,Item Serial No,Serijska br
 DocType: Asset,Insurer,osiguravač
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Iznos kupnje
 DocType: Asset Maintenance Task,Certificate Required,Potreban je certifikat
 DocType: Retention Bonus,Retention Bonus,Bonus za zadržavanje
@@ -6406,6 +6473,8 @@
 DocType: Invoice Discounting,Sanctioned,kažnjeni
 DocType: Course Enrollment,Course Enrollment,Upis u tečaj
 DocType: Item,Supplier Items,Stavke dobavljača
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Vrijeme početka ne može biti veće ili jednako vremenu završetka za {0}.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 DocType: Support Search Source,Response Options,Opcije odgovora
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} treba biti vrijednost između 0 i 100
@@ -6492,7 +6561,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Stalna sredstva
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Ukupno zarada
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Korisnička grupa&gt; Teritorij
 DocType: Share Balance,From No,Od br
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Račun usklađivanja plaćanja
 DocType: Purchase Invoice,Taxes and Charges Added,Dodani porezi i naknade
@@ -6600,6 +6668,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Zanemari pravilo cijena
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Hrana
 DocType: Lost Reason Detail,Lost Reason Detail,Detalji izgubljenog razloga
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Stvoreni su sljedeći serijski brojevi: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Povratne informacije korisnika
 DocType: Serial No,Warranty / AMC Details,Pojedinosti o jamstvu / AMC-u
 DocType: Issue,Opening Time,Vrijeme otvaranja
@@ -6649,6 +6718,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Naziv tvrtke nije isti
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Promocija zaposlenika ne može se podnijeti prije datuma promocije
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Nije dopušteno ažuriranje transakcija zalihama starije od {0}
+DocType: Employee Checkin,Employee Checkin,Zapisnik zaposlenika
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Datum početka treba biti manji od datuma završetka za stavku {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Izradite ponude korisnika
 DocType: Buying Settings,Buying Settings,Postavke kupnje
@@ -6670,6 +6740,7 @@
 DocType: Patient,Patient Demographics,Demografija pacijenata
 DocType: Share Transfer,To Folio No,Za Folio br
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Novčani tijek iz poslovanja
+DocType: Employee Checkin,Log Type,Vrsta zapisnika
 DocType: Stock Settings,Allow Negative Stock,Dopusti negativnu zalihu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Nijedna stavka nema nikakve promjene u količini ili vrijednosti.
 DocType: Asset,Purchase Date,Datum kupnje
@@ -6714,6 +6785,7 @@
 DocType: Vital Signs,Very Hyper,Vrlo hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Odaberite prirodu svog poslovanja.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Odaberite mjesec i godinu
+DocType: Service Level,Default Priority,Zadani prioritet
 DocType: Student Log,Student Log,Studentski dnevnik
 DocType: Shopping Cart Settings,Enable Checkout,Omogući Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Ljudski resursi
@@ -6742,7 +6814,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Povežite Shopify s ERPNext
 DocType: Homepage Section Card,Subtitle,Titl
 DocType: Soil Texture,Loam,Ilovača
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 DocType: BOM,Scrap Material Cost(Company Currency),Trošak materijala bilješke (valuta tvrtke)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Napomena o isporuci {0} ne smije biti poslana
 DocType: Task,Actual Start Date (via Time Sheet),Stvarni datum početka (putem vremenskog lista)
@@ -6798,6 +6869,7 @@
 DocType: Drug Prescription,Dosage,doza
 DocType: Cheque Print Template,Starting position from top edge,Početni položaj s gornjeg ruba
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Trajanje sastanka (min)
+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 istom vremenskom oznakom. {0}
 DocType: Accounting Dimension,Disable,onesposobiti
 DocType: Email Digest,Purchase Orders to Receive,Nalozi za kupnju za primanje
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Narudžbe produkcija ne mogu se podići za:
@@ -6813,7 +6885,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Materijal prenesen za podugovaranje
 DocType: Job Card,Timing Detail,Detalj vremena
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Obavezno uključeno
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Uvoz {0} od {1}
 DocType: Job Offer Term,Job Offer Term,Trajanje ponude za posao
 DocType: SMS Center,All Contact,Svi kontakti
 DocType: Project Task,Project Task,Zadatak projekta
@@ -6864,7 +6935,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Stavka {0} nije postavljena za serijske brojeve
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Od države
 DocType: Leave Type,Maximum Continuous Days Applicable,Primjenjivi maksimalni kontinuirani dani
-apps/erpnext/erpnext/config/support.py,Support Team.,Tim podrške.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Najprije unesite naziv tvrtke
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Uvoz je uspješan
 DocType: Guardian,Alternate Number,Alternativni broj
@@ -6956,6 +7026,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Redak # {0}: stavka je dodana
 DocType: Student Admission,Eligibility and Details,Podobnost i pojedinosti
 DocType: Staffing Plan,Staffing Plan Detail,Detalj o kadrovskom planu
+DocType: Shift Type,Late Entry Grace Period,Odgoda u kasnom ulasku
 DocType: Email Digest,Annual Income,Godišnji prihod
 DocType: Journal Entry,Subscription Section,Odjeljak pretplate
 DocType: Salary Slip,Payment Days,Dani plaćanja
@@ -7006,6 +7077,7 @@
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 DocType: Asset Maintenance Log,Periodicity,Periodičnost
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Medicinski zapis
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Vrsta zapisa je potrebna za prijave koje padaju u smjeni: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Izvršenje
 DocType: Item,Valuation Method,Metoda vrednovanja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} protiv dostavnice za prodaju {1}
@@ -7090,6 +7162,7 @@
 DocType: Loan Type,Loan Name,Naziv zajma
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Postavite zadani način plaćanja
 DocType: Quality Goal,Revision,Revizija
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Vrijeme prije završetka smjene kada se odjava smatra ranom (u minutama).
 DocType: Healthcare Service Unit,Service Unit Type,Vrsta servisne jedinice
 DocType: Purchase Invoice,Return Against Purchase Invoice,Povrat protiv fakture kupnje
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Generiraj tajnu
@@ -7245,12 +7318,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kozmetika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Označite ovo ako želite prisiliti korisnika da odabere seriju prije spremanja. Ako to označite, neće biti zadane postavke."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnicima s ovom ulogom dopušteno je postaviti zamrznute račune i kreirati / izmijeniti računovodstvene unose za zamrznute račune
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Šifra artikla&gt; Grupa proizvoda&gt; Marka
 DocType: Expense Claim,Total Claimed Amount,Ukupni traženi iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći vremensko razdoblje u sljedećih {0} dana za rad {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Završavati
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Možete obnoviti samo ako vaše članstvo istekne u roku od 30 dana
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Vrijednost mora biti između {0} i {1}
 DocType: Quality Feedback,Parameters,parametri
+DocType: Shift Type,Auto Attendance Settings,Postavke automatskog posjećivanja
 ,Sales Partner Transaction Summary,Sažetak transakcija prodajnog partnera
 DocType: Asset Maintenance,Maintenance Manager Name,Ime upravitelja održavanja
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Potrebno je dohvatiti pojedinosti o stavci.
@@ -7342,10 +7417,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Potvrdi primjenjeno pravilo
 DocType: Job Card Item,Job Card Item,Stavka radne kartice
 DocType: Homepage,Company Tagline for website homepage,Podnaslov tvrtke za početnu stranicu web-lokacije
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Postavite vrijeme odziva i razlučivost za prioritet {0} na indeksu {1}.
 DocType: Company,Round Off Cost Center,Okrugli centar troškova
 DocType: Supplier Scorecard Criteria,Criteria Weight,Težina kriterija
 DocType: Asset,Depreciation Schedules,Raspored amortizacije
-DocType: Expense Claim Detail,Claim Amount,Iznos polaganja prava
 DocType: Subscription,Discounts,Popusti
 DocType: Shipping Rule,Shipping Rule Conditions,Uvjeti za pravilo dostave
 DocType: Subscription,Cancelation Date,Datum otkazivanja
@@ -7373,7 +7448,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Prikaži nultu vrijednost
 DocType: Employee Onboarding,Employee Onboarding,Zaposlenik na brodu
 DocType: POS Closing Voucher,Period End Date,Datum završetka razdoblja
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Mogućnosti prodaje po izvorima
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Prvi odobreni dopust na popisu bit će postavljen kao zadani odobrenje za ostavljanje.
 DocType: POS Settings,POS Settings,POS postavke
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Svi računi
@@ -7394,7 +7468,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Redak {{0}: Stopa mora biti ista kao {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,FHP-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Stavke zdravstvene službe
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Nije pronađen nijedan zapis
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Raspon starenja 3
 DocType: Vital Signs,Blood Pressure,Krvni tlak
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Cilj je uključen
@@ -7441,6 +7514,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,serije
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,odbrana
 DocType: Item,Has Batch No,Ima serijski br
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Odgođeni dani
 DocType: Lead,Person Name,Ime osobe
 DocType: Item Variant,Item Variant,Varijanta stavke
 DocType: Training Event Employee,Invited,pozvan
@@ -7462,7 +7536,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Početni i završni datumi koji nisu u važećem obračunskom razdoblju, ne mogu izračunati {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Prikazuj Kupca samo tih korisničkih grupa
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Odaberite stavke za spremanje dostavnice
-DocType: Service Level,Resolution Time,Vrijeme rezolucije
+DocType: Service Level Priority,Resolution Time,Vrijeme rezolucije
 DocType: Grading Scale Interval,Grade Description,Opis stupnja
 DocType: Homepage Section,Cards,Kartice
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Zapisnici kvalitete sastanka
@@ -7489,6 +7563,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bilanca bankovnog računa prema glavnoj knjizi
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Zdravstvena zaštita (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Zadano skladište za izradu prodajnog naloga i napomene za isporuku
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Vrijeme odgovora za {0} na indeksu {1} ne može biti veće od vremena rezolucije.
 DocType: Opportunity,Customer / Lead Name,Ime klijenta / voditelja
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Nepotraženi iznos
@@ -7535,7 +7610,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Uvoznice i adrese
 DocType: Item,List this Item in multiple groups on the website.,Navedite ovu stavku u više grupa na web-lokaciji.
 DocType: Request for Quotation,Message for Supplier,Poruka za dobavljača
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Nije moguće promijeniti {0} jer postoji transakcija dionica za stavku {1}.
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Član tima
 DocType: Asset Category Account,Asset Category Account,Račun kategorije imovine
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 35e3476..83d5bcc 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -76,7 +76,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,{0} találkozó és {1} értékesítési számla törlésre került
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Az email címed...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Tartalmazza az alapértelmezett könyvbejegyzéseket
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Tartalmazza az alapértelmezett könyvbejegyzéseket
 DocType: Activity Cost,Activity Type,Tevékenység típusa
 DocType: Purchase Invoice,Get Advances Paid,Kapjon előlegeket
 DocType: Company,Gain/Loss Account on Asset Disposal,Nyereség / veszteség számla az eszközkezelésben
@@ -221,7 +221,9 @@
 DocType: Bank Reconciliation,Payment Entries,Fizetési bejegyzések
 DocType: Employee Education,Class / Percentage,Osztály / százalék
 ,Electronic Invoice Register,Elektronikus számla-nyilvántartás
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Az események száma, amely után a következmény végrehajtódik."
 DocType: Sales Invoice,Is Return (Credit Note),Visszatérés (jóváírás)
+DocType: Price List,Price Not UOM Dependent,Ár nem UOM függő
 DocType: Lab Test Sample,Lab Test Sample,Laboratóriumi vizsgálati minta
 DocType: Shopify Settings,status html,állapot html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Például 2012, 2012-13"
@@ -323,6 +325,7 @@
 DocType: Salary Slip,Net Pay,Nettó fizetés
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Teljes számlázott Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Fogyóeszközök számla külön
+DocType: Shift Type,Working Hours Threshold for Absent,A hiányzó munkaidő küszöbértéke
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},A költségkeretet nem lehet csoportos fiókhoz rendelni {0}
 DocType: Purchase Receipt Item,Rate and Amount,Érték és összeg
@@ -378,7 +381,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Kimeneti beállítások
 DocType: Asset,Insurance End Date,Biztosítás vége
 DocType: Bank Account,Branch Code,Ágazati kód
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Ideje válaszolni
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Felhasználói fórum
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Az eladó és a vevő nem lehet ugyanaz
@@ -596,6 +598,7 @@
 DocType: Share Transfer,Transfer,Átutalás
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Keresési elem (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Eredmény benyújtása
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,"A dátum nem lehet nagyobb, mint a mai napig"
 DocType: Supplier,Supplier of Goods or Services.,Áruk vagy szolgáltatások szállítója.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Új fiók neve. Megjegyzés: Ne hozzon létre fiókot az ügyfelek és a szállítók számára
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,A hallgatói csoport vagy a tanfolyam-lista kötelező
@@ -878,7 +881,6 @@
 DocType: Skill,Skill Name,Képesség név
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Jelentéskártya nyomtatása
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-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-et {0} -ra a Setup&gt; Settings&gt; Naming Series menüpontban"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Támogatási jegyek
 DocType: Asset Category Account,Fixed Asset Account,Fix eszközszámla
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Legújabb
@@ -891,6 +893,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Kötelező a mérleghez
 DocType: Payment Entry,Total Allocated Amount,Összes kiosztott összeg
 DocType: Sales Invoice,Get Advances Received,Get Advances Received
+DocType: Shift Type,Last Sync of Checkin,A Checkin utolsó szinkronja
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Értékben szereplő adóösszeg
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -899,7 +902,9 @@
 DocType: Student,Blood Group,Vércsoport
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Hasznosítsd el az UOM távolságot
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,A bejelentkezés utáni indulás időpontja után eltelt idő (percben) tekinthető.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Fedezd fel
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Nincsenek kiemelkedő számlák
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} üres álláshelyek és {1} költségvetés a {2} számára már a {3} leányvállalatok számára tervezettek. Csak a {4} üres álláshelyeket és a {5} költségvetést tervezheti {6} személyzeti tervre az anyavállalatnál {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Termékkedvezmények
@@ -1000,6 +1005,7 @@
 DocType: Item,Moving Average,Mozgóátlag
 DocType: Employee Attendance Tool,Unmarked Attendance,Jelölés nélküli részvétel
 DocType: Homepage Section,Number of Columns,Oszlopok száma
+DocType: Issue Priority,Issue Priority,Issue Priority
 DocType: Holiday List,Add Weekly Holidays,Heti ünnepek hozzáadása
 DocType: Shopify Log,Shopify Log,Shopify napló
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Fizetéscsomag létrehozása
@@ -1008,6 +1014,7 @@
 DocType: Warranty Claim,Issue Date,Kiadás dátuma
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy {0} tételhez tartozó tételt. Nem található egyetlen tétel, amely megfelel ennek a követelménynek"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,A bal oldali alkalmazottak számára nem hozható létre megtartási bónusz
+DocType: Employee Checkin,Location / Device ID,Hely / eszköz azonosítója
 DocType: Purchase Order,To Receive,Kapni
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Nem fog újratölteni, amíg nincs hálózat."
 DocType: Course Activity,Enrollment,felvétel
@@ -1016,7 +1023,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-számlázási információk hiányoznak
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nincs lényeges kérés
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkkód&gt; Cikkcsoport&gt; Márka
 DocType: Loan,Total Amount Paid,Fizetett összeg
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Mindezek a tételek már számlázásra kerültek
 DocType: Training Event,Trainer Name,Edző neve
@@ -1127,6 +1133,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Kérjük, említsd meg az ólom nevét a (z) {0}"
 DocType: Employee,You can enter any date manually,Bármely dátumot kézzel is beírhatja
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Készletegyeztető tétel
+DocType: Shift Type,Early Exit Consequence,Korai kilépés következménye
 DocType: Item Group,General Settings,Általános beállítások
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Az esedékesség napja nem lehet a kiküldetés / szállítói számla dátuma előtt
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Írja be a Kedvezményezett nevét a beadás előtt.
@@ -1165,6 +1172,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Fizetési visszaigazolás
 ,Available Stock for Packing Items,Rendelkezésre álló készlet csomagolási tételekhez
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},"Kérjük, távolítsa el ezt a számlát {0} a C-űrlapról {1}"
+DocType: Shift Type,Every Valid Check-in and Check-out,Minden érvényes bejelentkezés és kijelentkezés
 DocType: Support Search Source,Query Route String,Lekérdezés útvonala
 DocType: Customer Feedback Template,Customer Feedback Template,Ügyfél visszajelzési sablon
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Idézetek a Vezetőknek vagy az Ügyfeleknek.
@@ -1199,6 +1207,7 @@
 DocType: Authorization Control,Authorization Control,Engedélyezési ellenőrzés
 ,Daily Work Summary Replies,Napi munka összefoglaló válaszok
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Meghívást kaptak a projektben való együttműködésre: {0}
+DocType: Issue,Response By Variance,Válasz variancia
 DocType: Item,Sales Details,Értékesítési részletek
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Levélfejek nyomtatási sablonokhoz.
 DocType: Salary Detail,Tax on additional salary,A további fizetésre kivetett adó
@@ -1322,6 +1331,7 @@
 DocType: Project,Task Progress,Feladat előrehaladása
 DocType: Journal Entry,Opening Entry,Nyitó bejegyzés
 DocType: Bank Guarantee,Charges Incurred,Költségek
+DocType: Shift Type,Working Hours Calculation Based On,Munkaidő-számítás alapja
 DocType: Work Order,Material Transferred for Manufacturing,Gyártásra szánt anyag
 DocType: Products Settings,Hide Variants,Változatok elrejtése
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,A kapacitástervezés és az időkövetés letiltása
@@ -1351,6 +1361,7 @@
 DocType: Guardian,Interests,Interests
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Fogyasztott mennyiség
 DocType: Education Settings,Education Manager,Oktatási igazgató
+DocType: Employee Checkin,Shift Actual Start,Shift tényleges indítás
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,A munkaállomások munkaidőn kívüli időnaplóinak tervezése.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Hűségpontok: {0}
 DocType: Healthcare Settings,Registration Message,Regisztrációs üzenet
@@ -1375,9 +1386,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Az összes számlázási órára már létrehozott számla
 DocType: Sales Partner,Contact Desc,Kapcsolat Desc
 DocType: Purchase Invoice,Pricing Rules,Árképzési szabályok
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel léteznek tranzakciók a {0} tételhez képest, nem módosíthatja a {1} értéket"
 DocType: Hub Tracked Item,Image List,Képlista
 DocType: Item Variant Settings,Allow Rename Attribute Value,Az attribútumérték átnevezésének engedélyezése
-DocType: Price List,Price Not UOM Dependant,Ár nem UOM függő
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Idő (percben)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Alapvető
 DocType: Loan,Interest Income Account,Kamatbevétel számla
@@ -1387,6 +1398,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Válassza ki a POS-profilt
 DocType: Support Settings,Get Latest Query,Legfrissebb lekérdezés
 DocType: Employee Incentive,Employee Incentive,Munkavállalói ösztönzés
+DocType: Service Level,Priorities,prioritások
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Adjon hozzá kártyákat vagy egyedi részeket a honlapon
 DocType: Homepage,Hero Section Based On,Hős szekció alapja
 DocType: Project,Total Purchase Cost (via Purchase Invoice),A teljes vásárlási költség (a vásárlási számlán keresztül)
@@ -1446,7 +1458,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Rendelt mennyiség
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# {0} sor: Elutasított raktár kötelező az {1} elutasított elem ellen
 ,Received Items To Be Billed,Fogadott tételeket kell feltölteni
-DocType: Salary Slip Timesheet,Working Hours,Munkaórák
+DocType: Attendance,Working Hours,Munkaórák
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Fizetési mód
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,A vásárlási megrendelés nem érkezett időben
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Időtartam napokban
@@ -1565,7 +1577,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,A beszállítóval kapcsolatos törvényes információk és egyéb általános információk
 DocType: Item Default,Default Selling Cost Center,Alapértelmezett eladási költségközpont
 DocType: Sales Partner,Address & Contacts,Cím és névjegy
-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 sorozatot a résztvevők számára a Setup&gt; Numbering Series segítségével"
 DocType: Subscriber,Subscriber,Előfizető
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) nincs raktáron
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Először válassza ki a Közzététel dátuma lehetőséget
@@ -1576,7 +1587,7 @@
 DocType: Detected Disease,Tasks Created,Létrehozott feladatok
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Az alapértelmezett BOM-nak ({0}) aktívnak kell lennie ehhez az elemhez vagy annak sablonjához
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,A Bizottság aránya%
-DocType: Service Level,Response Time,Válaszidő
+DocType: Service Level Priority,Response Time,Válaszidő
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce beállítások
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,A mennyiségnek pozitívnak kell lennie
 DocType: Contract,CRM,CRM
@@ -1593,7 +1604,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Tranzakciós adatok leképezése
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,A vezetőnek szüksége van egy személy nevére vagy egy szervezet nevére
 DocType: Student,Guardians,Guardians
-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ónevezési rendszert az oktatásban&gt; Oktatási beállítások"
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Márka kiválasztása ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Közepes bevétel
 DocType: Shipping Rule,Calculate Based On,Számítsa ki az alapértéket
@@ -1630,6 +1640,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},{0} jelenléti rekord létezik a Student {1} ellen
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,A tranzakció dátuma
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Feliratkozás visszavonása
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Nem sikerült beállítani a szolgáltatási szint megállapodást {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Nettó fizetés összege
 DocType: Account,Liability,Felelősség
 DocType: Employee,Bank A/C No.,Bank A / C szám
@@ -1695,7 +1706,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag-kód
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,A vásárlási számla {0} már benyújtott
 DocType: Fees,Student Email,Diák e-mail
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},A BOM rekurzió: {0} nem lehet szülő vagy gyermek {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Elemek beszerzése az egészségügyi szolgáltatásokból
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,A {0} készletrészlet nem kerül benyújtásra
 DocType: Item Attribute Value,Item Attribute Value,Elem attribútum értéke
@@ -1720,7 +1730,6 @@
 DocType: Production Plan,Select Items to Manufacture,Jelölje ki az előállítandó elemeket
 DocType: Leave Application,Leave Approver Name,Hagyja jóvá az engedélyező nevét
 DocType: Shareholder,Shareholder,Részvényes
-DocType: Issue,Agreement Status,Megállapodás állapota
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Alapértelmezett beállítások az ügyletek eladásához.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Kérjük, válassza ki a diákok felvételét, amely a fizetett hallgató számára kötelező"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Válassza a BOM lehetőséget
@@ -1980,6 +1989,7 @@
 DocType: Account,Income Account,Jövedelemszámla
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Minden raktár
 DocType: Contract,Signee Details,Címzett adatai
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Hagyja ki a kijelentkezést a műszak vége után (percben)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Beszerzés
 DocType: Item Group,Check this if you want to show in website,"Ellenőrizze, hogy szeretné-e megjeleníteni a webhelyen"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,A {0} költségvetési év nem található
@@ -2046,6 +2056,7 @@
 DocType: Activity Cost,Billing Rate,Számlázási arány
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Figyelmeztetés: {0} # {1} áll fenn a {2} készletrészlet ellen
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Az útvonalak becsléséhez és optimalizálásához engedélyezze a Google Térkép beállításait
+DocType: Purchase Invoice Item,Page Break,Oldaltörés
 DocType: Supplier Scorecard Criteria,Max Score,Max. Pontszám
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,A visszafizetés kezdő dátuma nem lehet kifizetési dátum előtt.
 DocType: Support Search Source,Support Search Source,Támogatás keresés forrása
@@ -2114,6 +2125,7 @@
 DocType: Employee Transfer,Employee Transfer,Munkavállalói transzfer
 ,Sales Funnel,Értékesítési csatorna
 DocType: Agriculture Analysis Criteria,Water Analysis,Vízelemzés
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Indítsa el a bejelentkezést a műszak kezdete előtt (percben)
 DocType: Accounts Settings,Accounts Frozen Upto,Fagyasztott számlák
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Nincs mit szerkeszteni.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","A {0} művelet hosszabb, mint a munkaállomás {1} rendelkezésre álló munkaideje, a műveletet több műveletre bonthatja"
@@ -2127,7 +2139,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},{0} értékesítési rend {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Késedelmes fizetés (nap)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Adja meg az értékcsökkenés részleteit
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Ügyfél PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,A várt szállítási dátumnak meg kell felelnie az értékesítési rendelés dátumának
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,A tétel mennyisége nem lehet nulla
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Érvénytelen attribútum
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},"Kérjük, válassza a BOM elemet a {0} elemhez képest"
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Számla típusa
@@ -2137,6 +2151,7 @@
 DocType: Volunteer,Afternoon,Délután
 DocType: Vital Signs,Nutrition Values,Táplálkozási értékek
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Láz jelenléte (temp&gt; 38,5 ° C / 101,3 ° F vagy tartós temp&gt; 38 ° C / 100,4 ° F)"
+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ói elnevezési rendszert az emberi erőforrásokban&gt; HR beállítások"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC megfordítva
 DocType: Project,Collect Progress,Gyűjtsön előrehaladást
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energia
@@ -2187,6 +2202,7 @@
 ,Ordered Items To Be Billed,Rendelhető tételek a számlázásra
 DocType: Taxable Salary Slab,To Amount,Összeg
 DocType: Purchase Invoice,Is Return (Debit Note),Visszatérés (Debit Megjegyzés)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Elkezdeni
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Összeolvad
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,A költségvetési év elmentése után a költségvetési év kezdő dátumát és a pénzügyi év végi dátumát nem lehet megváltoztatni.
@@ -2205,8 +2221,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},A karbantartás kezdő dátuma nem lehet a {0} sz.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,{0} sor: Az árfolyam kötelező
 DocType: Purchase Invoice,Select Supplier Address,Válassza a Beszállítói cím lehetőséget
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","A rendelkezésre álló mennyiség {0}, {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,"Kérjük, adja meg az API fogyasztói titkot"
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programbejegyzési díj
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,Garancia lejárati ideje
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel szoba árazás
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Külső adóköteles szállítmányok (nulla minősítésű, nulla minősítésű és mentesített)"
@@ -2266,6 +2284,7 @@
 DocType: Quality Inspection Reading,Reading 5,Olvasás 5
 DocType: Shopping Cart Settings,Display Settings,Megjelenítési beállítások
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,"Kérjük, állítsa be a lefoglalt értékcsökkenések számát"
+DocType: Shift Type,Consequence after,Következmény után
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Mivel kapcsolatban van szükséged segítségre?
 DocType: Journal Entry,Printing Settings,Nyomtatási beállítások
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banki
@@ -2275,6 +2294,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,A számlázási cím megegyezik a Szállítási címvel
 DocType: Account,Cash,Készpénz
 DocType: Employee,Leave Policy,Elhagyási irányelv
+DocType: Shift Type,Consequence,Következmény
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Diák címe
 DocType: GST Account,CESS Account,CESS fiók
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Költségközpont szükséges a „Profit and Loss” fiókhoz {2}. Kérjük, állítson be egy alapértelmezett költségközpontot a vállalat számára."
@@ -2339,6 +2359,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Időszak záró kuponja
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 név
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,"Kérjük, adja meg a költségszámlát"
+DocType: Issue,Resolution By Variance,Felbontás varianciával
 DocType: Employee,Resignation Letter Date,Lemondási levél dátuma
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Részvétel a dátumra
@@ -2351,6 +2372,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Nézd meg most
 DocType: Item Price,Valid Upto,Érvényes
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},A Hivatkozás típusának {0}
+DocType: Employee Checkin,Skip Auto Attendance,Átugrani az automatikus részvételt
 DocType: Payment Request,Transaction Currency,Tranzakció pénzneme
 DocType: Loan,Repayment Schedule,Visszatérítési ütemezés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Készítsen minta-visszatartó készlet bejegyzést
@@ -2422,6 +2444,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS záró utalványadók
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Kezdeményezett művelet
 DocType: POS Profile,Applicable for Users,Alkalmazható a felhasználókra
+,Delayed Order Report,Késleltetett rendelés jelentés
 DocType: Training Event,Exam,Vizsga
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,"Helytelen számú főkönyvi bejegyzés található. Lehet, hogy egy rossz fiókot választott a tranzakcióban."
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Értékesítési csővezeték
@@ -2436,10 +2459,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,A feltételek az összes kiválasztott elemre vonatkoznak.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Beállítás
 DocType: Hotel Room,Capacity,Kapacitás
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Telepített mennyiség
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,{1} {0} tétel {{}} le van tiltva.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelfoglalási felhasználó
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,A munkanap kétszer megismétlődött
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Már létezik a szolgáltatási szint megállapodás a {0} entitás típusával és az {1} entitással.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},A (z) {0} tételhez tartozó elemcsoportban nem említett elemcsoport
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Névhiba: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Terület szükséges a POS profilban
@@ -2485,6 +2509,7 @@
 DocType: Depreciation Schedule,Schedule Date,Ütemezés dátuma
 DocType: Packing Slip,Package Weight Details,A csomag súlya
 DocType: Job Applicant,Job Opening,Üresedés
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Utolsó ismert sikeres munkavállalói ellenőrzés. Ezt csak akkor állítsa vissza, ha biztos abban, hogy az összes napló szinkronizálva van az összes helyről. Kérjük, ne módosítsa ezt, ha nem biztos benne."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tényleges költség
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,A frissített elemváltozatok
 DocType: Item,Batch Number Series,Kötegszám sorozat
@@ -2527,6 +2552,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Get Invocies
 DocType: Tally Migration,Is Day Book Data Imported,A napi könyvadatok importálása
 ,Sales Partners Commission,Értékesítési partnerek Bizottsága
+DocType: Shift Type,Enable Different Consequence for Early Exit,Különböző következmények engedélyezése a korai kilépéshez
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Jogi
 DocType: Loan Application,Required by Date,Kötelező dátum
 DocType: Quiz Result,Quiz Result,Kvíz eredménye
@@ -2586,7 +2612,6 @@
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Nem kötelező szabadnapok listája {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Kérjük, állítsa be a Felhasználói azonosító mezőt az Alkalmazói rekordban az Alkalmazói szerep beállításához"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Ideje megoldani
 DocType: Training Event,Training Event,Képzési esemény
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","A normál nyugalmi vérnyomás egy felnőttnél kb. 120 mmHg szisztolés és 80 mmHg diasztolés, rövidítve &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Ha a határérték nulla, akkor a rendszer beírja az összes bejegyzést."
@@ -2629,6 +2654,7 @@
 DocType: Student Applicant,Approved,Jóváhagyott
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},"A dátumtól a költségvetési éven belül kell lennie. Feltételezve, hogy dátum = {0}"
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,"Kérjük, állítsa be a Szállítói csoportot a Vásárlási beállítások menüben."
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} érvénytelen részvételi állapot.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Ideiglenes nyitószámla
 DocType: Purchase Invoice,Cash/Bank Account,Készpénz / bankszámla
 DocType: Quality Meeting Table,Quality Meeting Table,Minőségi találkozó táblázat
@@ -2664,6 +2690,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Élelmiszer, ital és dohány"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Tanfolyamterv
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Tétel Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,A jelenlét csak a dátum után kerül automatikusan megjelölésre.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,UIN tartókhoz készült kellékek
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Ajánlatkérés
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,"A valutát nem lehet megváltoztatni, ha valaki más pénznemet használ"
@@ -2711,7 +2738,6 @@
 DocType: Item,Is Item from Hub,Az elem a Hubból származik
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Minőségi eljárás.
 DocType: Share Balance,No of Shares,Részvények száma
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),{0} sor: A {4} raktáron {1} nem áll rendelkezésre a bejegyzés időpontjában ({2} {3})
 DocType: Quality Action,Preventive,Megelőző
 DocType: Support Settings,Forum URL,Fórum URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Munkavállaló és részvétel
@@ -2933,7 +2959,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Alapértelmezett adók és díjak
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Ez a szállítóval szembeni tranzakciókon alapul. A részleteket lásd az alábbi idővonalon
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},A munkavállaló {0} maximális juttatási összege meghaladja a {1} -t
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Adja meg a megállapodás kezdő- és befejezési dátumát.
 DocType: Delivery Note Item,Against Sales Invoice,Értékesítési számla ellen
 DocType: Loyalty Point Entry,Purchase Amount,Vásárlási mennyiség
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Nem lehet beállítani a Lost as Sales Order-t.
@@ -2957,7 +2982,7 @@
 DocType: Lead,Organization Name,Szervezet neve
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Az érvényes mezők és érvényes mezők érvényesek a kumulatív értékekhez
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},# {0} sor: A kötegszámnak meg kell egyeznie a {1} {2}
-DocType: Employee,Leave Details,Hagyja a részleteket
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,A {0} előtti tőzsdei tranzakciók befagyasztása
 DocType: Driver,Issuing Date,Kiadási dátum
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Igénylő
@@ -3002,9 +3027,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Cash Flow Mapping sablon részletei
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Toborzás és képzés
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Az automatikus látogatásra vonatkozó türelmi idő beállításai
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,A pénznem és a pénznem között nem lehet ugyanaz
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Gyógyszeripar
 DocType: Employee,HR-EMP-,HR-EMP
+DocType: Service Level,Support Hours,Támogatási órák
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} törlésre vagy zárásra kerül
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,{0} sor: Az Ügyfél előtti előleg hitelnek kell lennie
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Csoport szerinti utalvány (konszolidált)
@@ -3114,6 +3141,7 @@
 DocType: Territory,Territory Manager,Területi menedzser
 DocType: Lab Test,Sample ID,Minta azonosító
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,A kosár üres
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,A jelenlétet az alkalmazottak bejelentkezésekor jelölték meg
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,{0} eszközt kell benyújtani
 ,Absent Student Report,Nincs hallgatói jelentés
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,A bruttó nyereségben szerepel
@@ -3121,7 +3149,9 @@
 DocType: Travel Request Costing,Funded Amount,Támogatott összeg
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nem érkezett be, így a művelet nem fejezhető be"
 DocType: Subscription,Trial Period End Date,Próbaidő vége
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Az IN és OUT bejegyzések váltása ugyanabban a műszakban
 DocType: BOM Update Tool,The new BOM after replacement,Az új BOM csere után
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,5. tétel
 DocType: Employee,Passport Number,Útlevél száma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Ideiglenes nyitás
@@ -3236,6 +3266,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Lehetséges szállító
 ,Issued Items Against Work Order,A munka rendje ellen kiadott tételek
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} Számla létrehozása
+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ónevezési rendszert az oktatásban&gt; Oktatási beállítások"
 DocType: Student,Joining Date,Csatlakozási dátum
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Igénylő webhely
 DocType: Purchase Invoice,Against Expense Account,Költségszámla ellen
@@ -3275,6 +3306,7 @@
 DocType: Landed Cost Item,Applicable Charges,Alkalmazható díjak
 ,Point of Sale,Az értékesítés helyén
 DocType: Authorization Rule,Approving User  (above authorized value),Felhasználó jóváhagyása (engedélyezett érték felett)
+DocType: Service Level Agreement,Entity,Entity
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} összeg átutalása a {2} -ból {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},A (z) {0} ügyfél nem tartozik a {1} projekthez
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,A fél neve
@@ -3321,6 +3353,7 @@
 DocType: Soil Texture,Sand Composition (%),Homokösszetétel (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,A napi könyvadatok importálása
+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-et {0} -ra a Setup&gt; Settings&gt; Naming Series menüpontban"
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,A költségköltség-követelés költségkönyve szükséges
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} érvényes {1} sorozatszámú sorozatszám
@@ -3380,7 +3413,6 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py,Could not solve weighted score function. Make sure the formula is valid.,"Nem sikerült megoldani a súlyozott pontszámot. Győződjön meg róla, hogy a képlet érvényes."
 DocType: Asset,Asset Owner,Eszköz tulajdonos
 DocType: Stock Entry,Total Additional Costs,Összes kiegészítő költség
-DocType: Marketplace Settings,Last Sync On,Utolsó szinkronizálás
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Adjon meg legalább egy sort az Adók és díjak táblázatban
 DocType: Asset Maintenance Team,Maintenance Team Name,Karbantartási csapat neve
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Költségközpontok diagramja
@@ -3396,12 +3428,12 @@
 DocType: Job Card,WIP Warehouse,WIP raktár
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},A (z) {0} alkalmazottnak nem megadott felhasználói azonosítója
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","A rendelkezésre álló mennyiség {0}, {1} szükséges"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,{0} felhasználó létrehozott
 DocType: Stock Settings,Item Naming By,Elem elnevezése
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Rendezett
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"Ez egy root ügyfélcsoport, és nem szerkeszthető."
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,A (z) {0} anyag kérése törlődik vagy leáll
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Szigorúan az alkalmazott Checkin-ben szereplő naplótípus alapján
 DocType: Purchase Order Item Supplied,Supplied Qty,Szállított mennyiség
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,Homok
@@ -3460,6 +3492,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,A tételcsoport táblázatban található ismétlődő elemcsoport
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Éves fizetés
 DocType: Supplier Scorecard,Weighting Function,Súlyfüggvény
+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ó: {2} elemnél
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Hiba a kritérium képlet értékelése során
 ,Lab Test Report,Laboratóriumi vizsgálati jelentés
 DocType: BOM,With Operations,Műveletekkel
@@ -3473,6 +3506,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,A naplóbejegyzéshez nem áll rendelkezésre visszatérítés
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} inaktív diák
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Készítsen tőzsdei bejegyzést
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},A BOM rekurzió: {0} nem lehet {1} szülő vagy gyermek
 DocType: Employee Onboarding,Activities,Tevékenységek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Az Atleast egy raktár kötelező
 ,Customer Credit Balance,Ügyfélhitel egyenlege
@@ -3485,9 +3519,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,"Többszöri hűségprogram az Ügyfél számára. Kérjük, válassza ki kézzel."
 DocType: Patient,Medication,Gyógyszer
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Válassza ki a hűségprogramot
+DocType: Employee Checkin,Attendance Marked,Kijelölt részvétel
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Nyersanyagok
 DocType: Sales Order,Fully Billed,Teljesen számlázott
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Kérjük, állítsa be a Hotel szobaárát {}"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Válasszon csak egy prioritást alapértelmezettként.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},"Kérjük, azonosítson / hozzon létre fiókot (Ledger) típushoz - {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,A teljes hitel- / terhelési összegnek meg kell egyeznie a kapcsolódó naplóbejegyzéssel
 DocType: Purchase Invoice Item,Is Fixed Asset,A fix eszköz
@@ -3508,6 +3544,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Kinevezés megerősítése
 DocType: Shopping Cart Settings,Orders,rendelés
 DocType: HR Settings,Retirement Age,Nyugdíjas kor
+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 sorozatot a résztvevők számára a Setup&gt; Numbering Series segítségével"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Tervezett mennyiség
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Törlés nem megengedett országban {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},# {0} sor: Az {1} eszköz már {2}
@@ -3590,11 +3627,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Könyvelő
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS záró utalvány alreday létezik {0} között a dátum {1} és {2} között
 apps/erpnext/erpnext/config/help.py,Navigating,Navigáció
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Nincs fennálló számla árfolyam-átértékelés
 DocType: Authorization Rule,Customer / Item Name,Ügyfél / elem neve
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Az új sorozatszám nem lehet raktár. A raktárkészletet tőzsdei belépéssel vagy beszerzési nyugtával kell meghatározni
 DocType: Issue,Via Customer Portal,Ügyfélportálon keresztül
 DocType: Work Order Operation,Planned Start Time,Tervezett kezdési idő
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2}
+DocType: Service Level Priority,Service Level Priority,Szolgáltatási szint prioritás
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"A lefoglalt értékcsökkenések száma nem lehet nagyobb, mint az összes értékcsökkenés"
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Ledger megosztása
 DocType: Journal Entry,Accounts Payable,Kifizetendő számlák
@@ -3704,7 +3743,6 @@
 DocType: Delivery Note,Delivery To,Küldemény a részére
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankadatok
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Ütemezett Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,A számlázási órák és a munkaidő megtartása ugyanaz a naplóban
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Vezető források vezetése.
 DocType: Clinical Procedure,Nursing User,Szoptató felhasználó
 DocType: Support Settings,Response Key List,Válaszkulcs-lista
@@ -3872,6 +3910,7 @@
 DocType: Work Order Operation,Actual Start Time,Aktuális kezdési idő
 DocType: Antibiotic,Laboratory User,Laboratóriumi felhasználó
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online aukciók
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,A {0} prioritás megismétlődött.
 DocType: Fee Schedule,Fee Creation Status,Díj létrehozásának állapota
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,szoftverek
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Értékesítési megbízás fizetésre
@@ -3938,6 +3977,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Nem sikerült letölteni az adatokat a {0} számára.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,A számlázási pénznemnek meg kell egyeznie az alapértelmezett vállalati pénznem vagy félszámla pénznemével
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,"Kérjük, adja meg az értékesítési személy munkavállalói azonosítóját"
+DocType: Shift Type,Early Exit Consequence after,Korai kilépés következménye után
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Nyitó értékesítési és vásárlási számlák létrehozása
 DocType: Disease,Treatment Period,Kezelési időszak
 apps/erpnext/erpnext/config/settings.py,Setting up Email,E-mail beállítása
@@ -3955,7 +3995,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Tanuló név:
 DocType: SMS Log,Sent On,Elküldött
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Számla
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,"A válaszidő nem lehet nagyobb, mint a felbontási idő"
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",A kurzus alapú hallgatói csoport esetében a kurzus minden tanuló számára érvényes lesz a beiratkozott kurzusokból a programrögzítés során.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Államon belüli ellátás
 DocType: Employee,Create User Permission,Felhasználói engedély létrehozása
@@ -3994,6 +4033,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Az értékesítés vagy a vásárlás standard szerződéses feltételei.
 DocType: Sales Invoice,Customer PO Details,Ügyfél PO részletei
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,A beteg nem található
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Válassza ki az alapértelmezett prioritást.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Elem eltávolítása, ha a díjak nem vonatkoznak az adott elemre"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Az Ügyfélcsoport azonos névvel rendelkezik, kérjük, változtassa meg az Ügyfél nevét, vagy nevezze át az Ügyfélcsoportot"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4032,6 +4072,7 @@
 DocType: Support Settings,Support Portal,Támogatási portál
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,"A <b>{0}</b> feladat vége nem lehet kevesebb, mint <b>{1}</b> várható kezdő dátum <b>{2}</b>"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},A {0} alkalmazott a (z) {1} helyen van
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Ez a szolgáltatási szintű megállapodás az {0} ügyfélre vonatkozik
 DocType: Employee,Held On,Tartott
 DocType: Healthcare Practitioner,Practitioner Schedules,Gyakorlói ütemezések
 DocType: Project Template Task,Begin On (Days),Kezdje (nap)
@@ -4039,6 +4080,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},A munka rendje {0}
 DocType: Inpatient Record,Admission Schedule Date,Felvételi ütemezés dátuma
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Eszközérték beállítása
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Jelölje be a jelenlétet a „Munkavállalói ellenőrzés” alapján az alkalmazottakra, akiket ez a váltás rendelt."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,A nem regisztrált személyeknek nyújtott termékek
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Minden munkahely
 DocType: Appointment Type,Appointment Type,Kinevezés típusa
@@ -4152,7 +4194,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A csomag bruttó súlya. Általában nettó tömeg + csomagolóanyag tömeg. (nyomtatásra)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratóriumi tesztelés Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,A {0} tétel nem tartalmaz Batch-et
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Értékesítési csővezeték szakaszonként
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Diákcsoport erőssége
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Bankszámla-tranzakciós bejegyzés
 DocType: Purchase Order,Get Items from Open Material Requests,Nyissa meg a nyílt anyagkérelmek elemeit
@@ -4234,7 +4275,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Életkori raktár-bölcsesség
 DocType: Sales Invoice,Write Off Outstanding Amount,Írja le a kiemelkedő összeget
 DocType: Payroll Entry,Employee Details,Munkavállalói adatok
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,"A Start Time nem lehet nagyobb, mint a {0} vége."
 DocType: Pricing Rule,Discount Amount,Kedvezmény mértéke
 DocType: Healthcare Service Unit Type,Item Details,Elem részletei
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js,From Delivery Note,Szállítási megjegyzésből
@@ -4286,7 +4326,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,A nettó fizetés nem lehet negatív
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Az interakciók száma
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},A {0} # tétel {1} sorát nem lehet több mint {2} átvenni a vásárlási megrendelés ellen {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Váltás
+DocType: Attendance,Shift,Váltás
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Számlák és felek feldolgozása
 DocType: Stock Settings,Convert Item Description to Clean HTML,Az elemleírás átalakítása tiszta HTML-re
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Minden szállítócsoport
@@ -4357,6 +4397,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Szülői szerviz egység
 DocType: Sales Invoice,Include Payment (POS),Fizetés (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Magántőke
+DocType: Shift Type,First Check-in and Last Check-out,Első bejelentkezés és utolsó kijelentkezés
 DocType: Landed Cost Item,Receipt Document,Fogadási dokumentum
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Szállítói eredményjelző időszak
 DocType: Employee Grade,Default Salary Structure,Alapértelmezett fizetési struktúra
@@ -4439,6 +4480,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Vásárlási megbízás létrehozása
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Határozza meg a pénzügyi év költségvetését.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,A fiókok nem lehetnek üresek.
+DocType: Employee Checkin,Entry Grace Period Consequence,Belépési türelmi idő következménye
 ,Payment Period Based On Invoice Date,Fizetési időszak a számlázási napon
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},A telepítés dátuma nem lehet a {0} tételhez tartozó szállítási dátum előtt
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Hivatkozás az anyagkérésre
@@ -4447,6 +4489,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},{0} sor: A raktárban már létezik egy átrendezési bejegyzés {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dátum dátuma
 DocType: Monthly Distribution,Distribution Name,Elosztási név
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,A munkanap {0} megismétlődött.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Csoport a nem csoporthoz
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Frissítés folyamatban. Ez eltarthat egy ideig.
 DocType: Item,"Example: ABCD.#####
@@ -4459,6 +4502,7 @@
 DocType: Vehicle Log,Fuel Qty,Üzemanyag-mennyiség
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobil No
 DocType: Invoice Discounting,Disbursed,folyósított
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"A műszak vége után eltelt idő, amely alatt a kijelentkezést figyelembe veszik."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,A számlák nettó változása
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nem elérhető
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Részidő
@@ -4472,7 +4516,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,PDC megjelenítése a Nyomtatásban
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Szállító
 DocType: POS Profile User,POS Profile User,POS profil felhasználó
-DocType: Student,Middle Name,Középső név
 DocType: Sales Person,Sales Person Name,Értékesítési személy neve
 DocType: Packing Slip,Gross Weight,Bruttó súly
 DocType: Journal Entry,Bill No,Bill No
@@ -4481,7 +4524,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-vlog-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Szolgáltatási szint Megállapodás
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,"Kérjük, először válassza az Alkalmazott és a Dátum lehetőséget"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,"Az elemértékelési ráta újraszámításra kerül, figyelembe véve a kirakodott költség utalvány összegét"
 DocType: Timesheet,Employee Detail,Munkavállalói részletek
 DocType: Tally Migration,Vouchers,Az utalványok
@@ -4516,7 +4558,7 @@
 DocType: Additional Salary,Date on which this component is applied,A komponens alkalmazásának dátuma
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Az elérhető részvényesek listája a fóliószámokkal
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Gateway-fiókok beállítása.
-DocType: Service Level,Response Time Period,Válaszidő
+DocType: Service Level Priority,Response Time Period,Válaszidő
 DocType: Purchase Invoice,Purchase Taxes and Charges,Vásárlási adók és díjak
 DocType: Course Activity,Activity Date,Tevékenység dátuma
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Új ügyfél kiválasztása vagy hozzáadása
@@ -4541,6 +4583,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Pénzügyi év
 DocType: Sales Invoice Item,Deferred Revenue,Halasztott bevételek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Az Atleast egyik eladási vagy vásárlási lehetőséget ki kell választani
+DocType: Shift Type,Working Hours Threshold for Half Day,Munkaidő küszöb a félnapra
 ,Item-wise Purchase History,Elem-vásárlási történet
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},A (z) {0} sorban lévő elemre vonatkozó szolgáltatás leállítási dátumát nem lehet megváltoztatni
 DocType: Production Plan,Include Subcontracted Items,Tartalmazza az alvállalkozásba tartozó elemeket
@@ -4572,6 +4615,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Ugyanazon tétel többszörös engedélyezése
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOM létrehozása
 DocType: Healthcare Practitioner,Charges,díjak
+DocType: Employee,Attendance and Leave Details,Részvétel és távozás részletei
 DocType: Student,Personal Details,Személyes adatok
 DocType: Sales Order,Billing and Delivery Status,Számlázási és szállítási státusz
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,{0} sor: A szállítónak {0} az e-mail címre van szükség az e-mail küldéséhez
@@ -4623,7 +4667,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Adja meg a {0} és {1}
 DocType: Purchase Order,Order Confirmation Date,A megrendelés megerősítésének dátuma
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Számítsa ki a becsült érkezési időket
-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ói elnevezési rendszert az emberi erőforrásokban&gt; HR beállítások"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Elfogyasztható
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Előfizetés kezdő dátuma
@@ -4645,7 +4688,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Naplóbejegyzés-fiók
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Változat
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Fórum tevékenység
-DocType: Service Level,Resolution Time Period,Felbontási idő
+DocType: Service Level Priority,Resolution Time Period,Felbontási idő
 DocType: Request for Quotation,Supplier Detail,Beszállítói részletek
 DocType: Project Task,View Task,Feladat megtekintése
 DocType: Serial No,Purchase / Manufacture Details,Vásárlási / gyártási részletek
@@ -4712,6 +4755,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,A raktár csak a tőzsdei bejegyzések / szállítási jegyzetek / vásárlási nyugták segítségével módosítható
 DocType: Support Settings,Close Issue After Days,Zárja be a problémát a napok után
 DocType: Payment Schedule,Payment Schedule,Fizetési ütemterv
+DocType: Shift Type,Enable Entry Grace Period,Belépési türelmi időszak engedélyezése
 DocType: Patient Relation,Spouse,Házastárs
 DocType: Purchase Invoice,Reason For Putting On Hold,A letiltás oka
 DocType: Item Attribute,Increment,Növekedés
@@ -4850,6 +4894,7 @@
 DocType: Vehicle Log,Invoice Ref,Számla ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},A C-űrlap nem érvényes a Számla: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Létrehozott számla
+DocType: Shift Type,Early Exit Grace Period,Korai kilépési türelmi idő
 DocType: Patient Encounter,Review Details,Részletek megtekintése
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,{0} sor: Az óra értékének nullánál nagyobbnak kell lennie.
 DocType: Account,Account Number,Számlaszám
@@ -4861,7 +4906,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Alkalmazható, ha a vállalat SpA, SApA vagy SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Átfedő feltételek:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Fizetett és nem szállított
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Az elemkód kötelező, mert az elem nem számozódik automatikusan"
 DocType: GST HSN Code,HSN Code,HSN kód
 DocType: GSTR 3B Report,September,szeptember
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Igazgatási költségek
@@ -4897,6 +4941,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP-fiók
 DocType: SMS Log,Sender Name,Küldő neve
 DocType: Pricing Rule,Supplier Group,Szállítói csoport
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Az {1} indexben a kezdőnap és a végső idő beállítása {0}
 DocType: Employee,Date of Issue,Kiadás dátuma
 ,Requested Items To Be Transferred,A kért átutalandó elemek
 DocType: Employee,Contract End Date,Szerződés vége
@@ -4907,6 +4953,7 @@
 DocType: Opportunity,Sales Stage,Értékesítési szakasz
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,A Szavakban az értékesítési megbízás mentése után látható lesz.
 DocType: Item Reorder,Re-order Level,Rendezze újra a szintet
+DocType: Shift Type,Enable Auto Attendance,Automatikus részvétel engedélyezése
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Előnyben
 ,Department Analytics,Osztályelemzés
 DocType: Crop,Scientific Name,Tudományos név
@@ -4919,6 +4966,7 @@
 DocType: Quiz Activity,Quiz Activity,Kvíz tevékenység
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} nincs érvényes bérszámfejtési időszakban
 DocType: Timesheet,Billed,A számlázott
+apps/erpnext/erpnext/config/support.py,Issue Type.,Probléma típus.
 DocType: Restaurant Order Entry,Last Sales Invoice,Utolsó értékesítési számla
 DocType: Payment Terms Template,Payment Terms,Fizetési feltételek
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Fenntartva Mennyiség: Eladó, de nem szállított mennyiség."
@@ -5014,6 +5062,7 @@
 DocType: Account,Asset,vagyontárgy
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} nincs egészségügyi szakember ütemezése. Adja hozzá az Egészségügyi szakember mesternek
 DocType: Vehicle,Chassis No,Alvázszám:
+DocType: Employee,Default Shift,Alapértelmezett váltás
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Cég rövidítése
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Anyagjegyzék
 DocType: Article,LMS User,LMS felhasználó
@@ -5062,6 +5111,7 @@
 DocType: Sales Person,Parent Sales Person,Szülői értékesítési személy
 DocType: Student Group Creation Tool,Get Courses,Tanfolyamok
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# {0} sor: A mennyiségnek 1-nek kell lennie, mivel az elem egy állandó eszköz. Kérjük, használja a külön sor több tételt."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Azok a munkaidők, amelyek alatt a hiányzik. (Zero letiltásra)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Csak a levélcsomópontok engedélyezettek a tranzakcióban
 DocType: Grant Application,Organization,Szervezet
 DocType: Fee Category,Fee Category,Díjkategória
@@ -5074,6 +5124,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,"Kérjük, frissítse a képzési esemény állapotát"
 DocType: Volunteer,Morning,Reggel
 DocType: Quotation Item,Quotation Item,Idézet tétel
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Issue Priority.
 DocType: Journal Entry,Credit Card Entry,Hitelkártya bejegyzés
 DocType: Journal Entry Account,If Income or Expense,Ha jövedelem vagy költség
 DocType: Work Order Operation,Work Order Operation,Munkarendelés
@@ -5123,11 +5174,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Adatok importálása és beállítása
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Ha az Automatikus bekapcsolás be van jelölve, akkor az ügyfelek automatikusan kapcsolódnak az érintett hűségprogramhoz (mentve)"
 DocType: Account,Expense Account,Költségszámla
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"A műszak kezdete előtti idő, amely alatt az alkalmazottak bejelentkezését figyelembe veszik."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Kapcsolat a Guardian1-vel
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Számla létrehozása
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},A fizetési kérelem már létezik {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',A {0} -on felszabadult alkalmazottat „Balra” kell állítani
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Fizessen {0} {1}
+DocType: Company,Sales Settings,Értékesítési beállítások
 DocType: Sales Order Item,Produced Quantity,Gyártott mennyiség
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Az ajánlatkérés az alábbi linkre kattintva érhető el
 DocType: Monthly Distribution,Name of the Monthly Distribution,A havi forgalmazás neve
@@ -5206,6 +5259,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Az értékesítés és a vásárlás alapértelmezett adósablonjai jönnek létre.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,A {0} típusú távozás nem továbbítható
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,A terhelésszámlához egy követelés-fióknak kell lennie
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,"A megállapodás vége nem lehet kevesebb, mint ma."
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},"Kérjük, állítsa be a fiókot a {0} raktárban vagy az {1} vállalat alapértelmezett készlet-fiókjában"
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Beállítás alapértelmezettként
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),A csomag nettó súlya. (automatikusan kiszámítva az elemek nettó tömegének összegeként)
@@ -5232,8 +5286,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Lejárt tételek
 DocType: Shipping Rule,Shipping Rule Type,Szállítási szabálytípus
 DocType: Job Offer,Accepted,Elfogadott
-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 dokumentum törléséhez törölje a <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Már értékelte az értékelési kritériumokat {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Válassza a Kötegszámok lehetőséget
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Kor (napok)
@@ -5260,6 +5312,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Válassza ki a domaineket
 DocType: Agriculture Task,Task Name,A feladat neve
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Készletbejegyzések már létrehozva a Megrendeléshez
+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 dokumentum törléséhez törölje a <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat"
 ,Amount to Deliver,Kiszállítandó összeg
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,A {0} cég nem létezik
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nincsenek függőben lévő anyagi kérelmek, amelyek az adott elemekhez kapcsolódnak."
@@ -5309,6 +5363,7 @@
 DocType: Lab Prescription,Test Code,Tesztkód
 DocType: Purchase Taxes and Charges,On Previous Row Total,Az előző sorban összesen
 DocType: Student,Student Email Address,Diák e-mail címe
+,Delayed Item Report,Késleltetett elemjelentés
 DocType: Academic Term,Education,Oktatás
 DocType: Supplier Quotation,Supplier Address,Szállítói cím
 DocType: Salary Detail,Do not include in total,Nem tartalmazhat összesen
@@ -5316,7 +5371,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} nem létezik
 DocType: Purchase Receipt Item,Rejected Quantity,Elutasított mennyiség
 DocType: Cashier Closing,To TIme,Időre
-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ó: {2} elemnél
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Napi munka összefoglaló Csoport felhasználó
 DocType: Fiscal Year Company,Fiscal Year Company,Pénzügyi év társaság
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Az alternatív elem nem lehet azonos az elemkóddal
@@ -5368,6 +5422,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Késleltetés a kézbesítés leállítása között
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Készletek fagyasztása idősebb, mint [napok]"
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Promóciós rendszer termékkedvezménye
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,A probléma prioritás már létezik
 DocType: Account,Asset Received But Not Billed,"Az eszköz kapott, de nem számlázott"
 DocType: POS Closing Voucher,Total Collected Amount,Összesen összegyűjtött összeg
 DocType: Course,Default Grading Scale,Alapértelmezett osztályozási skála
@@ -5410,6 +5465,7 @@
 DocType: Contract,Fulfilment Terms,Teljesítési feltételek
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Nem csoportos csoport
 DocType: Student Guardian,Mother,Anya
+DocType: Issue,Service Level Agreement Fulfilled,A szolgáltatási szintű megállapodás teljesült
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Adó levonása a nem igényelt munkavállalói juttatásokért
 DocType: Travel Request,Travel Funding,Utazási finanszírozás
 DocType: Shipping Rule,Fixed,Rögzített
@@ -5439,10 +5495,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nincs találat.
 DocType: Item Attribute,From Range,A tartományból
 DocType: Clinical Procedure,Consumables,Kellékek
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;workers_field_value&#39; és &#39;timestamp&#39; szükséges.
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia sor #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, a {0} vállalatnál állítsa be az „Eszköz-értékcsökkenési költségközpontot”"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,# {0} sor: A tranzakció befejezéséhez fizetési dokumentum szükséges
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Kattintson erre a gombra, hogy eladja az értékesítési rendelés adatait az Amazon MWS-től."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Munkaidő, amely alatt a félnapot jelölték. (Zero letiltásra)"
 ,Assessment Plan Status,Értékelési terv állapota
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,"Kérjük, először válassza a {0} lehetőséget"
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Küldje el ezt az alkalmazotti rekord létrehozásához
@@ -5513,6 +5571,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Megnyitás beállítása
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Szűrők váltása
 DocType: Production Plan,Material Request Detail,Anyagkérés részletei
+DocType: Shift Type,Process Attendance After,Folyamatos megjelenés után
 DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Lépjen a Programok menübe
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},# {0} sor: Duplikált bejegyzések a {1} {2} hivatkozásokban
@@ -5570,6 +5629,7 @@
 DocType: Pricing Rule,Party Information,Fél információk
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Adósok ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,"A mai napig nem lehet nagyobb, mint a munkavállaló megkönnyebbülésének dátuma"
+DocType: Shift Type,Enable Exit Grace Period,Kilépési türelmi idő engedélyezése
 DocType: Expense Claim,Employees Email Id,Alkalmazottak e-mail azonosítója
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Az ár frissítése a Shopify-től az ERPNext árlistához
 DocType: Healthcare Settings,Default Medical Code Standard,Alapértelmezett orvosi kód szabvány
@@ -5600,7 +5660,6 @@
 DocType: Budget,Applicable on Material Request,Anyagigény esetén alkalmazható
 DocType: Support Settings,Search APIs,Keresés API-k
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Túltermelés Az értékesítési megrendelés százalékos aránya
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Műszaki adatok
 DocType: Purchase Invoice,Supplied Items,Szállított elemek
 DocType: Leave Control Panel,Select Employees,Válassza az Alkalmazottak lehetőséget
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},A {0} hitelben válassza a kamatbevétel-számlát
@@ -5626,7 +5685,7 @@
 ,Supplier-Wise Sales Analytics,Szállító-bölcs értékesítési elemzések
 DocType: GSTR 3B Report,February,február
 DocType: Appraisal,For Employee,Munkavállaló számára
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Aktuális szállítási dátum
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Aktuális szállítási dátum
 DocType: Sales Partner,Sales Partner Name,Értékesítési partner neve
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Értékcsökkenési sor {0}: Az értékcsökkenés kezdő dátuma a múltbeli dátum
 DocType: GST HSN Code,Regional,Regionális
@@ -5665,6 +5724,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Szállítói eredménymutató
 DocType: Travel Itinerary,Travel To,Utazni
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,Határozza meg a bejelentkezést és a kijelentkezést
 DocType: POS Closing Voucher,Difference,Különbség
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Kicsi
 DocType: Work Order Item,Work Order Item,Munkarendelés
@@ -5698,6 +5758,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Drog
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} zárva van
 DocType: Patient,Medical History,Kórtörténet
+DocType: Expense Claim,Expense Taxes and Charges,Költségek és díjak
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,A számlázási dátumot követő napok száma az előfizetés visszavonása vagy az előfizetés meg nem fizetése után
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,A {0} telepítési megjegyzést már benyújtották
 DocType: Patient Relation,Family,Család
@@ -5730,7 +5791,6 @@
 DocType: Dosage Strength,Strength,Erő
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{2} {1} egységre volt szükség a (z) {2} lépésben a tranzakció befejezéséhez.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Az alvállalkozás alapjául szolgáló nyersanyagok visszafolyása
-DocType: Bank Guarantee,Customer,Vevő
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ha engedélyezve van, akkor az Akadémiai kifejezés mező kötelező lesz a programrögzítő eszközben."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",A Batch alapú hallgatói csoport esetében a Student Batch-et minden diák számára érvényesíteni fogják a programrögzítésből.
 DocType: Course,Topics,Témakörök
@@ -5810,6 +5870,7 @@
 DocType: Chapter,Chapter Members,Fejezet tagjai
 DocType: Warranty Claim,Service Address,Szolgáltatás címe
 DocType: Journal Entry,Remark,Megjegyzés
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),{0} sor: A {4} raktárban {1} nem elérhető mennyiség a bejegyzés időpontjában ({2} {3})
 DocType: Patient Encounter,Encounter Time,Encounter Time
 DocType: Serial No,Invoice Details,Számla részletei
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","További fiókok készíthetők a Csoportok alatt, de a bejegyzések a nem csoportok ellen is végrehajthatók"
@@ -5888,6 +5949,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Zárás (nyitás + összesen)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kritérium képlet
 apps/erpnext/erpnext/config/support.py,Support Analytics,Támogassa az Analytics szolgáltatást
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Részvételi eszköz azonosítója (biometrikus / RF címkeazonosító)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Felülvizsgálat és cselekvés
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a fiók befagyott, a bejegyzések korlátozhatók a felhasználók számára."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Az érték az értékcsökkenés után
@@ -5909,6 +5971,7 @@
 DocType: Salary Slip,Loan Repayment,Kölcsön visszafizetés
 DocType: Employee Education,Major/Optional Subjects,Főbb / választható tárgyak
 DocType: Soil Texture,Silt,Iszap
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Szállítói címek és kapcsolattartók
 DocType: Bank Guarantee,Bank Guarantee Type,Bankgarancia típusa
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ha letiltja, a &quot;Lekerekített teljes&quot; mező nem lesz látható minden tranzakcióban"
 DocType: Pricing Rule,Min Amt,Min
@@ -5947,6 +6010,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Számla létrehozásának eszköz megnyitása
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Tartalmazza a POS tranzakciókat
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Nincs az alkalmazott alkalmazottja az adott munkatárs mezőértékénél. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Fogadott összeg (vállalati pénznem)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","A LocalStorage tele van, nem mentett"
 DocType: Chapter Member,Chapter Member,Fejezet tagja
@@ -5979,6 +6043,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nincsenek diákcsoportok.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},A (z) {0} sor azonos példányával {1}
 DocType: Employee,Salary Details,Fizetés részletei
+DocType: Employee Checkin,Exit Grace Period Consequence,Kilépés a Grace Period következményéből
 DocType: Bank Statement Transaction Invoice Item,Invoice,Számla
 DocType: Special Test Items,Particulars,adatok
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,"Kérjük, állítson be szűrőt az elem vagy raktár alapján"
@@ -6080,6 +6145,7 @@
 DocType: Serial No,Out of AMC,Ki az AMC-ből
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkahelyi profil, szükséges képesítések stb."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,A hajó az államba
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Szeretné benyújtani az anyagi kérelmet
 DocType: Opportunity Item,Basic Rate,Alapkamat
 DocType: Compensatory Leave Request,Work End Date,Munka vége
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Nyersanyagok kérése
@@ -6263,6 +6329,7 @@
 DocType: Sales Order Item,Gross Profit,Bruttó profit
 DocType: Quality Inspection,Item Serial No,Tétel Sorozatszám
 DocType: Asset,Insurer,Biztosító
+DocType: Employee Checkin,OUT,KI
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Összeg vásárlása
 DocType: Asset Maintenance Task,Certificate Required,Tanúsítvány szükséges
 DocType: Retention Bonus,Retention Bonus,Megtartási bónusz
@@ -6378,6 +6445,8 @@
 DocType: Invoice Discounting,Sanctioned,szentesített
 DocType: Course Enrollment,Course Enrollment,A tanfolyam beiratkozása
 DocType: Item,Supplier Items,Szállítói elemek
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",A kezdési idő nem lehet nagyobb vagy egyenlő a végső idővel ({0}).
 DocType: Sales Order,Not Applicable,Nem alkalmazható
 DocType: Support Search Source,Response Options,Válaszbeállítások
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} értéke 0 és 100 között legyen
@@ -6463,7 +6532,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Befektetett eszközök
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Teljes kereset
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Ügyfélcsoport&gt; Terület
 DocType: Share Balance,From No,Nem
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Fizetési egyeztetési számla
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és díjak hozzáadva
@@ -6571,6 +6639,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Az árszabályozás figyelmen kívül hagyása
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Élelmiszer
 DocType: Lost Reason Detail,Lost Reason Detail,Elveszett ok: részlet
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},A következő sorozatszámokat hozta létre: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Vásárlói visszajelzés
 DocType: Serial No,Warranty / AMC Details,Garancia / AMC részletek
 DocType: Issue,Opening Time,Nyitvatartási idő
@@ -6620,6 +6689,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,A cég neve nem azonos
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Az alkalmazottak promóciója nem nyújtható be a promóciós dátum előtt
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},A {0} -nél régebbi állományi tranzakciók nem frissíthetők
+DocType: Employee Checkin,Employee Checkin,Alkalmazott ellenőrzése
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},"A kezdő dátumnak kevesebbnek kell lennie, mint a {0} tétel végnapja"
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Ügyfél-idézetek létrehozása
 DocType: Buying Settings,Buying Settings,Vásárlási beállítások
@@ -6641,6 +6711,7 @@
 DocType: Patient,Patient Demographics,Beteg demográfia
 DocType: Share Transfer,To Folio No,Folio Nem
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Pénzforgalom a műveletekből
+DocType: Employee Checkin,Log Type,Napló típusa
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,A tételek egyike sem változik a mennyiségben vagy értékben.
 DocType: Asset,Purchase Date,Vásárlás időpontja
@@ -6685,6 +6756,7 @@
 DocType: Vital Signs,Very Hyper,Nagyon hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Válassza ki a vállalkozás jellegét.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,"Kérjük, válassza ki a hónapot és az évet"
+DocType: Service Level,Default Priority,Alapértelmezett prioritás
 DocType: Student Log,Student Log,Diáknapló
 DocType: Shopping Cart Settings,Enable Checkout,Checkout engedélyezése
 apps/erpnext/erpnext/config/settings.py,Human Resources,Emberi Erőforrások
@@ -6713,7 +6785,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Csatlakoztassa a Shopify-t az ERPNext segítségével
 DocType: Homepage Section Card,Subtitle,Felirat
 DocType: Soil Texture,Loam,Agyag
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Szállító típusa
 DocType: BOM,Scrap Material Cost(Company Currency),Hulladék anyagköltsége (vállalati pénznem)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,A {0} szállítási megjegyzés nem nyújtható be
 DocType: Task,Actual Start Date (via Time Sheet),Aktuális kezdési dátum (idő szerint)
@@ -6769,6 +6840,7 @@
 DocType: Drug Prescription,Dosage,Adagolás
 DocType: Cheque Print Template,Starting position from top edge,Első pozíció a felső széltől
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Kinevezési időtartam (perc)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ez a munkavállaló már rendelkezik egy azonos időbélyegzővel rendelkező naplóval. {0}
 DocType: Accounting Dimension,Disable,Kikapcsolja
 DocType: Email Digest,Purchase Orders to Receive,A megrendelések beszerzése
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,A Productions rendelések nem hozhatók fel:
@@ -6784,7 +6856,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Alvállalkozásra átruházott anyag
 DocType: Job Card,Timing Detail,Időzítési részletek
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Szükséges Be
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} {1} importálása
 DocType: Job Offer Term,Job Offer Term,Állásajánlat
 DocType: SMS Center,All Contact,Minden kapcsolat
 DocType: Project Task,Project Task,Projekt feladat
@@ -6835,7 +6906,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,A (z) {0} tétel nincs beállítva a sorszámokhoz
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Államtól
 DocType: Leave Type,Maximum Continuous Days Applicable,A maximális folytonos napok alkalmazhatók
-apps/erpnext/erpnext/config/support.py,Support Team.,Támogatói csoport.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,"Kérjük, adja meg először a cég nevét"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Sikeres importálás
 DocType: Guardian,Alternate Number,Alternatív szám
@@ -6927,6 +6997,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,# {0} sor: Az elem hozzáadva
 DocType: Student Admission,Eligibility and Details,Jogosultság és részletek
 DocType: Staffing Plan,Staffing Plan Detail,Személyzeti terv részletei
+DocType: Shift Type,Late Entry Grace Period,Késői belépési idő
 DocType: Email Digest,Annual Income,Éves jövedelem
 DocType: Journal Entry,Subscription Section,Előfizetési rész
 DocType: Salary Slip,Payment Days,Fizetési napok
@@ -6977,6 +7048,7 @@
 DocType: Journal Entry Account,Account Balance,Számlaegyenleg
 DocType: Asset Maintenance Log,Periodicity,időszakosság
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Orvosi karton
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,A napló típusa a műszakba való belépéshez szükséges: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Végrehajtás
 DocType: Item,Valuation Method,Értékelési módszer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} eladási számla ellen {1}
@@ -7061,6 +7133,7 @@
 DocType: Loan Type,Loan Name,Hitelnév
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Alapértelmezett fizetési mód beállítása
 DocType: Quality Goal,Revision,Felülvizsgálat
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"A kijelentkezés befejezésének időpontja, amikor a kijelentés korai (percben) tekinthető."
 DocType: Healthcare Service Unit,Service Unit Type,Szervizegység típusa
 DocType: Purchase Invoice,Return Against Purchase Invoice,Visszatérés a vásárlási számla ellen
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Titkosítás létrehozása
@@ -7216,12 +7289,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,kozmetikum
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Ellenőrizze ezt, ha arra kényszeríti a felhasználót, hogy mentés előtt válasszon egy sorozatot. Ha ezt ellenőrzi, nem lesz alapértelmezett."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Az ilyen szerepkörrel rendelkező felhasználók fagyasztott számlákat állíthatnak be, és a befagyasztott számlákkal szembeni könyvelési bejegyzéseket hozhatnak létre vagy módosíthatnak"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkkód&gt; Cikkcsoport&gt; Márka
 DocType: Expense Claim,Total Claimed Amount,Összes igényelt összeg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},A {1} művelet következő {0} napja nem találja meg a Time Slot-ot
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Csomagolás
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Csak akkor lehet megújítani, ha a tagság 30 napon belül lejár"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Az értéknek {0} és {1} között kell lennie
 DocType: Quality Feedback,Parameters,paraméterek
+DocType: Shift Type,Auto Attendance Settings,Automatikus részvételi beállítások
 ,Sales Partner Transaction Summary,Értékesítési partner tranzakciók összefoglalása
 DocType: Asset Maintenance,Maintenance Manager Name,Karbantartási kezelő neve
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Szükség van az elemadatok letöltésére.
@@ -7312,10 +7387,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Érvényesített szabály érvényesítése
 DocType: Job Card Item,Job Card Item,Munkakártya elem
 DocType: Homepage,Company Tagline for website homepage,Tagline a cég honlapjára
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Állítsa be a {1} prioritás válaszidejét és felbontását az {1} indexben.
 DocType: Company,Round Off Cost Center,Költségköltség-központ
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteria Súly
 DocType: Asset,Depreciation Schedules,Értékcsökkenési ütemezések
-DocType: Expense Claim Detail,Claim Amount,Követelés összege
 DocType: Subscription,Discounts,kedvezmények
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás szabályai
 DocType: Subscription,Cancelation Date,Törlés dátuma
@@ -7343,7 +7418,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Nulla értékek megjelenítése
 DocType: Employee Onboarding,Employee Onboarding,Alkalmazott Onboarding
 DocType: POS Closing Voucher,Period End Date,Időszak vége
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Értékesítési lehetőségek forrás szerint
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Az első Leave Approver a listában lesz az alapértelmezett Leave Approver.
 DocType: POS Settings,POS Settings,POS beállítások
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Minden fiók
@@ -7364,7 +7438,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# {0} sor: Az aránynak meg kell egyeznie a {1}: {2} ({3} / {4}) értékkel
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Egészségügyi szolgáltatások
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Nincs találat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Öregítési tartomány 3
 DocType: Vital Signs,Blood Pressure,Vérnyomás
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Cél be
@@ -7409,6 +7482,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,sarzsok
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Védelem
 DocType: Item,Has Batch No,Van kötegelt száma
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Késleltetett napok
 DocType: Lead,Person Name,Személy neve
 DocType: Item Variant,Item Variant,Elem Változat
 DocType: Training Event Employee,Invited,Meghívott
@@ -7430,7 +7504,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","A kezdő és befejező dátumok nem érvényesek a bérszámfejtési időszakban, nem számíthatják ki a {0} értéket."
 DocType: POS Profile,Only show Customer of these Customer Groups,Csak az Ügyfélcsoportot jelenítse meg
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Válassza ki az elemeket a számla mentéséhez
-DocType: Service Level,Resolution Time,Felbontási idő
+DocType: Service Level Priority,Resolution Time,Felbontási idő
 DocType: Grading Scale Interval,Grade Description,Grade Leírás
 DocType: Homepage Section,Cards,kártyák
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Minőségi találkozó jegyzőkönyv
@@ -7457,6 +7531,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,A bankszámlakivonat egyenlege a főkötelezettel
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Egészségügy (béta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Az alapértelmezett raktár az értékesítési megrendelés és a szállítási megjegyzés létrehozásához
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,"Az {1} indexnél a {0} válaszidő nem lehet nagyobb, mint a felbontási idő."
 DocType: Opportunity,Customer / Lead Name,Ügyfél / Vezetéknév
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Nem igényelt összeg
@@ -7503,7 +7578,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Felek és címek importálása
 DocType: Item,List this Item in multiple groups on the website.,Sorolja fel ezt az elemet a weboldal több csoportjában.
 DocType: Request for Quotation,Message for Supplier,Üzenet a szállítónak
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"Nem lehet módosítani a {0} -ot, mivel az {1} tételnél a tőzsdei tranzakció létezik."
 DocType: Healthcare Practitioner,Phone (R),Telefon (R)
 DocType: Maintenance Team Member,Team Member,Csapat tagja
 DocType: Asset Category Account,Asset Category Account,Eszközkategória-fiók
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 2fb1a48..8e2fcef 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Pengangkatan {0} dan Faktur Penjualan {1} dibatalkan
 DocType: Purchase Receipt,Vehicle Number,Nomor kendaraan
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Alamat email anda...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Sertakan Entri Buku Default
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Sertakan Entri Buku Default
 DocType: Activity Cost,Activity Type,Tipe kegiatan
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka
 DocType: Company,Gain/Loss Account on Asset Disposal,Keuntungan / Kerugian Akun pada Pembuangan Aset
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Entri Pembayaran
 DocType: Employee Education,Class / Percentage,Kelas / Persentase
 ,Electronic Invoice Register,Daftar Faktur Elektronik
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Jumlah kemunculan setelah konsekuensi dijalankan.
 DocType: Sales Invoice,Is Return (Credit Note),Is Return (Credit Note)
+DocType: Price List,Price Not UOM Dependent,Harga Tidak Tergantung UOM
 DocType: Lab Test Sample,Lab Test Sample,Sampel Uji Lab
 DocType: Shopify Settings,status html,status html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Untuk mis. 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Gaji bersih
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Total Faktur Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Faktur Habis Terpisah
+DocType: Shift Type,Working Hours Threshold for Absent,Ambang Jam Kerja untuk Absen
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat ditetapkan terhadap Akun Grup {0}
 DocType: Purchase Receipt Item,Rate and Amount,Nilai dan Jumlah
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Pengaturan Pasien Keluar
 DocType: Asset,Insurance End Date,Tanggal Akhir Asuransi
 DocType: Bank Account,Branch Code,Kode cabang
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Saatnya Menanggapi
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Forum Pengguna
 DocType: Landed Cost Item,Landed Cost Item,Item Biaya Darat
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Penjual dan pembeli tidak bisa sama
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Transfer
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Cari Item (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Hasil dikirimkan
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Dari tanggal tidak boleh lebih dari dari Tanggal
 DocType: Supplier,Supplier of Goods or Services.,Pemasok Barang atau Layanan.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nama Akun baru. Catatan: Tolong jangan membuat akun untuk Pelanggan dan Pemasok
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Kelompok Siswa atau Jadwal Kursus adalah wajib
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,nama skill
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Cetak Kartu Laporan
 DocType: Soil Texture,Ternary Plot,Plot Ternary
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Tiket Dukungan
 DocType: Asset Category Account,Fixed Asset Account,Akun Aset Tetap
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Terbaru
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Wajib Untuk Neraca
 DocType: Payment Entry,Total Allocated Amount,Jumlah Alokasi Total
 DocType: Sales Invoice,Get Advances Received,Dapatkan Uang Muka Diterima
+DocType: Shift Type,Last Sync of Checkin,Sinkronisasi Checkin Terakhir
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Jumlah Pajak Barang Termasuk dalam Nilai
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Golongan darah
 apps/erpnext/erpnext/config/healthcare.py,Masters,Tuan
 DocType: Crop,Crop Spacing UOM,Potong spasi UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Waktu setelah shift mulai waktu ketika check-in dianggap terlambat (dalam menit).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Jelajahi
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Tidak ditemukan faktur luar biasa
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} lowongan dan {1} anggaran untuk {2} sudah direncanakan untuk anak perusahaan dari {3}. \ Anda hanya dapat merencanakan hingga {4} lowongan dan anggaran {5} sesuai rencana penempatan karyawan {6} untuk perusahaan induk {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Potongan Diskon Produk
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Rata-rata bergerak
 DocType: Employee Attendance Tool,Unmarked Attendance,Kehadiran Tanpa Tanda
 DocType: Homepage Section,Number of Columns,Jumlah kolom
+DocType: Issue Priority,Issue Priority,Prioritas Masalah
 DocType: Holiday List,Add Weekly Holidays,Tambahkan Liburan Mingguan
 DocType: Shopify Log,Shopify Log,Log Shopify
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Buat Slip Gaji
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Tanggal rilis
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch untuk Item {0}. Tidak dapat menemukan bets tunggal yang memenuhi persyaratan ini
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Tidak dapat membuat Bonus Retensi untuk Karyawan kiri
+DocType: Employee Checkin,Location / Device ID,Lokasi / ID Perangkat
 DocType: Purchase Order,To Receive,Menerima
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat ulang sampai Anda memiliki jaringan.
 DocType: Course Activity,Enrollment,Pendaftaran
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maks: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informasi E-Faktur Tidak Ada
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Tidak ada permintaan materi yang dibuat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 DocType: Loan,Total Amount Paid,Jumlah Total yang Dibayar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Semua barang ini sudah ditagih
 DocType: Training Event,Trainer Name,Nama Pelatih
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Sebutkan Nama Timbal dalam Timbal {0}
 DocType: Employee,You can enter any date manually,Anda dapat memasukkan tanggal apa pun secara manual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item Rekonsiliasi Saham
+DocType: Shift Type,Early Exit Consequence,Konsekuensi Keluar Awal
 DocType: Item Group,General Settings,Pengaturan Umum
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Tanggal Jatuh Tempo tidak boleh sebelum Posting / Tanggal Faktur Pemasok
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Masukkan nama Penerima sebelum mengajukan.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Konfirmasi pembayaran
 ,Available Stock for Packing Items,Stok yang tersedia untuk Barang Packing
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Hapus Faktur ini {0} dari Formulir-C {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Setiap check-in dan check-out yang valid
 DocType: Support Search Source,Query Route String,String Rute Kueri
 DocType: Customer Feedback Template,Customer Feedback Template,Templat Umpan Balik Pelanggan
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Kutipan untuk Pemimpin atau Pelanggan.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,Kontrol Otorisasi
 ,Daily Work Summary Replies,Balasan Ringkasan Pekerjaan Harian
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi dalam proyek: {0}
+DocType: Issue,Response By Variance,Respon Berdasarkan Varians
 DocType: Item,Sales Details,Rincian Penjualan
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Kepala Surat untuk template cetak.
 DocType: Salary Detail,Tax on additional salary,Pajak atas gaji tambahan
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Kemajuan Tugas
 DocType: Journal Entry,Opening Entry,Membuka entri
 DocType: Bank Guarantee,Charges Incurred,Biaya yang Ditimbulkan
+DocType: Shift Type,Working Hours Calculation Based On,Perhitungan Jam Kerja Berdasarkan
 DocType: Work Order,Material Transferred for Manufacturing,Material Ditransfer untuk Manufaktur
 DocType: Products Settings,Hide Variants,Sembunyikan Varian
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Nonaktifkan Perencanaan Kapasitas dan Pelacakan Waktu
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,Minat
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Dikonsumsi Qty
 DocType: Education Settings,Education Manager,Manajer Pendidikan
+DocType: Employee Checkin,Shift Actual Start,Pergeseran Mulai Aktual
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Merencanakan log waktu di luar Jam Kerja Workstation.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Poin Loyalitas: {0}
 DocType: Healthcare Settings,Registration Message,Pesan Pendaftaran
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Faktur sudah dibuat untuk semua jam penagihan
 DocType: Sales Partner,Contact Desc,Hubungi Desc
 DocType: Purchase Invoice,Pricing Rules,Aturan Harga
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi terhadap item {0} yang ada, Anda tidak dapat mengubah nilai {1}"
 DocType: Hub Tracked Item,Image List,Daftar Gambar
 DocType: Item Variant Settings,Allow Rename Attribute Value,Izinkan Ganti Nama Nilai Atribut
-DocType: Price List,Price Not UOM Dependant,Harga Tidak Tergantung UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Waktu (dalam menit)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Dasar
 DocType: Loan,Interest Income Account,Akun Pendapatan Bunga
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Pilih Profil POS
 DocType: Support Settings,Get Latest Query,Dapatkan Pertanyaan Terbaru
 DocType: Employee Incentive,Employee Incentive,Insentif Karyawan
+DocType: Service Level,Priorities,Prioritas
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Tambahkan kartu atau bagian khusus di beranda
 DocType: Homepage,Hero Section Based On,Bagian Pahlawan Berdasarkan
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (melalui Faktur Pembelian)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Jumlah yang Dipesan
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Baris # {0}: Gudang yang Ditolak adalah wajib terhadap Barang yang ditolak {1}
 ,Received Items To Be Billed,Barang Yang Diterima Akan Ditagih
-DocType: Salary Slip Timesheet,Working Hours,Jam kerja
+DocType: Attendance,Working Hours,Jam kerja
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Mode Pembayaran
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Pembelian Barang Pesanan tidak diterima tepat waktu
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Durasi dalam Days
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Info hukum dan informasi umum lainnya tentang Pemasok Anda
 DocType: Item Default,Default Selling Cost Center,Pusat Biaya Penjualan Default
 DocType: Sales Partner,Address & Contacts,Alamat &amp; Kontak
-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: Subscriber,Subscriber,Pelanggan
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Formulir / Item / {0}) sudah habis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Silakan pilih tanggal posting terlebih dahulu
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,Tugas Dibuat
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) harus aktif untuk item ini atau templatnya
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Tingkat Komisi%
-DocType: Service Level,Response Time,Waktu merespon
+DocType: Service Level Priority,Response Time,Waktu merespon
 DocType: Woocommerce Settings,Woocommerce Settings,Pengaturan Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Kuantitas harus positif
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Pemetaan Data Transaksi
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Pimpinan membutuhkan nama seseorang atau nama organisasi
 DocType: Student,Guardians,Penjaga
-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/public/js/stock_analytics.js,Select Brand...,Pilih Merek ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Pendapatan Menengah
 DocType: Shipping Rule,Calculate Based On,Hitung Berdasarkan
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Catatan Kehadiran {0} ada terhadap Siswa {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Tanggal Transaksi
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Batalkan Berlangganan
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Tidak Dapat Menetapkan Perjanjian Tingkat Layanan {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Jumlah Gaji Bersih
 DocType: Account,Liability,Kewajiban
 DocType: Employee,Bank A/C No.,A / C Bank No.
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kode Item Bahan Baku
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah dikirimkan
 DocType: Fees,Student Email,Email Pelajar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Rekursi BOM: {0} tidak boleh orang tua atau anak dari {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Dapatkan Barang dari Layanan Kesehatan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Entri Saham {0} tidak dikirimkan
 DocType: Item Attribute Value,Item Attribute Value,Nilai Atribut Barang
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,Pilih Item untuk Diproduksi
 DocType: Leave Application,Leave Approver Name,Tinggalkan Nama Approver
 DocType: Shareholder,Shareholder,Pemegang saham
-DocType: Issue,Agreement Status,Status Perjanjian
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Pengaturan default untuk transaksi penjualan.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Silakan pilih Penerimaan Siswa yang wajib untuk pelamar siswa yang dibayar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Pilih BOM
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,Akun Penghasilan
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Semua Gudang
 DocType: Contract,Signee Details,Detail Penerima
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Izinkan check-out setelah waktu akhir shift (dalam menit)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Pembelian
 DocType: Item Group,Check this if you want to show in website,Periksa ini jika Anda ingin tampil di situs web
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Tahun Anggaran {0} tidak ditemukan
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,Tingkat Penagihan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Peringatan: Lain {0} # {1} ada terhadap entri persediaan {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Harap aktifkan Pengaturan Google Maps untuk memperkirakan dan mengoptimalkan rute
+DocType: Purchase Invoice Item,Page Break,Istirahat Halaman
 DocType: Supplier Scorecard Criteria,Max Score,Skor Maks
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Tanggal Mulai Pembayaran tidak bisa sebelum Tanggal Pencairan.
 DocType: Support Search Source,Support Search Source,Mendukung Sumber Pencarian
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,Transfer Karyawan
 ,Sales Funnel,Corong Penjualan
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisis Air
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Mulai check-in sebelum waktu mulai shift (dalam menit)
 DocType: Accounts Settings,Accounts Frozen Upto,Akun Frozen Hingga
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Tidak ada yang bisa diedit.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama dari jam kerja yang tersedia di workstation {1}, memecah operasi menjadi beberapa operasi"
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Sales Order {0} adalah {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Keterlambatan pembayaran (Hari)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Masukkan detail penyusutan
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO pelanggan
 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/controllers/accounts_controller.py,Item quantity can not be zero,Kuantitas barang tidak boleh nol
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Atribut tidak valid
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Silakan pilih BOM terhadap item {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Jenis Faktur
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,Sore
 DocType: Vital Signs,Nutrition Values,Nilai Gizi
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Adanya demam (suhu&gt; 38,5 ° C / 101,3 ° F atau suhu berkelanjutan&gt; 38 ° C / 100,4 ° F)"
+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
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Terbalik
 DocType: Project,Collect Progress,Kumpulkan Kemajuan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energi
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,Barang Yang Dipesan Akan Ditagih
 DocType: Taxable Salary Slab,To Amount,Jumlah
 DocType: Purchase Invoice,Is Return (Debit Note),Is Return (Catatan Debit)
+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/config/desktop.py,Getting Started,Mulai
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Menggabungkan
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Tidak dapat mengubah Tanggal Mulai Tahun Fiskal dan Tanggal Akhir Tahun Fiskal setelah Tahun Fiskal disimpan.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak boleh sebelum tanggal pengiriman untuk Nomor Seri {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Baris {0}: Nilai Tukar wajib diisi
 DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pemasok
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Kuantitas yang tersedia adalah {0}, Anda perlu {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Silakan masukkan Rahasia Konsumen API
 DocType: Program Enrollment Fee,Program Enrollment Fee,Biaya Pendaftaran Program
+DocType: Employee Checkin,Shift Actual End,Pergeseran Akhir Aktual
 DocType: Serial No,Warranty Expiry Date,Tanggal Berakhir Garansi
 DocType: Hotel Room Pricing,Hotel Room Pricing,Harga Kamar Hotel
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Persediaan kena pajak keluar (selain dari nilai nol, nilai nol dan dikecualikan"
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,Membaca 5
 DocType: Shopping Cart Settings,Display Settings,Pengaturan tampilan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Harap setel Jumlah Penyusutan yang Dipesan
+DocType: Shift Type,Consequence after,Konsekuensi setelahnya
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Anda butuh bantuan apa?
 DocType: Journal Entry,Printing Settings,Pengaturan Pencetakan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Perbankan
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Alamat Penagihan sama dengan Alamat Pengiriman
 DocType: Account,Cash,Kas
 DocType: Employee,Leave Policy,Kebijakan Cuti
+DocType: Shift Type,Consequence,Konsekuensi
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Alamat Pelajar
 DocType: GST Account,CESS Account,Akun CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Pusat Biaya diperlukan untuk akun &#39;Untung dan Rugi&#39; {2}. Harap siapkan Pusat Biaya default untuk Perusahaan.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Voucher Penutupan Periode
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Nama Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Silakan masukkan Akun Biaya
+DocType: Issue,Resolution By Variance,Resolusi oleh Varians
 DocType: Employee,Resignation Letter Date,Tanggal Surat Pengunduran Diri
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Lihat sekarang
 DocType: Item Price,Valid Upto,Berlaku hingga
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},DOCTYPE Referensi harus salah satu dari {0}
+DocType: Employee Checkin,Skip Auto Attendance,Lewati Kehadiran Otomatis
 DocType: Payment Request,Transaction Currency,Transaksi mata uang
 DocType: Loan,Repayment Schedule,Jadwal pembayaran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Buat Sampel Stok Retensi Sampel
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Pajak Voucher Penutupan POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Tindakan diinisialisasi
 DocType: POS Profile,Applicable for Users,Berlaku untuk Pengguna
+,Delayed Order Report,Laporan Pesanan Tertunda
 DocType: Training Event,Exam,Ujian
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Jumlah Entri Buku Besar yang salah ditemukan. Anda mungkin telah memilih Akun yang salah dalam transaksi.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Jalur Penjualan
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Ketentuan akan diterapkan pada semua item yang dipilih digabungkan.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigurasikan
 DocType: Hotel Room,Capacity,Kapasitas
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Batch {0} dari Item {1} dinonaktifkan.
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Reservasi Hotel
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Hari kerja telah diulang dua kali
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Perjanjian Tingkat Layanan dengan Jenis Entitas {0} dan Entitas {1} sudah ada.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Grup Barang tidak disebutkan dalam master item untuk item {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Kesalahan nama: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Wilayah Diperlukan dalam Profil POS
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,Tanggal Jadwal
 DocType: Packing Slip,Package Weight Details,Rincian Berat Paket
 DocType: Job Applicant,Job Opening,Lowongan pekerjaan
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Sinkronisasi Checkin Karyawan Yang Terakhir Diketahui Berhasil. Setel ulang ini hanya jika Anda yakin bahwa semua Log disinkronkan dari semua lokasi. Tolong jangan modifikasi ini jika Anda tidak yakin.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Harga asli
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Uang muka total ({0}) terhadap Pesanan {1} tidak boleh lebih besar dari Jumlah Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Varian Item diperbarui
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Dapatkan Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Apakah Data Buku Hari Diimpor
 ,Sales Partners Commission,Komisi Mitra Penjualan
+DocType: Shift Type,Enable Different Consequence for Early Exit,Aktifkan Konsekuensi Berbeda untuk Keluar Awal
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Hukum
 DocType: Loan Application,Required by Date,Diperlukan oleh Tanggal
 DocType: Quiz Result,Quiz Result,Hasil Kuis
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Daftar Hari Libur Pilihan tidak ditetapkan untuk periode cuti {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Harap setel bidang ID Pengguna di catatan Karyawan untuk mengatur Peran Karyawan
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Waktu untuk menyelesaikan
 DocType: Training Event,Training Event,Acara Pelatihan
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Tekanan darah istirahat normal pada orang dewasa adalah sekitar 120 mmHg sistolik, dan 80 mmHg diastolik, disingkat &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Sistem akan mengambil semua entri jika nilai batasnya nol.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,Disetujui
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Dari Tanggal harus dalam Tahun Anggaran. Dengan asumsi Dari Tanggal = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Silakan Tetapkan Grup Pemasok di Pengaturan Pembelian.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} adalah Status Kehadiran yang tidak valid.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Rekening Pembukaan Sementara
 DocType: Purchase Invoice,Cash/Bank Account,Uang Tunai / Rekening Bank
 DocType: Quality Meeting Table,Quality Meeting Table,Tabel Rapat Kualitas
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Jadwal Kuliah
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Rincian Pajak Barang Bijaksana
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Kehadiran akan ditandai secara otomatis hanya setelah tanggal ini.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Persediaan dibuat untuk pemegang UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Permintaan Kutipan
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Mata uang tidak dapat diubah setelah membuat entri menggunakan mata uang lain
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,Apakah Barang dari Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Prosedur Mutu.
 DocType: Share Balance,No of Shares,Tidak Ada Saham
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Baris {0}: Jumlah tidak tersedia untuk {4} di gudang {1} pada waktu posting entri ({2} {3})
 DocType: Quality Action,Preventive,Pencegahan
 DocType: Support Settings,Forum URL,URL forum
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Karyawan dan Kehadiran
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Pajak dan Biaya Default
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Ini didasarkan pada transaksi terhadap Pemasok ini. Lihat garis waktu di bawah untuk detailnya
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Jumlah manfaat maksimum karyawan {0} melebihi {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Masukkan Tanggal Mulai dan Akhir untuk Perjanjian.
 DocType: Delivery Note Item,Against Sales Invoice,Terhadap Faktur Penjualan
 DocType: Loyalty Point Entry,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang karena Pesanan Penjualan dibuat.
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,Nama Organisasi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Valid dari dan bidang upto yang valid wajib untuk kumulatif
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Baris # {0}: Batch No harus sama dengan {1} {2}
-DocType: Employee,Leave Details,Tinggalkan Detail
+DocType: Employee Checkin,Shift Start,Shift Mulai
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Transaksi stok sebelum {0} dibekukan
 DocType: Driver,Issuing Date,Tanggal terbit
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Pemohon
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Rincian Template Pemetaan Arus Kas
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Rekrutmen dan Pelatihan
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Pengaturan Periode Rahmat Untuk Kehadiran Otomatis
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Dari Mata Uang dan Ke Mata Uang tidak bisa sama
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Obat-obatan
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Jam Dukungan
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} dibatalkan atau ditutup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Baris {0}: Uang muka terhadap Pelanggan harus berupa kredit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Kelompok berdasarkan Voucher (Konsolidasi)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,Manajer Wilayah
 DocType: Lab Test,Sample ID,ID Sampel
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Troli Kosong
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Kehadiran telah ditandai sesuai dengan check-in karyawan
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Aset {0} harus diserahkan
 ,Absent Student Report,Laporan Siswa Absen
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Termasuk dalam Laba Kotor
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,Jumlah yang didanai
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} belum dikirimkan sehingga tindakan tidak dapat diselesaikan
 DocType: Subscription,Trial Period End Date,Tanggal Berakhir Periode Uji Coba
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Entri bergantian sebagai IN dan OUT selama shift yang sama
 DocType: BOM Update Tool,The new BOM after replacement,BOM baru setelah penggantian
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Butir 5
 DocType: Employee,Passport Number,Nomor paspor
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Pembukaan sementara
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Kemungkinan Pemasok
 ,Issued Items Against Work Order,Item yang Diterbitkan Melawan Perintah Kerja
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Membuat {0} Faktur
+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
 DocType: Student,Joining Date,Tanggal Bergabung
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Situs yang Meminta
 DocType: Purchase Invoice,Against Expense Account,Terhadap Akun Biaya
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,Biaya yang Berlaku
 ,Point of Sale,Titik penjualan
 DocType: Authorization Rule,Approving User  (above authorized value),Menyetujui Pengguna (di atas nilai resmi)
+DocType: Service Level Agreement,Entity,Kesatuan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} ke {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik proyek {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Dari Nama Pesta
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),Komposisi Pasir (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Impor Data Buku Hari
+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
 DocType: Asset,Asset Owner Company,Perusahaan Pemilik Aset
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Pusat biaya diperlukan untuk memesan klaim pengeluaran
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} no seri yang valid untuk Item {1}
@@ -3399,7 +3432,6 @@
 DocType: Asset,Asset Owner,Pemilik Aset
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Gudang wajib untuk Barang stok {0} berturut-turut {1}
 DocType: Stock Entry,Total Additional Costs,Total Biaya Tambahan
-DocType: Marketplace Settings,Last Sync On,Sinkronisasi Terakhir Aktif
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Harap setel setidaknya satu baris di Tabel Pajak dan Biaya
 DocType: Asset Maintenance Team,Maintenance Team Name,Nama Tim Pemeliharaan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Bagan Pusat Biaya
@@ -3415,12 +3447,12 @@
 DocType: Job Card,WIP Warehouse,Gudang WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID Pengguna tidak ditetapkan untuk Karyawan {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Jumlah yang tersedia adalah {0}, Anda perlu {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Pengguna {0} dibuat
 DocType: Stock Settings,Item Naming By,Penamaan Item Berdasarkan
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Dipesan
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ini adalah grup pelanggan root dan tidak dapat diedit.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Permintaan Material {0} dibatalkan atau dihentikan
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Ketat berdasarkan pada Jenis Log di Checkin Karyawan
 DocType: Purchase Order Item Supplied,Supplied Qty,Disediakan Qty
 DocType: Cash Flow Mapper,Cash Flow Mapper,Mapper Arus Kas
 DocType: Soil Texture,Sand,Pasir
@@ -3479,6 +3511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Grup item duplikat ditemukan di tabel grup item
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Gaji tahunan
 DocType: Supplier Scorecard,Weighting Function,Fungsi pembobotan
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Kesalahan mengevaluasi rumus kriteria
 ,Lab Test Report,Laporan Uji Lab
 DocType: BOM,With Operations,Dengan Operasi
@@ -3492,6 +3525,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Tidak ada pembayaran untuk Entri Jurnal
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} adalah siswa tidak aktif
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Masuk Stock
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Rekursi BOM: {0} tidak boleh orang tua atau anak dari {1}
 DocType: Employee Onboarding,Activities,Kegiatan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Minimal satu gudang adalah wajib
 ,Customer Credit Balance,Saldo Kredit Pelanggan
@@ -3504,9 +3538,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Berbagai Program Loyalitas ditemukan untuk Pelanggan. Silakan pilih secara manual.
 DocType: Patient,Medication,Obat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Pilih Program Loyalitas
+DocType: Employee Checkin,Attendance Marked,Kehadiran Ditandai
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Bahan baku
 DocType: Sales Order,Fully Billed,Ditagih penuh
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Harap tetapkan Tarif Kamar Hotel pada {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Pilih hanya satu Prioritas sebagai Default.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Harap identifikasi / buat Akun (Buku Besar) untuk tipe - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Jumlah Kredit / Debit Total harus sama dengan Entri Jurnal yang ditautkan
 DocType: Purchase Invoice Item,Is Fixed Asset,Apakah Aset Tetap
@@ -3527,6 +3563,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Konfirmasi perjanjian
 DocType: Shopping Cart Settings,Orders,Pesanan
 DocType: HR Settings,Retirement Age,Umur pensiun
+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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Proyeksi qty
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Penghapusan tidak diizinkan untuk negara {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Baris # {0}: Aset {1} sudah {2}
@@ -3610,11 +3647,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Akuntan
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Voucher Penutupan POS sudah ada untuk {0} antara tanggal {1} dan {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Menjelajahi
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Tidak ada faktur terutang yang membutuhkan penilaian kembali nilai tukar
 DocType: Authorization Rule,Customer / Item Name,Nama Pelanggan / Barang
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Seri Baru tidak boleh memiliki Gudang. Gudang harus diatur oleh Stok Masuk atau Tanda Terima Pembelian
 DocType: Issue,Via Customer Portal,Melalui Portal Pelanggan
 DocType: Work Order Operation,Planned Start Time,Waktu Mulai yang Direncanakan
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} adalah {2}
+DocType: Service Level Priority,Service Level Priority,Prioritas Tingkat Layanan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan yang Dipesan tidak boleh lebih dari Jumlah Jumlah Penyusutan
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Bagikan Buku Besar
 DocType: Journal Entry,Accounts Payable,Akun hutang
@@ -3725,7 +3764,6 @@
 DocType: Delivery Note,Delivery To,Pengiriman ke
 DocType: Bank Statement Transaction Settings Item,Bank Data,Data Bank
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Dijadwalkan hingga
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Pertahankan Jam Penagihan dan Jam Kerja Sama di Absen
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Lacak Petunjuk berdasarkan Sumber Utama.
 DocType: Clinical Procedure,Nursing User,Pengguna Perawatan
 DocType: Support Settings,Response Key List,Daftar Kunci Respons
@@ -3893,6 +3931,7 @@
 DocType: Work Order Operation,Actual Start Time,Waktu Mulai Aktual
 DocType: Antibiotic,Laboratory User,Pengguna Laboratorium
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Lelang Online
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Prioritas {0} telah diulang.
 DocType: Fee Schedule,Fee Creation Status,Status Pembuatan Biaya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Perangkat lunak
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Pesanan Penjualan hingga Pembayaran
@@ -3959,6 +3998,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Tidak dapat mengambil informasi untuk {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Mata uang penagihan harus sama dengan mata uang perusahaan default atau mata uang akun pihak
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Silakan masukkan ID Karyawan tenaga penjualan ini
+DocType: Shift Type,Early Exit Consequence after,Konsekuensi Keluar Awal setelah
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Buat Pembukaan Penjualan dan Pembelian Faktur
 DocType: Disease,Treatment Period,Masa Perawatan
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Menyiapkan Email
@@ -3976,7 +4016,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Nama siswa:
 DocType: SMS Log,Sent On,Dikirim pada
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Faktur penjualan
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Waktu Respons tidak boleh lebih besar dari Waktu Resolusi
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Untuk Kelompok Siswa berbasis Kursus, Kursus akan divalidasi untuk setiap Siswa dari Kursus yang terdaftar dalam Pendaftaran Program."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Persediaan Antar Negara
 DocType: Employee,Create User Permission,Buat Izin Pengguna
@@ -4015,6 +4054,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Ketentuan kontrak standar untuk Penjualan atau Pembelian.
 DocType: Sales Invoice,Customer PO Details,Detail PO Pelanggan
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pasien tidak ditemukan
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Pilih Prioritas Default.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Hapus item jika biaya tidak berlaku untuk item itu
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Grup Pelanggan ada dengan nama yang sama silakan ubah nama Pelanggan atau ganti nama Grup Pelanggan
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4054,6 +4094,7 @@
 DocType: Support Settings,Support Portal,Portal Dukungan
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Tanggal akhir tugas <b>{0}</b> tidak boleh kurang dari <b>{1}</b> tanggal mulai yang diharapkan <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Karyawan {0} sedang cuti pada {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Perjanjian Tingkat Layanan ini khusus untuk Pelanggan {0}
 DocType: Employee,Held On,Diadakan pada
 DocType: Healthcare Practitioner,Practitioner Schedules,Jadwal Praktisi
 DocType: Project Template Task,Begin On (Days),Mulai Pada (Hari)
@@ -4061,6 +4102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Perintah Kerja telah {0}
 DocType: Inpatient Record,Admission Schedule Date,Tanggal Jadwal Pendaftaran
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Penyesuaian Nilai Aset
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Tandai kehadiran berdasarkan &#39;Checkin Karyawan&#39; untuk Karyawan yang ditugaskan dalam shift ini.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Persediaan dibuat untuk Orang Tidak Terdaftar
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Semua Pekerjaan
 DocType: Appointment Type,Appointment Type,Jenis janji temu
@@ -4174,7 +4216,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Biasanya berat bersih + berat bahan kemasan. (untuk cetak)
 DocType: Plant Analysis,Laboratory Testing Datetime,Datetime Pengujian Laboratorium
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Jalur Penjualan berdasarkan Tahap
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Kekuatan Kelompok Mahasiswa
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Entri Transaksi Laporan Bank
 DocType: Purchase Order,Get Items from Open Material Requests,Dapatkan Barang dari Permintaan Material Terbuka
@@ -4256,7 +4297,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Tampilkan Aging Warehouse-wise
 DocType: Sales Invoice,Write Off Outstanding Amount,Hapuskan Jumlah Luar Biasa
 DocType: Payroll Entry,Employee Details,Detail Karyawan
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Waktu Mulai tidak boleh lebih dari Waktu Akhir untuk {0}.
 DocType: Pricing Rule,Discount Amount,Jumlah diskon
 DocType: Healthcare Service Unit Type,Item Details,Rincian Barang
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Deklarasi Pajak Duplikat dari {0} untuk periode {1}
@@ -4309,7 +4349,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Pembayaran bersih tidak boleh negatif
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Tidak ada Interaksi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Baris {0} # Item {1} tidak dapat ditransfer lebih dari {2} terhadap Purchase Order {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Bergeser
+DocType: Attendance,Shift,Bergeser
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Memproses Bagan Akun dan Pihak
 DocType: Stock Settings,Convert Item Description to Clean HTML,Konversi Keterangan Item ke Bersihkan HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Semua Grup Pemasok
@@ -4380,6 +4420,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Unit Layanan Induk
 DocType: Sales Invoice,Include Payment (POS),Sertakan Pembayaran (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Ekuitas Pribadi
+DocType: Shift Type,First Check-in and Last Check-out,Check-in Pertama dan Check-out Terakhir
 DocType: Landed Cost Item,Receipt Document,Dokumen Penerimaan
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Periode Kartu Skor Pemasok
 DocType: Employee Grade,Default Salary Structure,Struktur Gaji Default
@@ -4462,6 +4503,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Buat Pesanan Pembelian
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Tentukan anggaran untuk satu tahun keuangan.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Tabel akun tidak boleh kosong.
+DocType: Employee Checkin,Entry Grace Period Consequence,Konsekuensi Masa Tenggang Masuk
 ,Payment Period Based On Invoice Date,Periode Pembayaran Berdasarkan Tanggal Faktur
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Tanggal pemasangan tidak boleh sebelum tanggal pengiriman untuk Barang {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Tautan ke Permintaan Material
@@ -4470,6 +4512,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri pemesanan ulang sudah ada untuk gudang ini {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Tanggal Dok
 DocType: Monthly Distribution,Distribution Name,Nama Distribusi
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Hari kerja {0} telah diulang.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Grup ke Non-Grup
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Pembaruan sedang berlangsung. Mungkin butuh beberapa saat.
 DocType: Item,"Example: ABCD.#####
@@ -4482,6 +4525,7 @@
 DocType: Vehicle Log,Fuel Qty,Jumlah Bahan Bakar
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Dicairkan
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Waktu setelah akhir shift dimana check-out dipertimbangkan untuk hadir.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Perubahan Bersih dalam Hutang
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Tidak tersedia
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Paruh waktu
@@ -4495,7 +4539,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Tampilkan PDC dalam Cetak
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Pemasok Shopify
 DocType: POS Profile User,POS Profile User,Pengguna Profil POS
-DocType: Student,Middle Name,Nama tengah
 DocType: Sales Person,Sales Person Name,Nama Tenaga Penjual
 DocType: Packing Slip,Gross Weight,Berat kotor
 DocType: Journal Entry,Bill No,RUU No
@@ -4504,7 +4547,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Persetujuan tingkat layanan
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Silakan pilih Karyawan dan Tanggal terlebih dahulu
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Nilai penilaian barang dihitung ulang dengan mempertimbangkan jumlah voucher biaya darat
 DocType: Timesheet,Employee Detail,Detail Karyawan
 DocType: Tally Migration,Vouchers,Voucher
@@ -4539,7 +4581,7 @@
 DocType: Additional Salary,Date on which this component is applied,Tanggal komponen ini diterapkan
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Daftar Pemegang Saham yang tersedia dengan nomor folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Siapkan akun Gateway.
-DocType: Service Level,Response Time Period,Periode Waktu Respons
+DocType: Service Level Priority,Response Time Period,Periode Waktu Respons
 DocType: Purchase Invoice,Purchase Taxes and Charges,Beli Pajak dan Tagihan
 DocType: Course Activity,Activity Date,Tanggal Aktivitas
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Pilih atau tambahkan pelanggan baru
@@ -4564,6 +4606,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Tahun Keuangan
 DocType: Sales Invoice Item,Deferred Revenue,Pendapatan tangguhan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Setidaknya salah satu Jual atau Beli harus dipilih
+DocType: Shift Type,Working Hours Threshold for Half Day,Ambang Batas Jam Kerja untuk Setengah Hari
 ,Item-wise Purchase History,Riwayat Pembelian barang-bijaksana
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Tidak dapat mengubah Tanggal Berhenti Layanan untuk item dalam baris {0}
 DocType: Production Plan,Include Subcontracted Items,Sertakan Item yang Disubkontrakkan
@@ -4596,6 +4639,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Izinkan Item Sama Beberapa Kali
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Buat BOM
 DocType: Healthcare Practitioner,Charges,Biaya
+DocType: Employee,Attendance and Leave Details,Detail Kehadiran dan Cuti
 DocType: Student,Personal Details,Data pribadi
 DocType: Sales Order,Billing and Delivery Status,Status Penagihan dan Pengiriman
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Baris {0}: Untuk pemasok {0} Alamat Email diperlukan untuk mengirim email
@@ -4647,7 +4691,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Masukkan nilai antara {0} dan {1}
 DocType: Purchase Order,Order Confirmation Date,Tanggal Konfirmasi Pemesanan
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Hitung perkiraan waktu kedatangan
-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
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Dikonsumsi
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Tanggal Mulai Berlangganan
@@ -4670,7 +4713,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Akun Entri Jurnal
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Varian
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Kegiatan Forum
-DocType: Service Level,Resolution Time Period,Periode Waktu Resolusi
+DocType: Service Level Priority,Resolution Time Period,Periode Waktu Resolusi
 DocType: Request for Quotation,Supplier Detail,Detail Pemasok
 DocType: Project Task,View Task,Lihat Tugas
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Pembuatan
@@ -4737,6 +4780,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya dapat diubah melalui Stock Entry / Delivery Note / Kwitansi Pembelian
 DocType: Support Settings,Close Issue After Days,Tutup Masalah Setelah Hari
 DocType: Payment Schedule,Payment Schedule,Jadwal pembayaran
+DocType: Shift Type,Enable Entry Grace Period,Aktifkan Periode Rahmat Masuk
 DocType: Patient Relation,Spouse,Pasangan
 DocType: Purchase Invoice,Reason For Putting On Hold,Alasan Menunda
 DocType: Item Attribute,Increment,Kenaikan
@@ -4876,6 +4920,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref Faktur
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},Formulir-C tidak berlaku untuk Faktur: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Faktur Dibuat
+DocType: Shift Type,Early Exit Grace Period,Periode Grace Keluar Awal
 DocType: Patient Encounter,Review Details,Detail Ulasan
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Baris {0}: Nilai jam harus lebih besar dari nol.
 DocType: Account,Account Number,Nomor rekening
@@ -4887,7 +4932,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Berlaku jika perusahaannya adalah SpA, SApA atau SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Kondisi yang tumpang tindih ditemukan antara:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Dibayar dan Tidak Terkirim
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Kode Barang adalah wajib karena Barang tidak diberi nomor secara otomatis
 DocType: GST HSN Code,HSN Code,Kode HSN
 DocType: GSTR 3B Report,September,September
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Biaya Administrasi
@@ -4923,6 +4967,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Akun CWIP
 DocType: SMS Log,Sender Name,Nama pengirim
 DocType: Pricing Rule,Supplier Group,Grup Pemasok
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Tetapkan Waktu Mulai dan Waktu Berakhir untuk \ Hari Dukungan {0} di indeks {1}.
 DocType: Employee,Date of Issue,Tanggal pengeluaran
 ,Requested Items To Be Transferred,Barang yang Diminta Akan Ditransfer
 DocType: Employee,Contract End Date,Tanggal Berakhir Kontrak
@@ -4933,6 +4979,7 @@
 DocType: Opportunity,Sales Stage,Tahap Penjualan
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Words akan terlihat setelah Anda menyimpan Sales Order.
 DocType: Item Reorder,Re-order Level,Tingkat Pemesanan Ulang
+DocType: Shift Type,Enable Auto Attendance,Aktifkan Kehadiran Otomatis
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Pilihan
 ,Department Analytics,Departemen Analisis
 DocType: Crop,Scientific Name,Nama ilmiah
@@ -4945,6 +4992,7 @@
 DocType: Quiz Activity,Quiz Activity,Kegiatan Kuis
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} tidak dalam Periode Penggajian yang valid
 DocType: Timesheet,Billed,Ditagih
+apps/erpnext/erpnext/config/support.py,Issue Type.,Jenis Masalah.
 DocType: Restaurant Order Entry,Last Sales Invoice,Faktur Penjualan Terakhir
 DocType: Payment Terms Template,Payment Terms,Syarat pembayaran
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Jumlah Pesanan: Jumlah dipesan untuk dijual, tetapi tidak dikirim."
@@ -5040,6 +5088,7 @@
 DocType: Account,Asset,Aset
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} tidak memiliki Jadwal Praktisi Kesehatan. Tambahkan di master Praktisi Kesehatan
 DocType: Vehicle,Chassis No,Nomor rangka
+DocType: Employee,Default Shift,Pergeseran Default
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Singkatan Perusahaan
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Pohon Bill of Material
 DocType: Article,LMS User,Pengguna LMS
@@ -5088,6 +5137,7 @@
 DocType: Sales Person,Parent Sales Person,Sales Orang Tua
 DocType: Student Group Creation Tool,Get Courses,Dapatkan Kursus
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Baris # {0}: Jumlah harus 1, karena item adalah aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Jam kerja di bawah ini Absen ditandai. (Nol untuk menonaktifkan)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Hanya node daun yang diizinkan dalam transaksi
 DocType: Grant Application,Organization,Organisasi
 DocType: Fee Category,Fee Category,Kategori Biaya
@@ -5100,6 +5150,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Perbarui status Anda untuk acara pelatihan ini
 DocType: Volunteer,Morning,Pagi
 DocType: Quotation Item,Quotation Item,Item Kutipan
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Prioritas Masalah.
 DocType: Journal Entry,Credit Card Entry,Entri Kartu Kredit
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Slot waktu terlewati, slot {0} ke {1} tumpang tindih slot yang ada {2} ke {3}"
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
@@ -5150,11 +5201,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Impor dan Pengaturan Data
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Jika Keikutsertaan Otomatis dicentang, maka pelanggan akan secara otomatis ditautkan dengan Program Loyalitas yang bersangkutan (saat penyimpanan)"
 DocType: Account,Expense Account,Rekening pengeluaran
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Waktu sebelum shift dimulai saat di mana Karyawan Masuk dianggap hadir.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Hubungan dengan Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Buat Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Permintaan Pembayaran sudah ada {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Karyawan yang merasa lega pada {0} harus ditetapkan sebagai &#39;Kiri&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Bayar {0} {1}
+DocType: Company,Sales Settings,Pengaturan Penjualan
 DocType: Sales Order Item,Produced Quantity,Kuantitas yang Diproduksi
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Permintaan penawaran dapat diakses dengan mengklik tautan berikut
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
@@ -5233,6 +5286,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Templat pajak default untuk penjualan dan pembelian dibuat.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Tipe Leave {0} tidak dapat diteruskan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Akun Debit Ke harus merupakan akun Piutang
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Tanggal Akhir Perjanjian tidak boleh kurang dari hari ini.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Harap setel Akun di Gudang {0} atau Akun Inventaris Default di Perusahaan {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Ditetapkan sebagai default
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Berat bersih paket ini. (dihitung secara otomatis sebagai jumlah berat bersih barang)
@@ -5259,8 +5313,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Gelombang Kedaluwarsa
 DocType: Shipping Rule,Shipping Rule Type,Jenis Aturan Pengiriman
 DocType: Job Offer,Accepted,Diterima
-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","Silakan hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Anda telah menilai kriteria penilaian {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Pilih Nomor Batch
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Umur (Hari)
@@ -5287,6 +5339,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Pilih Domain Anda
 DocType: Agriculture Task,Task Name,Nama tugas
 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/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Silakan hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 ,Amount to Deliver,Jumlah yang Dikirimkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Perusahaan {0} tidak ada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Tidak ada Permintaan Bahan yang tertunda yang ditemukan untuk menautkan item yang diberikan.
@@ -5336,6 +5390,7 @@
 DocType: Lab Prescription,Test Code,Kode Uji
 DocType: Purchase Taxes and Charges,On Previous Row Total,Total Baris Sebelumnya
 DocType: Student,Student Email Address,Alamat Email Siswa
+,Delayed Item Report,Laporan Item Tertunda
 DocType: Academic Term,Education,pendidikan
 DocType: Supplier Quotation,Supplier Address,Alamat Pemasok
 DocType: Salary Detail,Do not include in total,Jangan memasukkan secara total
@@ -5343,7 +5398,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} tidak ada
 DocType: Purchase Receipt Item,Rejected Quantity,Kuantitas yang Ditolak
 DocType: Cashier Closing,To TIme,Untuk waktu
-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: Daily Work Summary Group User,Daily Work Summary Group User,Ringkasan Grup Pengguna Harian
 DocType: Fiscal Year Company,Fiscal Year Company,Perusahaan Tahun Anggaran
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Item alternatif tidak boleh sama dengan kode item
@@ -5395,6 +5449,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Keterlambatan antar penghentian pengiriman
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bekukan Saham Yang Lebih Tua Dari [Hari]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Diskon Produk Skema Promosi
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Prioritas Masalah Sudah Ada
 DocType: Account,Asset Received But Not Billed,Aset Diterima Tapi Tidak Ditagih
 DocType: POS Closing Voucher,Total Collected Amount,Jumlah Yang Dikumpulkan Total
 DocType: Course,Default Grading Scale,Skala Grading Default
@@ -5437,6 +5492,7 @@
 DocType: Contract,Fulfilment Terms,Ketentuan Pemenuhan
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Grup ke Grup
 DocType: Student Guardian,Mother,Ibu
+DocType: Issue,Service Level Agreement Fulfilled,Perjanjian Tingkat Layanan Terpenuhi
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Pengurangan Pajak Untuk Imbalan Kerja yang Tidak Diklaim
 DocType: Travel Request,Travel Funding,Pendanaan Perjalanan
 DocType: Shipping Rule,Fixed,Tetap
@@ -5466,10 +5522,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Tidak ada barang yang ditemukan.
 DocType: Item Attribute,From Range,Dari Range
 DocType: Clinical Procedure,Consumables,Habis
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; dan &#39;timestamp&#39; diperlukan.
 DocType: Purchase Taxes and Charges,Reference Row #,Baris Referensi #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Silakan setel &#39;Pusat Biaya Penyusutan Aset&#39; di Perusahaan {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Baris # {0}: Dokumen pembayaran diperlukan untuk menyelesaikan transaksi
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Klik tombol ini untuk menarik data Pesanan Penjualan Anda dari Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Jam kerja di bawah setengah Hari ditandai. (Nol untuk menonaktifkan)
 ,Assessment Plan Status,Status Rencana Penilaian
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Silakan pilih {0} pertama
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Kirim ini untuk membuat catatan Karyawan
@@ -5540,6 +5598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Setel Terbuka
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Toggle Filter
 DocType: Production Plan,Material Request Detail,Detail Permintaan Material
+DocType: Shift Type,Process Attendance After,Proses Kehadiran Setelah
 DocType: Material Request Item,Quantity and Warehouse,Kuantitas dan Gudang
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Buka Program
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Baris # {0}: Entri duplikat dalam Referensi {1} {2}
@@ -5597,6 +5656,7 @@
 DocType: Pricing Rule,Party Information,Informasi Pesta
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debitur ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Sampai saat ini tidak boleh lebih besar dari tanggal pelepasan karyawan
+DocType: Shift Type,Enable Exit Grace Period,Aktifkan Periode Grace Keluar
 DocType: Expense Claim,Employees Email Id,Id Email Karyawan
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Perbarui Harga dari Shopify Ke Daftar Harga ERPNext
 DocType: Healthcare Settings,Default Medical Code Standard,Standar Kode Medis Standar
@@ -5627,7 +5687,6 @@
 DocType: Budget,Applicable on Material Request,Berlaku berdasarkan Permintaan Material
 DocType: Support Settings,Search APIs,API pencarian
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Persentase Kelebihan Produksi Untuk Pesanan Penjualan
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Spesifikasi
 DocType: Purchase Invoice,Supplied Items,Barang yang Disediakan
 DocType: Leave Control Panel,Select Employees,Pilih Karyawan
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Pilih akun pendapatan bunga dalam pinjaman {0}
@@ -5653,7 +5712,7 @@
 ,Supplier-Wise Sales Analytics,Analisis Penjualan yang Bijaksana-Pemasok
 DocType: GSTR 3B Report,February,Februari
 DocType: Appraisal,For Employee,Untuk Karyawan
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Tanggal Pengiriman Aktual
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Tanggal Pengiriman Aktual
 DocType: Sales Partner,Sales Partner Name,Nama Mitra Penjualan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Depresiasi Baris {0}: Tanggal Mulai Penyusutan dimasukkan sebagai tanggal yang lalu
 DocType: GST HSN Code,Regional,Regional
@@ -5692,6 +5751,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Kartu Skor Pemasok
 DocType: Travel Itinerary,Travel To,Bepergian ke
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Tandai Kehadiran
+DocType: Shift Type,Determine Check-in and Check-out,Tentukan Check-in dan Check-out
 DocType: POS Closing Voucher,Difference,Perbedaan
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Kecil
 DocType: Work Order Item,Work Order Item,Barang pesanan kerja
@@ -5725,6 +5785,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Obat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ditutup
 DocType: Patient,Medical History,Riwayat kesehatan
+DocType: Expense Claim,Expense Taxes and Charges,Pajak Biaya dan Beban
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Jumlah hari setelah tanggal faktur berlalu sebelum membatalkan langganan atau menandai langganan sebagai tidak dibayar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Catatan Instalasi {0} telah dikirimkan
 DocType: Patient Relation,Family,Keluarga
@@ -5757,7 +5818,6 @@
 DocType: Dosage Strength,Strength,Kekuatan
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} diperlukan dalam {2} untuk menyelesaikan transaksi ini.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Bahan Baku Subkontrak Backflush Berdasarkan
-DocType: Bank Guarantee,Customer,Pelanggan
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jika diaktifkan, bidang Istilah Akademik akan Wajib di Alat Pendaftaran Program."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Untuk Kelompok Siswa berbasis Kelompok, Kelompok Mahasiswa akan divalidasi untuk setiap Siswa dari Pendaftaran Program."
 DocType: Course,Topics,Topik
@@ -5837,6 +5897,7 @@
 DocType: Chapter,Chapter Members,Anggota Bab
 DocType: Warranty Claim,Service Address,Alamat Layanan
 DocType: Journal Entry,Remark,Ucapan
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Baris {0}: Jumlah tidak tersedia untuk {4} di gudang {1} pada saat posting entri ({2} {3})
 DocType: Patient Encounter,Encounter Time,Menghadapi Waktu
 DocType: Serial No,Invoice Details,Rincian Faktur
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akun lebih lanjut dapat dibuat di bawah Grup, tetapi entri dapat dibuat terhadap non-Grup"
@@ -5917,6 +5978,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Penutupan (Pembukaan + Total)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formula Kriteria
 apps/erpnext/erpnext/config/support.py,Support Analytics,Mendukung analitik
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID Perangkat Kehadiran (ID tag Biometrik / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Ulasan dan Aksi
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akun dibekukan, entri diperbolehkan untuk pengguna yang dibatasi."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Jumlah Setelah Depresiasi
@@ -5938,6 +6000,7 @@
 DocType: Salary Slip,Loan Repayment,Pembayaran pinjaman
 DocType: Employee Education,Major/Optional Subjects,Subjek Utama / Opsional
 DocType: Soil Texture,Silt,Lanau
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Alamat dan Kontak Pemasok
 DocType: Bank Guarantee,Bank Guarantee Type,Jenis Garansi Bank
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jika dinonaktifkan, bidang &#39;Total Bulat&#39; tidak akan terlihat dalam transaksi apa pun"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5976,6 +6039,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Membuka Item Alat Pembuatan Faktur
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Sertakan Transaksi POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Tidak ada Karyawan yang ditemukan untuk nilai bidang karyawan yang diberikan. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Jumlah yang Diterima (Mata Uang Perusahaan)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyimpan"
 DocType: Chapter Member,Chapter Member,Anggota Bab
@@ -6008,6 +6072,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Tidak ada Grup Siswa yang dibuat.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Baris duplikat {0} dengan {1} yang sama
 DocType: Employee,Salary Details,Rincian Gaji
+DocType: Employee Checkin,Exit Grace Period Consequence,Keluar dari Masa Konsekuensi
 DocType: Bank Statement Transaction Invoice Item,Invoice,Faktur
 DocType: Special Test Items,Particulars,Khususnya
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Harap atur filter berdasarkan Item atau Gudang
@@ -6109,6 +6174,7 @@
 DocType: Serial No,Out of AMC,Keluar dari AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan, dll."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Kirim Ke Negara
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Apakah Anda ingin mengirimkan permintaan materi
 DocType: Opportunity Item,Basic Rate,Tingkat Dasar
 DocType: Compensatory Leave Request,Work End Date,Tanggal Berakhir Kerja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Permintaan Bahan Baku
@@ -6294,6 +6360,7 @@
 DocType: Sales Order Item,Gross Profit,Laba kotor
 DocType: Quality Inspection,Item Serial No,Item Serial No
 DocType: Asset,Insurer,Penanggung
+DocType: Employee Checkin,OUT,DI LUAR
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Jumlah Pembelian
 DocType: Asset Maintenance Task,Certificate Required,Diperlukan sertifikat
 DocType: Retention Bonus,Retention Bonus,Bonus Retensi
@@ -6409,6 +6476,8 @@
 DocType: Invoice Discounting,Sanctioned,Sanksi
 DocType: Course Enrollment,Course Enrollment,Pendaftaran Kursus
 DocType: Item,Supplier Items,Barang Pemasok
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Waktu Mulai tidak boleh lebih dari atau sama dengan Waktu Akhir \ untuk {0}.
 DocType: Sales Order,Not Applicable,Tak dapat diterapkan
 DocType: Support Search Source,Response Options,Opsi Tanggapan
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} harus berupa nilai antara 0 dan 100
@@ -6495,7 +6564,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Aset Tetap
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Total Pendapatan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Share Balance,From No,Dari No
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Faktur Rekonsiliasi Pembayaran
 DocType: Purchase Invoice,Taxes and Charges Added,Pajak dan Biaya Ditambahkan
@@ -6603,6 +6671,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Abaikan Aturan Harga
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Makanan
 DocType: Lost Reason Detail,Lost Reason Detail,Detail Alasan yang Hilang
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Nomor seri berikut ini dibuat: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Timbal balik pelanggan
 DocType: Serial No,Warranty / AMC Details,Rincian Garansi / AMC
 DocType: Issue,Opening Time,Waktu pembukaan
@@ -6652,6 +6721,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Nama perusahaan tidak sama
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Promosi Karyawan tidak dapat diajukan sebelum Tanggal Promosi
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Tidak diizinkan untuk memperbarui transaksi stok yang lebih lama dari {0}
+DocType: Employee Checkin,Employee Checkin,Lapor masuk karyawan
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Barang {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Buat kutipan pelanggan
 DocType: Buying Settings,Buying Settings,Pengaturan Pembelian
@@ -6673,6 +6743,7 @@
 DocType: Patient,Patient Demographics,Demografi Pasien
 DocType: Share Transfer,To Folio No,Untuk Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Arus Kas dari Operasi
+DocType: Employee Checkin,Log Type,Jenis Log
 DocType: Stock Settings,Allow Negative Stock,Izinkan Stock Negatif
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Tidak ada barang yang memiliki perubahan kuantitas atau nilai.
 DocType: Asset,Purchase Date,Tanggal Pembelian
@@ -6717,6 +6788,7 @@
 DocType: Vital Signs,Very Hyper,Sangat hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Pilih sifat bisnis Anda.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Silakan pilih bulan dan tahun
+DocType: Service Level,Default Priority,Prioritas Default
 DocType: Student Log,Student Log,Log Pelajar
 DocType: Shopping Cart Settings,Enable Checkout,Aktifkan Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Sumber daya manusia
@@ -6745,7 +6817,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Hubungkan Shopify dengan ERPNext
 DocType: Homepage Section Card,Subtitle,Subtitle
 DocType: Soil Texture,Loam,Lempung
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: BOM,Scrap Material Cost(Company Currency),Biaya Bahan Bekas (Mata Uang Perusahaan)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Catatan Pengiriman {0} tidak boleh dikirimkan
 DocType: Task,Actual Start Date (via Time Sheet),Tanggal Mulai Aktual (melalui Lembar Waktu)
@@ -6801,6 +6872,7 @@
 DocType: Drug Prescription,Dosage,Dosis
 DocType: Cheque Print Template,Starting position from top edge,Posisi mulai dari tepi atas
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Durasi Penunjukan (menit)
+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}
 DocType: Accounting Dimension,Disable,Nonaktifkan
 DocType: Email Digest,Purchase Orders to Receive,Beli Pesanan untuk Menerima
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Pesanan Produksi tidak dapat dinaikkan untuk:
@@ -6816,7 +6888,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Material dipindahkan untuk subkontrak
 DocType: Job Card,Timing Detail,Detail Waktu
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Diperlukan Pada
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Mengimpor {0} dari {1}
 DocType: Job Offer Term,Job Offer Term,Masa Penawaran Pekerjaan
 DocType: SMS Center,All Contact,Semua Kontak
 DocType: Project Task,Project Task,Tugas Proyek
@@ -6867,7 +6938,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Item {0} tidak disiapkan untuk Serial No.
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Dari Negara
 DocType: Leave Type,Maximum Continuous Days Applicable,Maksimum Hari Berlanjut Berlaku
-apps/erpnext/erpnext/config/support.py,Support Team.,Tim pendukung.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Silakan masukkan nama perusahaan terlebih dahulu
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Impor Berhasil
 DocType: Guardian,Alternate Number,Nomor Alternatif
@@ -6959,6 +7029,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Baris # {0}: Item ditambahkan
 DocType: Student Admission,Eligibility and Details,Kelayakan dan Detail
 DocType: Staffing Plan,Staffing Plan Detail,Detail Rencana Penetapan Staf
+DocType: Shift Type,Late Entry Grace Period,Periode Rahmat Entri yang Terlambat
 DocType: Email Digest,Annual Income,Pendapatan tahunan
 DocType: Journal Entry,Subscription Section,Bagian Berlangganan
 DocType: Salary Slip,Payment Days,Hari pembayaran
@@ -7009,6 +7080,7 @@
 DocType: Journal Entry Account,Account Balance,Saldo rekening
 DocType: Asset Maintenance Log,Periodicity,Periodisitas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Rekam medis
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Jenis Log diperlukan untuk lapor masuk yang jatuh di shift: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Eksekusi
 DocType: Item,Valuation Method,Metode Penilaian
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
@@ -7093,6 +7165,7 @@
 DocType: Loan Type,Loan Name,Nama Pinjaman
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Tetapkan mode pembayaran default
 DocType: Quality Goal,Revision,Revisi
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Waktu sebelum waktu akhir shift ketika check-out dianggap sebagai awal (dalam menit).
 DocType: Healthcare Service Unit,Service Unit Type,Jenis Unit Layanan
 DocType: Purchase Invoice,Return Against Purchase Invoice,Kembali Terhadap Faktur Pembelian
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Hasilkan Rahasia
@@ -7248,12 +7321,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmetik
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Periksa ini jika Anda ingin memaksa pengguna untuk memilih seri sebelum menyimpan. Tidak akan ada default jika Anda memeriksa ini.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diizinkan untuk mengatur akun beku dan membuat / memodifikasi entri akuntansi terhadap akun beku
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 DocType: Expense Claim,Total Claimed Amount,Jumlah yang Diklaim Total
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan Slot Waktu dalam {0} hari berikutnya untuk Operasi {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Membungkus
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Anda hanya dapat memperbarui jika keanggotaan Anda berakhir dalam 30 hari
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Nilai harus antara {0} dan {1}
 DocType: Quality Feedback,Parameters,Parameter
+DocType: Shift Type,Auto Attendance Settings,Pengaturan Kehadiran Otomatis
 ,Sales Partner Transaction Summary,Ringkasan Transaksi Mitra Penjualan
 DocType: Asset Maintenance,Maintenance Manager Name,Nama Manajer Pemeliharaan
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Diperlukan untuk mengambil Rincian Item.
@@ -7345,10 +7420,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Validasikan Aturan yang Diterapkan
 DocType: Job Card Item,Job Card Item,Item Kartu Pekerjaan
 DocType: Homepage,Company Tagline for website homepage,Tagline Perusahaan untuk beranda situs web
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Tetapkan Waktu Respons dan Resolusi untuk Prioritas {0} di indeks {1}.
 DocType: Company,Round Off Cost Center,Pusat Biaya Pembulatan
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriteria Berat
 DocType: Asset,Depreciation Schedules,Jadwal Penyusutan
-DocType: Expense Claim Detail,Claim Amount,Jumlah Klaim
 DocType: Subscription,Discounts,Diskon
 DocType: Shipping Rule,Shipping Rule Conditions,Ketentuan Aturan Pengiriman
 DocType: Subscription,Cancelation Date,Tanggal Pembatalan
@@ -7376,7 +7451,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Tampilkan nilai nol
 DocType: Employee Onboarding,Employee Onboarding,Karyawan Onboarding
 DocType: POS Closing Voucher,Period End Date,Tanggal Berakhir Periode
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Peluang Penjualan berdasarkan Sumber
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pemberi Cuti pertama dalam daftar akan ditetapkan sebagai Pemberi Cuti bawaan.
 DocType: POS Settings,POS Settings,Pengaturan POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Semua Akun
@@ -7397,7 +7471,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Baris # {0}: Nilai harus sama dengan {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Item Layanan Kesehatan
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Tidak ada catatan yang ditemukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Rentang Penuaan 3
 DocType: Vital Signs,Blood Pressure,Tekanan darah
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Target pada
@@ -7444,6 +7517,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Batch
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Pertahanan
 DocType: Item,Has Batch No,Memiliki Batch No
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Hari yang Tertunda
 DocType: Lead,Person Name,Nama Orang
 DocType: Item Variant,Item Variant,Varian item
 DocType: Training Event Employee,Invited,Diundang
@@ -7465,7 +7539,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Tanggal mulai dan berakhir yang bukan dalam Periode Penggajian yang valid, tidak dapat menghitung {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Hanya tunjukkan Pelanggan dari Grup Pelanggan ini
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Pilih item untuk menyimpan faktur
-DocType: Service Level,Resolution Time,Waktu resolusi
+DocType: Service Level Priority,Resolution Time,Waktu resolusi
 DocType: Grading Scale Interval,Grade Description,Deskripsi Kelas
 DocType: Homepage Section,Cards,Kartu-kartu
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Risalah Rapat Kualitas
@@ -7492,6 +7566,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Saldo Rekening Bank sesuai Buku Besar
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Kesehatan (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Gudang Default untuk membuat Pesanan Penjualan dan Catatan Pengiriman
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Waktu Respons untuk {0} pada indeks {1} tidak boleh lebih besar dari Waktu Resolusi.
 DocType: Opportunity,Customer / Lead Name,Pelanggan / Nama Utama
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Jumlah yang tidak diklaim
@@ -7538,7 +7613,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Mengimpor Pihak dan Alamat
 DocType: Item,List this Item in multiple groups on the website.,Daftarkan Item ini dalam beberapa grup di situs web.
 DocType: Request for Quotation,Message for Supplier,Pesan untuk Pemasok
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Tidak dapat mengubah {0} karena Transaksi Stok untuk Item {1} ada.
 DocType: Healthcare Practitioner,Phone (R),Telepon (R)
 DocType: Maintenance Team Member,Team Member,Anggota tim
 DocType: Asset Category Account,Asset Category Account,Akun Kategori Aset
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 28f8ab1..218d28c 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Skipun {0} og sölureikningur {1} fellur niður
 DocType: Purchase Receipt,Vehicle Number,Ökutækisnúmer
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Netfangið þitt...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Innihalda sjálfgefnar bókfærslur
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Innihalda sjálfgefnar bókfærslur
 DocType: Activity Cost,Activity Type,Tegund ferðar
 DocType: Purchase Invoice,Get Advances Paid,Fá framlag greitt
 DocType: Company,Gain/Loss Account on Asset Disposal,Hagnaður / Tap reikningur um eignar ráðstöfun
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Greiðslur
 DocType: Employee Education,Class / Percentage,Flokkur / Hlutfall
 ,Electronic Invoice Register,Rafræn reikningsskrá
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Fjöldi atvika eftir sem afleiðingin er framkvæmd.
 DocType: Sales Invoice,Is Return (Credit Note),Er afturábak (lánshæfiseinkunn)
+DocType: Price List,Price Not UOM Dependent,Verð ekki UOM háð
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Dæmi
 DocType: Shopify Settings,status html,stöðu html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Fyrir td 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Nettó greiðsla
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Samtals innheimt Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Rekstrarvörur Reikningur Sérstaklega
+DocType: Shift Type,Working Hours Threshold for Absent,Vinnutími viðmiðunargildi fyrir fjarveru
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Ekki er hægt að úthluta fjárhagsáætlun gegn hópreikningi {0}
 DocType: Purchase Receipt Item,Rate and Amount,Verð og upphæð
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Úthreinsun sjúklinga
 DocType: Asset,Insurance End Date,Tryggingar lokadagur
 DocType: Bank Account,Branch Code,Útibúarkóði
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Tími til að svara
 apps/erpnext/erpnext/public/js/conf.js,User Forum,User Forum
 DocType: Landed Cost Item,Landed Cost Item,Landed Kostnaður Item
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Seljandi og kaupandi má ekki vera það sama
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Flytja
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Leitaratriði (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Niðurstaða send
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Frá dagsetningu getur ekki verið meiri en en Til dagsetning
 DocType: Supplier,Supplier of Goods or Services.,Birgir vöru eða þjónustu.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nafn nýrrar reiknings. Athugaðu: Búðu til ekki reikninga fyrir viðskiptavini og birgja
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Nemandi hópur eða námskeiðaskrá er skylt
@@ -882,7 +885,6 @@
 DocType: Skill,Skill Name,Hæfniskenni
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Prenta skýrslukort
 DocType: Soil Texture,Ternary Plot,Ternary plot
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nafngerðaröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Stuðningur miða
 DocType: Asset Category Account,Fixed Asset Account,Fast eignareikningur
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Nýjustu
@@ -895,6 +897,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Lögboðin fyrir efnahagsreikning
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað upphæð
 DocType: Sales Invoice,Get Advances Received,Fá framfarir móttekin
+DocType: Shift Type,Last Sync of Checkin,Síðasta samstilling skoðunar
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Vöruskattur Skattur innifalinn í verðmæti
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -903,7 +906,9 @@
 DocType: Student,Blood Group,Blóðflokkur
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Skera úthlutunarsvæði
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Tími eftir breytingartíma byrjunar þegar innritun er talin seint (í mínútum).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Kannaðu
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Engar framúrskarandi reikningar fundust
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} laus störf og {1} fjárhagsáætlun fyrir {2} sem nú þegar er fyrirhuguð fyrir dótturfélög í {3}. \ Þú getur aðeins áætlað allt að {4} laus störf og fjárhagsáætlun {5} samkvæmt áætluninni fyrir starfsmanninn {6} fyrir móðurfélagið {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Vara Afsláttarplötum
@@ -1005,6 +1010,7 @@
 DocType: Item,Moving Average,Að flytja meðaltali
 DocType: Employee Attendance Tool,Unmarked Attendance,Ómerkt aðsókn
 DocType: Homepage Section,Number of Columns,Fjöldi dálka
+DocType: Issue Priority,Issue Priority,Útgáfuárangur
 DocType: Holiday List,Add Weekly Holidays,Bæta við vikulega frídaga
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Búðu til Launasala
@@ -1013,6 +1019,7 @@
 DocType: Warranty Claim,Issue Date,Útgáfudagur
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Get ekki búið til viðhaldsbónus fyrir vinstri starfsmenn
+DocType: Employee Checkin,Location / Device ID,Staðsetning / tæki ID
 DocType: Purchase Order,To Receive,Til að taka á móti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Þú ert í ótengdum ham. Þú munt ekki geta endurhlaðin fyrr en þú hefur net.
 DocType: Course Activity,Enrollment,Innritun
@@ -1021,7 +1028,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Hámark: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,E-innheimtuupplýsingar vantar
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Engin efnisbeiðni búin til
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Loan,Total Amount Paid,Heildarfjárhæð greidd
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Öll þessi atriði hafa þegar verið reiknuð
 DocType: Training Event,Trainer Name,Þjálfari nafn
@@ -1132,6 +1138,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Vinsamlegast nefnt Lead Name í Lead {0}
 DocType: Employee,You can enter any date manually,Þú getur slegið inn dagsetningu handvirkt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stöðugleiki
+DocType: Shift Type,Early Exit Consequence,Snemma brottför afleiðing
 DocType: Item Group,General Settings,Almennar stillingar
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Gjalddagi má ekki vera fyrr en reikningsdagur fyrir afhendingu / afhendingu
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Sláðu inn nafn bótaþega áður en þú sendir inn.
@@ -1170,6 +1177,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Greiðsla staðfestingar
 ,Available Stock for Packing Items,Laust lager fyrir pökkunartæki
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reiknivél {0} úr C-eyðublaði {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Sérhver Gildir innritun og brottför
 DocType: Support Search Source,Query Route String,Fyrirspurnarleiðband
 DocType: Customer Feedback Template,Customer Feedback Template,Sniðmát viðskiptavina
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Tilvitnanir til Leiða eða Viðskiptavinir.
@@ -1203,6 +1211,7 @@
 DocType: Authorization Control,Authorization Control,Leyfisstjórn
 ,Daily Work Summary Replies,Dagleg vinnusamantekt Svar
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Þú hefur verið boðið að vinna í verkefninu: {0}
+DocType: Issue,Response By Variance,Svar eftir afbrigði
 DocType: Item,Sales Details,Söluupplýsingar
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Bréfshöfuð fyrir sniðmát prenta.
 DocType: Salary Detail,Tax on additional salary,Skattur á viðbótarlaun
@@ -1326,6 +1335,7 @@
 DocType: Project,Task Progress,Verkefni framfarir
 DocType: Journal Entry,Opening Entry,Opnun innganga
 DocType: Bank Guarantee,Charges Incurred,Gjöld felld
+DocType: Shift Type,Working Hours Calculation Based On,Vinnutími útreikningur byggður á
 DocType: Work Order,Material Transferred for Manufacturing,Efni flutt til framleiðslu
 DocType: Products Settings,Hide Variants,Fela afbrigði
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Slökktu á Stærð skipulags og tíma mælingar
@@ -1355,6 +1365,7 @@
 DocType: Guardian,Interests,Áhugamál
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Fjöldi neyslu
 DocType: Education Settings,Education Manager,Menntun framkvæmdastjóri
+DocType: Employee Checkin,Shift Actual Start,Shift Raunverulegur byrjun
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Skipuleggja vinnutíma utan vinnustöðvinnu.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Hollusta stig: {0}
 DocType: Healthcare Settings,Registration Message,Skráningarnúmer
@@ -1379,9 +1390,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Reikningur er þegar búinn til fyrir alla reikningstíma
 DocType: Sales Partner,Contact Desc,Hafa samband Desc
 DocType: Purchase Invoice,Pricing Rules,Verðreglur
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Þar sem núverandi viðskipti eiga sér stað við lið {0}, getur þú ekki breytt gildi {1}"
 DocType: Hub Tracked Item,Image List,Myndlist
 DocType: Item Variant Settings,Allow Rename Attribute Value,Leyfa Endurnefna Eiginleikar
-DocType: Price List,Price Not UOM Dependant,Verð ekki UOM háð
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Tími (í mín.)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Basic
 DocType: Loan,Interest Income Account,Vaxtatekjur
@@ -1391,6 +1402,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Veldu POS Profile
 DocType: Support Settings,Get Latest Query,Fáðu nýjustu fyrirspurnina
 DocType: Employee Incentive,Employee Incentive,Starfsmaður hvatning
+DocType: Service Level,Priorities,Forgangsröðun
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Bættu við kortum eða sérsniðnum köflum á heimasíðunni
 DocType: Homepage,Hero Section Based On,Hero Section Based On
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samtals innkaupakostnaður (með innheimtufé)
@@ -1451,7 +1463,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Ordered Magn
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Hafnað vörugeymsla er skylt að hafna hlutum {1}
 ,Received Items To Be Billed,Móttekin atriði sem verða gefnar upp
-DocType: Salary Slip Timesheet,Working Hours,Vinnutími
+DocType: Attendance,Working Hours,Vinnutími
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Greiðslumáti
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Innkaupapöntunartilboð sem ekki hafa borist á réttum tíma
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Lengd í dögum
@@ -1571,7 +1583,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Lögbundin upplýsingar og aðrar almennar upplýsingar um birgir þínar
 DocType: Item Default,Default Selling Cost Center,Sjálfgefin selja kostnaðurarmiðstöð
 DocType: Sales Partner,Address & Contacts,Heimilisfang og tengiliðir
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum uppsetningu&gt; númerakerfi
 DocType: Subscriber,Subscriber,Áskrifandi
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) er ekki til á lager
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Vinsamlegast veldu Senda dagsetningu fyrst
@@ -1582,7 +1593,7 @@
 DocType: Detected Disease,Tasks Created,Verkefni búin til
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virk fyrir þetta atriði eða sniðmát þess
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Framkvæmdastjórnarhlutfall%
-DocType: Service Level,Response Time,Viðbragðstími
+DocType: Service Level Priority,Response Time,Viðbragðstími
 DocType: Woocommerce Settings,Woocommerce Settings,Váskiptastillingar
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Magn verður að vera jákvætt
 DocType: Contract,CRM,CRM
@@ -1599,7 +1610,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Mapping viðskiptadags
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Leiða þarf annaðhvort nafn einstaklings eða nafn fyrirtækis
 DocType: Student,Guardians,Forráðamenn
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun&gt; Menntastillingar
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Veldu tegund ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Miðtekjur
 DocType: Shipping Rule,Calculate Based On,Reiknaðu Byggt á
@@ -1636,6 +1646,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Dagsskýrsla {0} er til móts við nemanda {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Dagsetning viðskipta
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Hætta við áskrift
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Gat ekki sett þjónustustigarsamning {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Hrein upphæð
 DocType: Account,Liability,Ábyrgð
 DocType: Employee,Bank A/C No.,Banka nr.
@@ -1701,7 +1712,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Hráefni vöruliður
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Innheimtufé {0} er þegar sent inn
 DocType: Fees,Student Email,Tölvupóstur nemanda
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM endurferð: {0} getur ekki verið foreldri eða barn {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Fáðu atriði úr heilbrigðisþjónustu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Skráarfærsla {0} er ekki send inn
 DocType: Item Attribute Value,Item Attribute Value,Vara Eiginleikar
@@ -1726,7 +1736,6 @@
 DocType: Production Plan,Select Items to Manufacture,Veldu hluti til framleiðslu
 DocType: Leave Application,Leave Approver Name,Leyfi samþykkisheiti
 DocType: Shareholder,Shareholder,Hluthafi
-DocType: Issue,Agreement Status,Samningsstaða
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Sjálfgefin stilling fyrir söluviðskipti.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Vinsamlegast veljið Student Entrance sem er skylt fyrir greiddan nemanda
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Veldu BOM
@@ -1988,6 +1997,7 @@
 DocType: Account,Income Account,Tekjuskráning
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Allar vöruhús
 DocType: Contract,Signee Details,Signee Upplýsingar
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Leyfa útskráningu eftir lokaskipti (í mínútum)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Innkaup
 DocType: Item Group,Check this if you want to show in website,Athugaðu þetta ef þú vilt sýna á vefsíðu
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiscal Year {0} fannst ekki
@@ -2053,6 +2063,7 @@
 DocType: Activity Cost,Billing Rate,Innheimtuhlutfall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Viðvörun: Annar {0} # {1} er til á móti hlutafærslu {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Vinsamlega virkjaðu Google Maps Stillingar til að meta og hagræða leiðum
+DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Supplier Scorecard Criteria,Max Score,Hámarksstig
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Endurgreiðsla upphafsdagur má ekki vera fyrir gjalddaga.
 DocType: Support Search Source,Support Search Source,Stuðningur Leita Heimild
@@ -2121,6 +2132,7 @@
 DocType: Employee Transfer,Employee Transfer,Starfsmaður flytja
 ,Sales Funnel,Sölutrunnur
 DocType: Agriculture Analysis Criteria,Water Analysis,Vatnsgreining
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Byrjaðu innskráningu áður en byrjunartíma hefst (í mínútum)
 DocType: Accounts Settings,Accounts Frozen Upto,Reikningar Frosinn Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Það er ekkert að breyta.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Rekstur {0} lengri en nokkur vinnutími á vinnustöðinni {1}, brjóta niður aðgerðina í margar aðgerðir"
@@ -2134,7 +2146,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Sölupöntun {0} er {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Tafir á greiðslu (dagar)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Færðu inn upplýsingar um afskriftir
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Viðskiptavinur PO
 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öludagsetningardegi
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Liður magn getur ekki verið núll
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Ógilt eigindi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Vinsamlegast veldu BOM gegn hlutnum {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Reikningsgerð
@@ -2144,6 +2158,7 @@
 DocType: Volunteer,Afternoon,Að morgni
 DocType: Vital Signs,Nutrition Values,Næringargildi
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Hiti í upphafi (hitastig&gt; 38,5 ° C / 101,3 ° F eða viðvarandi hitastig&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC afturkallað
 DocType: Project,Collect Progress,Safna framfarir
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Orka
@@ -2194,6 +2209,7 @@
 ,Ordered Items To Be Billed,Ordered Items Til Billed
 DocType: Taxable Salary Slab,To Amount,Að upphæð
 DocType: Purchase Invoice,Is Return (Debit Note),Er aftur (skuldfærsla)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Að byrja
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sameina
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Ekki er hægt að breyta upphafsdagi reikningsárs og reikningsárs lokadag þegar reikningsár er vistað.
@@ -2212,8 +2228,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Viðhalds upphafsdagur getur ekki verið fyrir afhendingu fyrir raðnúmer {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Row {0}: Gengi gjaldmiðla er skylt
 DocType: Purchase Invoice,Select Supplier Address,Veldu birgir Heimilisfang
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Laust magn er {0}, þú þarft {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Vinsamlegast sláðu inn API Consumer Secret
 DocType: Program Enrollment Fee,Program Enrollment Fee,Áætlun innskráningargjald
+DocType: Employee Checkin,Shift Actual End,Shift Raunverulegur endir
 DocType: Serial No,Warranty Expiry Date,Ábyrgðartímabil
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hótel herbergi Verðlagning
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Skattskyldar birgðir (utan annarra en núllar, án nafna og undanþegnar"
@@ -2272,6 +2290,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lestur 5
 DocType: Shopping Cart Settings,Display Settings,Sýna stillingar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Vinsamlegast settu fjölda afskriftir bókað
+DocType: Shift Type,Consequence after,Afleiðing eftir
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Hvað þarftu hjálp við?
 DocType: Journal Entry,Printing Settings,Prentunarstillingar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bankastarfsemi
@@ -2281,6 +2300,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Innheimtu Heimilisfang er sama og sendingar Heimilisfang
 DocType: Account,Cash,Handbært fé
 DocType: Employee,Leave Policy,Leyfi stefnu
+DocType: Shift Type,Consequence,Afleiðing
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Námsmaður Heimilisfang
 DocType: GST Account,CESS Account,CESS reikning
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostnaðurarmiðstöð er krafist fyrir &#39;Hagnaður og tap&#39; reikningur {2}. Vinsamlegast settu sjálfgefið kostnaðarmiðstöð fyrir fyrirtækið.
@@ -2345,6 +2365,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Tímabil Loka Skírteini
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Forráðamaður2 Nafn
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Vinsamlegast sláðu inn kostnaðarreikning
+DocType: Issue,Resolution By Variance,Upplausn eftir afbrigði
 DocType: Employee,Resignation Letter Date,Uppsagnarbréf Dagsetning
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Viðstaddir Dagsetning
@@ -2357,6 +2378,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Skoða núna
 DocType: Item Price,Valid Upto,Gildistaka
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Tilvísun Doctype verður að vera einn af {0}
+DocType: Employee Checkin,Skip Auto Attendance,Hoppa yfir sjálfvirkan þátttöku
 DocType: Payment Request,Transaction Currency,Viðskiptargjaldmiðill
 DocType: Loan,Repayment Schedule,Endurgreiðsluáætlun
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Búðu til sýnishorn varðveislu birgðir
@@ -2428,6 +2450,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS Loka Skírteini Skattar
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Aðgerð upphafleg
 DocType: POS Profile,Applicable for Users,Gildir fyrir notendur
+,Delayed Order Report,Tafir á pöntunarskýrslu
 DocType: Training Event,Exam,Próf
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Rangt númer af aðalbókaratriðum fannst. Þú gætir hafa valið rangan reikning í viðskiptum.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Sala leiðsla
@@ -2442,10 +2465,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Skilyrði verður beitt á öllum völdum hlutum samanlagt.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Stilla
 DocType: Hotel Room,Capacity,Stærð
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Uppsettur fjöldi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Hópur {0} í lið {1} er óvirkur.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hótel pöntunarsali
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Vinnudagur hefur verið endurtekin tvisvar
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Samningur um þjónustustig með einingartegund {0} og Eining {1} er þegar til.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Varahópur sem ekki er tilgreindur í hluthafa fyrir hlut {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Nafn villa: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Svæði er nauðsynlegt í POS Profile
@@ -2493,6 +2517,7 @@
 DocType: Depreciation Schedule,Schedule Date,Dagskrá Dagsetning
 DocType: Packing Slip,Package Weight Details,Upplýsingar um pakkningarþyngd
 DocType: Job Applicant,Job Opening,Atvinna Opnun
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Síðasta þekkta velgengni samstillingar starfsmannsins. Endurstilla þetta aðeins ef þú ert viss um að öll Logs séu samstillt frá öllum stöðum. Vinsamlegast breyttu þessu ekki ef þú ert ekki viss.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Raunverulegur kostnaður
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samtals fyrirfram ({0}) gegn Order {1} getur ekki verið meiri en Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Varahlutir uppfærðar
@@ -2537,6 +2562,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Fáðu þig
 DocType: Tally Migration,Is Day Book Data Imported,Er dagbókargögn innflutt
 ,Sales Partners Commission,Sala samstarfs framkvæmdastjórnarinnar
+DocType: Shift Type,Enable Different Consequence for Early Exit,Virkja mismunandi afleiðingar fyrir upphafsstað
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Löglegt
 DocType: Loan Application,Required by Date,Krafist eftir dagsetningu
 DocType: Quiz Result,Quiz Result,Quiz niðurstaða
@@ -2596,7 +2622,6 @@
 DocType: Pricing Rule,Pricing Rule,Verðlagsregla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Valfrjálst frídagur listi ekki settur í leyfiartíma {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Vinsamlegast settu notandanafnssvæði í starfsmannaskrá til að stilla starfsmennhlutverk
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Tími til að leysa upp
 DocType: Training Event,Training Event,Þjálfunarviðburður
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Venjulegur hvíldarþrýstingur hjá fullorðnum er u.þ.b. 120 mmHg slagbilsþrýstingur og 80 mmHg díastólskur, skammstafað &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Kerfið mun sækja allar færslur ef mörkin eru núll.
@@ -2640,6 +2665,7 @@
 DocType: Student Applicant,Approved,Samþykkt
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Frá Dagsetning ætti að vera innan reikningsársins. Miðað við dagsetningu = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Vinsamlegast settu Birgir Group í Kaupstillingum.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} er ógildur viðverustaður.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Tímabundin opnunareikningur
 DocType: Purchase Invoice,Cash/Bank Account,Handbært fé / bankareikningur
 DocType: Quality Meeting Table,Quality Meeting Table,Gæði fundatafla
@@ -2675,6 +2701,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Matur, drykkur og tóbak"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Námskeiðaskrá
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Vara Skattur Skattur Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Viðburður verður merktur sjálfkrafa aðeins eftir þennan dag.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Birgðir til UIN eigenda
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Beiðni um tilvitnanir
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Gjaldmiðill er ekki hægt að breyta eftir að færslur hafa verið gerðar með öðrum gjaldmiðlum
@@ -2722,7 +2749,6 @@
 DocType: Item,Is Item from Hub,Er hlutur frá miðstöð
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Gæðaviðmiðun.
 DocType: Share Balance,No of Shares,Fjöldi hlutabréfa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rú {0}: Magn er ekki í boði fyrir {4} í vörugeymslu {1} við birtingu tíma færslunnar ({2} {3})
 DocType: Quality Action,Preventive,Fyrirbyggjandi
 DocType: Support Settings,Forum URL,Vefslóð spjallsins
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Starfsmaður og þátttaka
@@ -2941,7 +2967,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Sjálfgefin skatta og gjöld
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Þetta byggist á viðskiptum gegn þessum birgi. Sjá tímalínu fyrir neðan til að fá nánari upplýsingar
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Hámarkslaunagreiðsla starfsmanns {0} fer yfir {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Sláðu inn upphafs- og lokadag samningsins.
 DocType: Delivery Note Item,Against Sales Invoice,Gegn sölureikningi
 DocType: Loyalty Point Entry,Purchase Amount,Kaupverð
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Ekki hægt að stilla sem týnt sem söluskilaboð eru gerðar.
@@ -2965,7 +2990,7 @@
 DocType: Lead,Organization Name,nafn samtaka
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Gildir frá og gildir allt að reitum eru nauðsynlegar fyrir uppsöfnuðan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Hópur nr verður að vera eins og {1} {2}
-DocType: Employee,Leave Details,Leyfi Upplýsingar
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Verðbréfaviðskipti fyrir {0} eru frystar
 DocType: Driver,Issuing Date,Útgáfudagur
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Beiðandi
@@ -3010,9 +3035,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Upplýsingar um sjóðstreymi fyrir sjóðstreymi
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Ráðningar og þjálfun
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Gildistími stillingar fyrir sjálfvirkan þátttöku
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Frá gjaldmiðli og til gjaldmiðils getur ekki verið það sama
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Lyfjafyrirtæki
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Stuðningstímar
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} er lokað eða lokað
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Fyrirfram gegn Viðskiptavinur verður að vera lánsfé
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Hópur með skírteini (samstæðureikningur)
@@ -3122,6 +3149,7 @@
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Lab Test,Sample ID,Dæmi um auðkenni
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Körfu er tóm
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Viðburður hefur verið merktur eins og við innritun starfsmanna
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Eignin {0} verður að leggja fram
 ,Absent Student Report,Fjarverandi nemenda skýrsla
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Innifalið í hagnaði
@@ -3129,7 +3157,9 @@
 DocType: Travel Request Costing,Funded Amount,Fjármögnuð upphæð
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} hefur ekki verið send inn þannig að aðgerðin er ekki hægt að ljúka
 DocType: Subscription,Trial Period End Date,Prófunartímabil Lokadagur
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Skiptir færslur sem IN og OUT á sama vakt
 DocType: BOM Update Tool,The new BOM after replacement,Nýja BOM eftir skipti
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Liður 5
 DocType: Employee,Passport Number,Vegabréfs númer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Tímabundin opnun
@@ -3245,6 +3275,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Möguleg birgir
 ,Issued Items Against Work Order,Útgefið atriði gegn vinnuskilningi
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Búa til {0} Reikningur
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast skipulag kennari Nafnakerfi í menntun&gt; Menntastillingar
 DocType: Student,Joining Date,Tengingardagur
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Beiðni vefsvæðis
 DocType: Purchase Invoice,Against Expense Account,Gegn kostnaðarreikningi
@@ -3284,6 +3315,7 @@
 DocType: Landed Cost Item,Applicable Charges,Gildandi gjöld
 ,Point of Sale,Sölustaður
 DocType: Authorization Rule,Approving User  (above authorized value),Samþykkja notandi (yfir leyfilegt gildi)
+DocType: Service Level Agreement,Entity,Eining
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Magn {0} {1} flutt frá {2} til {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Viðskiptavinur {0} tilheyrir ekki verkefni {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Frá nafn aðila
@@ -3330,6 +3362,7 @@
 DocType: Soil Texture,Sand Composition (%),Sand samsetning (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Flytja inn dagbókargögn
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nafngerðaröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 DocType: Asset,Asset Owner Company,Eigandi Eigandi Fyrirtæki
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Kostnaðarmiðstöð er nauðsynlegt til að bóka kostnaðarkröfu
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} Gilt raðnúmer fyrir lið {1}
@@ -3390,7 +3423,6 @@
 DocType: Asset,Asset Owner,Eigandi eigna
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Vörugeymsla er skylt að kaupa vöruliður {0} í röð {1}
 DocType: Stock Entry,Total Additional Costs,Samtals aukakostnaður
-DocType: Marketplace Settings,Last Sync On,Síðasta samstilling á
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Vinsamlegast settu að minnsta kosti eina línu í skatta- og gjöldartöflunni
 DocType: Asset Maintenance Team,Maintenance Team Name,Viðhald Team Name
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Mynd af kostnaðarstöðvum
@@ -3406,12 +3438,12 @@
 DocType: Job Card,WIP Warehouse,WIP vörugeymsla
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Notandanafn ekki stillt fyrir starfsmann {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Laus magn er {0}, þú þarft {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Notandi {0} búinn til
 DocType: Stock Settings,Item Naming By,Atriði sem nefnist með
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Pantaði
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Þetta er hópur rót viðskiptavina og er ekki hægt að breyta.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Efnisbeiðni {0} er lokað eða hætt
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Strangt byggt á Log Type í starfsmannaskoðun
 DocType: Purchase Order Item Supplied,Supplied Qty,Fylgir með
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,Sandur
@@ -3470,6 +3502,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Afrita hlutahóp sem finnast í hlutataflaflokknum
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Árslaun
 DocType: Supplier Scorecard,Weighting Function,Vigtunarhlutverk
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlut: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Villa við að meta viðmiðunarformúluna
 ,Lab Test Report,Lab Test Report
 DocType: BOM,With Operations,Með aðgerðum
@@ -3483,6 +3516,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Engar endurgreiðslur eru tiltækar fyrir Journal Entry
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} er óvirkur nemandi
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Gerðu hlutabréfaskráningu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM endurkoma: {0} getur ekki verið foreldri eða barn {1}
 DocType: Employee Onboarding,Activities,Starfsemi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Að minnsta kosti eitt vörugeymsla er skylt
 ,Customer Credit Balance,Viðskiptajöfnuður
@@ -3495,9 +3529,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Mörg hollusta forrit sem finnast fyrir viðskiptavininn. Vinsamlegast veldu handvirkt.
 DocType: Patient,Medication,Lyfjagjöf
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Veldu hollusta forrit
+DocType: Employee Checkin,Attendance Marked,Viðvera merkt
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Hráefni
 DocType: Sales Order,Fully Billed,Alveg Billed
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Vinsamlegast settu hótel herbergisverð á {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Veldu aðeins einn forgang sem sjálfgefið.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Vinsamlega auðkenna / búa til reikning (Ledger) fyrir gerð - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Heildarfjöldi lána- / skuldfærslna skal vera eins og tengt Journal Entry
 DocType: Purchase Invoice Item,Is Fixed Asset,Er fast eign
@@ -3518,6 +3554,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Samþykkt staðfestingar
 DocType: Shopping Cart Settings,Orders,Pantanir
 DocType: HR Settings,Retirement Age,Eftirlaunaaldur
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum uppsetningu&gt; númerakerfi
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Spáð magn
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Eyðing er ekki leyfð fyrir land {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Row # {0}: Eign {1} er þegar {2}
@@ -3601,11 +3638,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Endurskoðandi
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS lokunarskírteini er til fyrir {0} á milli dagsetningar {1} og {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Sigla
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Engar framúrskarandi reikningar þurfa gengisendurmat
 DocType: Authorization Rule,Customer / Item Name,Viðskiptavinur / hlutanafn
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nýtt raðnúmer getur ekki haft vöruhús. Vörugeymsla verður að vera stillt eftir birgðahöfn eða innkaupakvittun
 DocType: Issue,Via Customer Portal,Via Viðskiptavinur Portal
 DocType: Work Order Operation,Planned Start Time,Áætlað upphafstími
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} er {2}
+DocType: Service Level Priority,Service Level Priority,Þjónustustig forgangs
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi afskrifta Bókað getur ekki verið meiri en Samtals Fjöldi afskriftir
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 DocType: Journal Entry,Accounts Payable,Reikningsskuldir
@@ -3716,7 +3755,6 @@
 DocType: Delivery Note,Delivery To,Afhendingu til
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankagögn
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Áætlað Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Halda Billing Hours og vinnutíma Sama á Timesheet
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Fylgjast með leiðsögn með leiðsögn.
 DocType: Clinical Procedure,Nursing User,Hjúkrunarnotandi
 DocType: Support Settings,Response Key List,Svaralisti
@@ -3884,6 +3922,7 @@
 DocType: Work Order Operation,Actual Start Time,Raunverulegur byrjunartími
 DocType: Antibiotic,Laboratory User,Laboratory User
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online uppboð
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Forgangur {0} hefur verið endurtekin.
 DocType: Fee Schedule,Fee Creation Status,Gjaldeyrisréttindi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Hugbúnaður
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Sölupöntun til greiðslu
@@ -3950,6 +3989,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Gat ekki sótt upplýsingar um {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Innheimtu gjaldmiðill verður að vera jafngildur gjaldmiðli sjálfgefið fyrirtæki eða aðila reikning gjaldmiðil
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Vinsamlegast sláðu inn starfsmannarauðkenni þessa söluaðila
+DocType: Shift Type,Early Exit Consequence after,Snemma brottför eftir
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Búðu til opnun sölu- og innkaupakostna
 DocType: Disease,Treatment Period,Meðferðartímabil
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Setja upp tölvupóst
@@ -3967,7 +4007,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Nafn nemanda:
 DocType: SMS Log,Sent On,Sent á
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Sölureikningur
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Svarstími getur ekki verið meiri en Upplausnartími
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Fyrir námsmiðaðan nemendahóp verður námskeiðið valið fyrir alla nemenda frá skráðum námskeiðum í námskrá.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Birgðasali
 DocType: Employee,Create User Permission,Búðu til notendaleyfi
@@ -4006,6 +4045,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Venjuleg samningsskilmálar fyrir sölu eða kaup.
 DocType: Sales Invoice,Customer PO Details,Upplýsingar viðskiptavina
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Sjúklingur fannst ekki
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Veldu sjálfgefna forgang.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Fjarlægðu atriði ef gjöld eiga ekki við um það atriði
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Viðskiptavinahópur er með sama nafni, breyttu heiti viðskiptavinarins eða endurnefna viðskiptavinahópinn"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4045,6 +4085,7 @@
 DocType: Support Settings,Support Portal,Stuðningur Portal
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Lokadagsetning verkefnisins <b>{0}</b> má ekki vera minni en <b>{1}</b> áætlað upphafsdagur <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Starfsmaður {0} er á leyfi á {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Þessi þjónustustigssamningur er sérstaklega við viðskiptavininn {0}
 DocType: Employee,Held On,Hélt í
 DocType: Healthcare Practitioner,Practitioner Schedules,Hagnýtar áætlanir
 DocType: Project Template Task,Begin On (Days),Byrjaðu á (dagar)
@@ -4052,6 +4093,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Vinna pöntun hefur verið {0}
 DocType: Inpatient Record,Admission Schedule Date,Aðgangur Dagskrá Dagsetning
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Breyting eignaverðs
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Merkja aðsókn byggð á &#39;Starfsmanni Checkin&#39; fyrir starfsmenn sem eru úthlutað þessari breytingu.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Birgðasali til óskráðra einstaklinga
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Öll störf
 DocType: Appointment Type,Appointment Type,Skipunartegund
@@ -4165,7 +4207,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Heildarþyngd pakkans. Venjulega nettóþyngd + pakkningarefni þyngd. (til prentunar)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratory Testing Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Atriðið {0} getur ekki haft lotu
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Söluleiðsla eftir stigi
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Styrkur nemendahóps
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Viðskiptareikning bankans
 DocType: Purchase Order,Get Items from Open Material Requests,Fáðu atriði úr opnum efnisbeiðnum
@@ -4247,7 +4288,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Sýna öldrun vöruhús-vitur
 DocType: Sales Invoice,Write Off Outstanding Amount,Skrifa burt útistandandi upphæð
 DocType: Payroll Entry,Employee Details,Upplýsingar um starfsmenn
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Upphafstími getur ekki verið meiri en lokadagur fyrir {0}.
 DocType: Pricing Rule,Discount Amount,Afsláttarmagn
 DocType: Healthcare Service Unit Type,Item Details,Atriði í hlutanum
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Afritaskattyfirlýsing um {0} fyrir tímabil {1}
@@ -4300,7 +4340,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Nettó laun geta ekki verið neikvæðar
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Engar milliverkanir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Row {0} # Liður {1} er ekki hægt að flytja meira en {2} gegn innkaupapöntun {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Vinnsla reikningsskila og aðila
 DocType: Stock Settings,Convert Item Description to Clean HTML,Breyta liður Lýsing til að hreinsa HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Allir Birgir Hópar
@@ -4371,6 +4411,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Foreldraþjónustudeild
 DocType: Sales Invoice,Include Payment (POS),Hafa greiðslu (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Einkaeign
+DocType: Shift Type,First Check-in and Last Check-out,Fyrsta innritun og síðasta útskráning
 DocType: Landed Cost Item,Receipt Document,Kvittunarskjal
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Birgir Tímabil
 DocType: Employee Grade,Default Salary Structure,Sjálfgefið launauppbygging
@@ -4453,6 +4494,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Búðu til innkaupapöntun
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Skilgreina fjárhagsáætlun fyrir fjárhagsár.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Reikningurartafla má ekki vera auður.
+DocType: Employee Checkin,Entry Grace Period Consequence,Gildistími inngangs tíma
 ,Payment Period Based On Invoice Date,Greiðslutímabil byggt á gjalddaga
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Uppsetningardagur getur ekki verið fyrir afhendingu fyrir lið {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Tengill við efnisbeiðni
@@ -4461,6 +4503,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Reorder færsla er þegar til fyrir þetta vörugeymsla {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Skjal dagsetning
 DocType: Monthly Distribution,Distribution Name,Dreifingarheiti
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Vinnudagur {0} hefur verið endurtekin.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Hóp til Non-Group
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Uppfærsla í gangi. Það gæti tekið smá stund.
 DocType: Item,"Example: ABCD.#####
@@ -4473,6 +4516,7 @@
 DocType: Vehicle Log,Fuel Qty,Magn eldsneytis
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,Útborgað
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Tími eftir lok breytinga á meðan útskráning er talin fyrir mætingu.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Hrein breyting á reikningum sem greiðast
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Ekki í boði
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Hluta
@@ -4486,7 +4530,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Sýna PDC í prenti
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Birgir
 DocType: POS Profile User,POS Profile User,POS prófíl notandi
-DocType: Student,Middle Name,Millinafn
 DocType: Sales Person,Sales Person Name,Söluheiti Nafn
 DocType: Packing Slip,Gross Weight,Heildarþyngd
 DocType: Journal Entry,Bill No,Bill nr
@@ -4495,7 +4538,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Þjónustusamningur
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Vinsamlegast veldu Starfsmaður og Dagsetning fyrst
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Eiginfjárhlutfall er endurreiknað miðað við lendingu kostnaðarskírteini
 DocType: Timesheet,Employee Detail,Starfsmannaupplýsingar
 DocType: Tally Migration,Vouchers,Fylgiskjölum
@@ -4530,7 +4572,7 @@
 DocType: Additional Salary,Date on which this component is applied,Dagsetning sem þessi hluti er beitt
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Listi yfir tiltæka hluthafa með folíumnúmerum
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Uppsetning Gateway reikninga.
-DocType: Service Level,Response Time Period,Svörunartímabil
+DocType: Service Level Priority,Response Time Period,Svörunartímabil
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kaupskattar og gjöld
 DocType: Course Activity,Activity Date,Virkisdagur
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Veldu eða bæta við nýjum viðskiptavini
@@ -4555,6 +4597,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Fjárhagsár
 DocType: Sales Invoice Item,Deferred Revenue,Frestað tekjur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Að minnsta kosti einn af sölu- eða kaupunum verður að vera valinn
+DocType: Shift Type,Working Hours Threshold for Half Day,Vinnutími þröskuldur fyrir hálfan dag
 ,Item-wise Purchase History,Liður-vitur kaupsaga
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Ekki er hægt að breyta þjónustustöðvunardegi fyrir atriði í röð {0}
 DocType: Production Plan,Include Subcontracted Items,Inniheldur undirverktaka
@@ -4587,6 +4630,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Leyfa sama hlut marga sinnum
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Búðu til BOM
 DocType: Healthcare Practitioner,Charges,Gjöld
+DocType: Employee,Attendance and Leave Details,Aðgengi og leyfi upplýsingar
 DocType: Student,Personal Details,Persónulegar upplýsingar
 DocType: Sales Order,Billing and Delivery Status,Innheimtu- og afhendingarstaða
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Róður {0}: Fyrir birgir {0} Netfang er nauðsynlegt til að senda tölvupóst
@@ -4638,7 +4682,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Sláðu inn gildi betweeen {0} og {1}
 DocType: Purchase Order,Order Confirmation Date,Panta staðfestingardagur
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Reikna áætlaðan komutíma
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Neysluverðs
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Upphafsdagsetning
@@ -4661,7 +4704,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forum Activity
-DocType: Service Level,Resolution Time Period,Upplausnartími
+DocType: Service Level Priority,Resolution Time Period,Upplausnartími
 DocType: Request for Quotation,Supplier Detail,Upplýsingar um birgir
 DocType: Project Task,View Task,Skoða verkefni
 DocType: Serial No,Purchase / Manufacture Details,Kaup / Framleiðsla Upplýsingar
@@ -4728,6 +4771,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Vörugeymsla er aðeins hægt að breyta með vöruskipti / afhendingartilkynningu / innkaupakvittun
 DocType: Support Settings,Close Issue After Days,Loka útgáfu eftir daga
 DocType: Payment Schedule,Payment Schedule,Greiðsluáætlun
+DocType: Shift Type,Enable Entry Grace Period,Virkja innganga náð tímabil
 DocType: Patient Relation,Spouse,Maki
 DocType: Purchase Invoice,Reason For Putting On Hold,Ástæða þess að setja í bið
 DocType: Item Attribute,Increment,Aukning
@@ -4866,6 +4910,7 @@
 DocType: Vehicle Log,Invoice Ref,Reikningsnúmer
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-eyðublað er ekki á við um reikning: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Reikningur búin til
+DocType: Shift Type,Early Exit Grace Period,Upphafstímabil í upphafi
 DocType: Patient Encounter,Review Details,Endurskoða upplýsingar
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Rú {0}: Tímar gildi verða að vera meiri en núll.
 DocType: Account,Account Number,Reikningsnúmer
@@ -4877,7 +4922,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Gildandi ef fyrirtækið er SpA, SApA eða SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Skarast aðstæður sem finnast á milli:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Greiddur og ekki afhentur
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Vörunúmer er skylt vegna þess að hluturinn er ekki sjálfkrafa númeraður
 DocType: GST HSN Code,HSN Code,HSN-kóði
 DocType: GSTR 3B Report,September,September
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Stjórnsýslukostnaður
@@ -4913,6 +4957,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP reikningur
 DocType: SMS Log,Sender Name,Sendandi Nafn
 DocType: Pricing Rule,Supplier Group,Birgir Group
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Stilla byrjunartíma og lokatíma fyrir \ Stuðningsdagur {0} í vísitölu {1}.
 DocType: Employee,Date of Issue,Útgáfudagur
 ,Requested Items To Be Transferred,Beiðin atriði sem þarf að flytja
 DocType: Employee,Contract End Date,Samningur Lokadagur
@@ -4923,6 +4969,7 @@
 DocType: Opportunity,Sales Stage,Sala stigi
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Í Orð verður sýnilegt þegar þú vistar söluskilaboð.
 DocType: Item Reorder,Re-order Level,Endurskipulagningarnúmer
+DocType: Shift Type,Enable Auto Attendance,Virkja sjálfvirkan þátttöku
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Val
 ,Department Analytics,Department Analytics
 DocType: Crop,Scientific Name,Vísindalegt nafn
@@ -4935,6 +4982,7 @@
 DocType: Quiz Activity,Quiz Activity,Quiz Activity
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} er ekki í gildum launum
 DocType: Timesheet,Billed,Innheimt
+apps/erpnext/erpnext/config/support.py,Issue Type.,Útgáfustegund.
 DocType: Restaurant Order Entry,Last Sales Invoice,Síðasta sölureikningur
 DocType: Payment Terms Template,Payment Terms,Greiðsluskilmála
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Frátekin Magn: Magn pantað til sölu, en ekki afhent."
@@ -5030,6 +5078,7 @@
 DocType: Account,Asset,Eign
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} hefur ekki heilbrigðisstarfsmannaskrá. Bættu því við í lækni í heilbrigðisstarfsmanni
 DocType: Vehicle,Chassis No,Undirvagn nr
+DocType: Employee,Default Shift,Sjálfgefin breyting
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Fyrirtæki Skammstöfun
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Tré efnisskrárinnar
 DocType: Article,LMS User,LMS notandi
@@ -5078,6 +5127,7 @@
 DocType: Sales Person,Parent Sales Person,Foreldra sölumaður
 DocType: Student Group Creation Tool,Get Courses,Fáðu námskeið
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, þar sem hlutur er fastur eign. Vinsamlegast notaðu sérstaka röð fyrir margfeldi."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Vinnutími hér fyrir neðan sem ekki er merktur. (Núll til að slökkva á)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Aðeins blaðahnútar eru leyfðar í viðskiptum
 DocType: Grant Application,Organization,Stofnun
 DocType: Fee Category,Fee Category,Gjaldskrá
@@ -5090,6 +5140,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Vinsamlegast uppfærðu stöðu þína fyrir þennan þjálfunarviðburð
 DocType: Volunteer,Morning,Morgunn
 DocType: Quotation Item,Quotation Item,Tilvitnun
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Útgáfuárangur.
 DocType: Journal Entry,Credit Card Entry,Innborgun kreditkorta
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Tímaspjald sleppt, raufinn {0} til {1} skarast framhjá rifa {2} í {3}"
 DocType: Journal Entry Account,If Income or Expense,Ef tekjur eða gjöld
@@ -5140,11 +5191,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Gagnaflutningur og stillingar
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",Ef sjálfvirkur valkostur er valinn verður viðskiptavinurinn sjálfkrafa tengdur við viðkomandi hollusta forrit (við vistun)
 DocType: Account,Expense Account,Kostnaðarreikningur
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Tíminn fyrir vakt byrjun tíma þar sem starfsmaður Innritun er talinn fyrir mætingu.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Tengsl við Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Búðu til reiknivél
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Greiðslubókin er þegar til staðar {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} verður að vera stilltur sem &quot;vinstri&quot;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Borga {0} {1}
+DocType: Company,Sales Settings,Sölustillingar
 DocType: Sales Order Item,Produced Quantity,Framleitt magn
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Beiðni um tilvitnun er hægt að nálgast með því að smella á eftirfarandi tengil
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nafn mánaðarlegs dreifingar
@@ -5223,6 +5276,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Sjálfgefin skatta sniðmát fyrir sölu og kaup eru búnar til.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Ekki er hægt að flytja fram eftirlitsgerð {0}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Greiðsla Til reiknings verður að vera færanleg reikningur
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Lokadagur samnings getur ekki verið minni en í dag.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Vinsamlegast settu reikning í vörugeymslu {0} eða Sjálfgefin birgðareikningur í félaginu {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Setja sem sjálfgefið
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettóþyngd þessa pakka. (reiknað sjálfkrafa sem summa nettóþyngdar atriða)
@@ -5249,8 +5303,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Útrunnið lotur
 DocType: Shipping Rule,Shipping Rule Type,Sendingartegund Tegund
 DocType: Job Offer,Accepted,Samþykkt
-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 farðu starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Þú hefur nú þegar metið mat á viðmiðunum {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Veldu hópnúmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Aldur (dagar)
@@ -5277,6 +5329,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Veldu lénin þín
 DocType: Agriculture Task,Task Name,Verkefni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Verðbréfaskráningar sem þegar hafa verið búnar til fyrir vinnuskilríki
+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 farðu starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 ,Amount to Deliver,Magn til að skila
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Fyrirtæki {0} er ekki til
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Engar vottun efnisbeiðna fannst að tengjast fyrir tiltekna hluti.
@@ -5325,6 +5379,7 @@
 DocType: Lab Prescription,Test Code,Prófunarregla
 DocType: Purchase Taxes and Charges,On Previous Row Total,Á fyrri röð alls
 DocType: Student,Student Email Address,Nemandi netfang
+,Delayed Item Report,Tafir á skýrslunni
 DocType: Academic Term,Education,Menntun
 DocType: Supplier Quotation,Supplier Address,Birgir Heimilisfang
 DocType: Salary Detail,Do not include in total,Ekki innifalið alls
@@ -5332,7 +5387,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} er ekki til
 DocType: Purchase Receipt Item,Rejected Quantity,Hafnað Magn
 DocType: Cashier Closing,To TIme,Til tímans
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlut: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Daglegur vinnusamningur hópur notandi
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Önnur atriði má ekki vera eins og vörukóði
@@ -5384,6 +5438,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Tafir milli afhendingarstöðva
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frysta birgðir eldri en [dagar]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Kynningaráætlun Vara Afsláttur
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Útgáfuárangur er þegar til staðar
 DocType: Account,Asset Received But Not Billed,Eign móttekin en ekki reiknuð
 DocType: POS Closing Voucher,Total Collected Amount,Samtals safnað upphæð
 DocType: Course,Default Grading Scale,Sjálfgefin flokkun mælikvarða
@@ -5426,6 +5481,7 @@
 DocType: Contract,Fulfilment Terms,Uppfyllingarskilmálar
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Óflokkað í hóp
 DocType: Student Guardian,Mother,Móðir
+DocType: Issue,Service Level Agreement Fulfilled,Samningur um þjónustustig uppfyllt
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Dragðu skatt fyrir óinnheimtar launþegar
 DocType: Travel Request,Travel Funding,Ferðasjóður
 DocType: Shipping Rule,Fixed,Fastur
@@ -5455,10 +5511,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Engar vörur fundust.
 DocType: Item Attribute,From Range,Frá sviðinu
 DocType: Clinical Procedure,Consumables,Rekstrarvörur
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;worker_field_value&#39; og &#39;timestamp&#39; eru nauðsynlegar.
 DocType: Purchase Taxes and Charges,Reference Row #,Tilvísunarlína #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Vinsamlegast settu &#39;Kostnaðarverð fyrir eignavörun&#39; í félaginu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Greiðsluskilríki er nauðsynlegt til að ljúka verkinu
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Smelltu á þennan hnapp til að draga söluuppboðsgögnin þín frá Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Vinnutími undir hvaða hálfdagi er merktur. (Núll til að slökkva á)
 ,Assessment Plan Status,Mat á stöðu áætlunarinnar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Vinsamlegast veldu {0} fyrst
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Sendu inn þetta til að búa til starfsmannaskrá
@@ -5529,6 +5587,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Setja opinn
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Skipta um síur
 DocType: Production Plan,Material Request Detail,Efnisbeiðni Detail
+DocType: Shift Type,Process Attendance After,Aðgangsefni Aðkoma Eftir
 DocType: Material Request Item,Quantity and Warehouse,Magn og vöruhús
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Fara í forrit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Afrita færslu í tilvísunum {1} {2}
@@ -5586,6 +5645,7 @@
 DocType: Pricing Rule,Party Information,Upplýsingar um aðila
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Skuldara ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Hingað til getur ekki verið meiri en lélegur dagsetning starfsmanns
+DocType: Shift Type,Enable Exit Grace Period,Gakktu úr gildi lokadag
 DocType: Expense Claim,Employees Email Id,Starfsmenn Email ID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Uppfæra verð frá Shopify Til ERPNext Verðskrá
 DocType: Healthcare Settings,Default Medical Code Standard,Sjálfgefin Lyfjalisti Standard
@@ -5616,7 +5676,6 @@
 DocType: Budget,Applicable on Material Request,Gildir á efnisbeiðni
 DocType: Support Settings,Search APIs,Leitarforritaskil
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Yfirvinnsla hlutfall fyrir sölu pöntunar
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Upplýsingar
 DocType: Purchase Invoice,Supplied Items,Fylgir hlutir
 DocType: Leave Control Panel,Select Employees,Veldu starfsmenn
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Veldu vaxtatekjur reikning í láni {0}
@@ -5642,7 +5701,7 @@
 ,Supplier-Wise Sales Analytics,Birgir-Wise Sala Analytics
 DocType: GSTR 3B Report,February,Febrúar
 DocType: Appraisal,For Employee,Fyrir starfsmann
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Raunverulegur Afhendingardagur
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Raunverulegur Afhendingardagur
 DocType: Sales Partner,Sales Partner Name,Nafn söluaðila
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Afskriftir Róður {0}: Afskriftir Upphafsdagur er sleginn inn sem fyrri dagsetning
 DocType: GST HSN Code,Regional,Regional
@@ -5681,6 +5740,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Birgiratafla
 DocType: Travel Itinerary,Travel To,Ferðast til
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Aðsókn
+DocType: Shift Type,Determine Check-in and Check-out,Ákveðið Innritun og Útskráning
 DocType: POS Closing Voucher,Difference,Mismunur
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Lítil
 DocType: Work Order Item,Work Order Item,Vinna pöntunarhlut
@@ -5714,6 +5774,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Lyf
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} er lokað
 DocType: Patient,Medical History,Sjúkrasaga
+DocType: Expense Claim,Expense Taxes and Charges,Kostnaðarskattar og gjöld
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Fjöldi daga eftir að reikningsdagur er liðinn áður en áskrift er felld niður eða áskriftarmerki ógreiddur
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Uppsetningar athugasemd {0} hefur þegar verið send inn
 DocType: Patient Relation,Family,Fjölskylda
@@ -5746,7 +5807,6 @@
 DocType: Dosage Strength,Strength,Styrkur
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} einingar af {1} sem þarf í {2} til að ljúka þessari færslu.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush Hráefni af undirverktaka Byggt á
-DocType: Bank Guarantee,Customer,Viðskiptavinur
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ef slökkt er á, verður fræðasvið á sviði skylt að taka þátt í verkefnaskráningu."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Fyrir hópur sem byggir á nemanda verður námsmaður hópurinn fullgiltur fyrir hvern nemanda frá námsbrautinni.
 DocType: Course,Topics,Topics
@@ -5826,6 +5886,7 @@
 DocType: Chapter,Chapter Members,Kafla meðlimir
 DocType: Warranty Claim,Service Address,Þjónustanúmer
 DocType: Journal Entry,Remark,Athugasemd
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Magn ekki í boði fyrir {4} í vörugeymslu {1} við birtingu tíma færslunnar ({2} {3})
 DocType: Patient Encounter,Encounter Time,Fundur tími
 DocType: Serial No,Invoice Details,Reikningsupplýsingar
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Frekari reikningar geta verið gerðar undir hópum, en færslur geta verið gerðar gegn öðrum hópum"
@@ -5906,6 +5967,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Lokun (Opnun + Samtals)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Criteria Formula
 apps/erpnext/erpnext/config/support.py,Support Analytics,Stuðningur Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Tæki til að taka þátt í tækinu (líffræðileg / RF-merkið)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Review og aðgerð
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ef reikningurinn er frosinn, eru færslur heimilt að takmarka notendur."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Fjárhæð eftir afskriftir
@@ -5927,6 +5989,7 @@
 DocType: Salary Slip,Loan Repayment,Lán endurgreiðslu
 DocType: Employee Education,Major/Optional Subjects,Major / Valfrjálst efni
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Birgir Heimilisfang og Tengiliðir
 DocType: Bank Guarantee,Bank Guarantee Type,Bankareikningsgerð
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ef slökkt er á, mun &#39;Rounded Total&#39; reitinn ekki vera sýnilegur í öllum viðskiptum"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5965,6 +6028,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Opnun Reikningur Verkfæri Tól
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Innifalið POS-viðskipti
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Engin starfsmaður fannst fyrir viðkomandi starfsmannasviðsvirði. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Móttekin upphæð (félags gjaldmiðill)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage er fullt, ekki vistað"
 DocType: Chapter Member,Chapter Member,Kafli meðlimur
@@ -5997,6 +6061,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Engar nemendahópar búin til.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Afrita röð {0} með sama {1}
 DocType: Employee,Salary Details,Laun Upplýsingar
+DocType: Employee Checkin,Exit Grace Period Consequence,Hætta við náðartími
 DocType: Bank Statement Transaction Invoice Item,Invoice,Reikningur
 DocType: Special Test Items,Particulars,Upplýsingar
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Vinsamlegast settu síu á grundvelli vöru eða vöruhús
@@ -6098,6 +6163,7 @@
 DocType: Serial No,Out of AMC,Út af AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Starfsupplýsing, krafist er krafist o.fl."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Skip til ríkis
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Viltu leggja fram beiðni um efni
 DocType: Opportunity Item,Basic Rate,Grunngildi
 DocType: Compensatory Leave Request,Work End Date,Vinna Lokadagur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Beiðni um hráefni
@@ -6283,6 +6349,7 @@
 DocType: Sales Order Item,Gross Profit,Brúttóhagnaður
 DocType: Quality Inspection,Item Serial No,Vörunúmer nr
 DocType: Asset,Insurer,Vátryggjandi
+DocType: Employee Checkin,OUT,ÚT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Kaupverð
 DocType: Asset Maintenance Task,Certificate Required,Vottorð sem krafist er
 DocType: Retention Bonus,Retention Bonus,Varðveisla bónus
@@ -6398,6 +6465,8 @@
 DocType: Invoice Discounting,Sanctioned,Refsað
 DocType: Course Enrollment,Course Enrollment,Námskeiðaskráning
 DocType: Item,Supplier Items,Birgir
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Upphafstími getur ekki verið meiri en eða jafnt við lokatíma \ fyrir {0}.
 DocType: Sales Order,Not Applicable,Ekki við
 DocType: Support Search Source,Response Options,Svörunarvalkostir
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} ætti að vera gildi á milli 0 og 100
@@ -6484,7 +6553,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Fastafjármunir
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Heildarafkoma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 DocType: Share Balance,From No,Frá nr
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Greiðsla Sáttargjald
 DocType: Purchase Invoice,Taxes and Charges Added,Skattar og gjöld bætt við
@@ -6592,6 +6660,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Hunsa verðlagsreglu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Matur
 DocType: Lost Reason Detail,Lost Reason Detail,Lost Reason Detail
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Eftirfarandi raðnúmer voru búnar til: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Umsagnir viðskiptavina
 DocType: Serial No,Warranty / AMC Details,Ábyrgð / AMC Upplýsingar
 DocType: Issue,Opening Time,Opnunartími
@@ -6641,6 +6710,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Nafn fyrirtækis er ekki sama
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Ekki er hægt að leggja fram starfsmannakynningu fyrir kynningardag
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Ekki heimilt að uppfæra hlutabréfaviðskipti eldri en {0}
+DocType: Employee Checkin,Employee Checkin,Starfsmannaskoðun
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Upphafsdagur ætti að vera minni en lokadagur fyrir lið {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Búðu til tilvitnanir viðskiptavina
 DocType: Buying Settings,Buying Settings,Kaupastillingar
@@ -6662,6 +6732,7 @@
 DocType: Patient,Patient Demographics,Lýðfræðilegar upplýsingar um sjúklinga
 DocType: Share Transfer,To Folio No,Til Folio nr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Handbært fé frá rekstri
+DocType: Employee Checkin,Log Type,Skráartegund
 DocType: Stock Settings,Allow Negative Stock,Leyfa neikvæða lager
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Ekkert af hlutunum hefur nein breyting á magni eða gildi.
 DocType: Asset,Purchase Date,Kaupardagur
@@ -6706,6 +6777,7 @@
 DocType: Vital Signs,Very Hyper,Mjög há
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Veldu eðli fyrirtækis þíns.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Vinsamlegast veldu mánuð og ár
+DocType: Service Level,Default Priority,Sjálfgefin forgangur
 DocType: Student Log,Student Log,Námskrá
 DocType: Shopping Cart Settings,Enable Checkout,Virkja útskráninguna
 apps/erpnext/erpnext/config/settings.py,Human Resources,Mannauður
@@ -6734,7 +6806,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Tengdu Shopify með ERPNext
 DocType: Homepage Section Card,Subtitle,Texti
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 DocType: BOM,Scrap Material Cost(Company Currency),Úrgangur Efni Kostnaður (Company Gjaldmiðill)
 DocType: Task,Actual Start Date (via Time Sheet),Raunverulegur upphafsdagur (með tímapunkti)
 DocType: Sales Order,Delivery Date,Afhendingardagur
@@ -6789,6 +6860,7 @@
 DocType: Drug Prescription,Dosage,Skammtar
 DocType: Cheque Print Template,Starting position from top edge,Byrjunarstaða frá efstu brún
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Skipunartími (mín.)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Þessi starfsmaður hefur þegar skráð þig inn með sama tímapunkti. {0}
 DocType: Accounting Dimension,Disable,Slökkva
 DocType: Email Digest,Purchase Orders to Receive,Kaup pantanir til að fá
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Framleiðsla Pantanir má ekki hækka fyrir:
@@ -6804,7 +6876,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Efni flutt fyrir undirverktaka
 DocType: Job Card,Timing Detail,Tímasetning smáatriði
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Krafist á
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Flytur inn {0} af {1}
 DocType: Job Offer Term,Job Offer Term,Atvinnutími
 DocType: SMS Center,All Contact,Allir tengiliðir
 DocType: Project Task,Project Task,Verkefni Verkefni
@@ -6855,7 +6926,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Liður {0} er ekki uppsetning fyrir raðnúmer. Athugaðu hlutastjórann
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Frá ríki
 DocType: Leave Type,Maximum Continuous Days Applicable,Hámarks samfelldir dagar sem gilda
-apps/erpnext/erpnext/config/support.py,Support Team.,Stuðningur Team.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Vinsamlegast sláðu inn nafn fyrirtækisins fyrst
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Flytja inn árangri
 DocType: Guardian,Alternate Number,Varamaður númer
@@ -6947,6 +7017,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Row # {0}: Liður bætt við
 DocType: Student Admission,Eligibility and Details,Hæfi og upplýsingar
 DocType: Staffing Plan,Staffing Plan Detail,Starfsmannaáætlun
+DocType: Shift Type,Late Entry Grace Period,Seint inngangsfrestur
 DocType: Email Digest,Annual Income,Árleg innkoma
 DocType: Journal Entry,Subscription Section,Áskriftarspurning
 DocType: Salary Slip,Payment Days,Greiðsludagur
@@ -6997,6 +7068,7 @@
 DocType: Journal Entry Account,Account Balance,Staða reiknings
 DocType: Asset Maintenance Log,Periodicity,Tímabil
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Læknisskýrsla
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Log Tegund er krafist fyrir innritun sem fellur í vakt: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Framkvæmd
 DocType: Item,Valuation Method,Verðmatsaðferð
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} gegn sölufé {1}
@@ -7081,6 +7153,7 @@
 DocType: Loan Type,Loan Name,Nafn lán
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Stilltu sjálfgefið greiðsluaðferð
 DocType: Quality Goal,Revision,Endurskoðun
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Tíminn fyrir vakt lok tíma þegar útskráning er talin snemma (í mínútum).
 DocType: Healthcare Service Unit,Service Unit Type,Tegund þjónustunnar
 DocType: Purchase Invoice,Return Against Purchase Invoice,Return Against Purchase Invoice
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Búa til leyndarmál
@@ -7236,12 +7309,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Snyrtivörur
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Athugaðu þetta ef þú vilt þvinga notandann til að velja röð áður en þú vistar. Það verður engin sjálfgefið ef þú skoðar þetta.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Notendur með þetta hlutverk geta leyft frystum reikningum og búið til / breytt bókhaldsfærslu gegn frystum reikningum
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Expense Claim,Total Claimed Amount,Samtals krafist upphæð
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tímaskeið á næstu {0} dögum fyrir aðgerð {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Klára
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Þú getur aðeins endurnýjað ef aðild þinn rennur út innan 30 daga
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Gildi verður að vera á milli {0} og {1}
 DocType: Quality Feedback,Parameters,Parameters
+DocType: Shift Type,Auto Attendance Settings,Stillingar sjálfvirkrar viðveru
 ,Sales Partner Transaction Summary,Samantekt um sölu samstarfsaðila
 DocType: Asset Maintenance,Maintenance Manager Name,Nafn viðhaldsstjórans
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Það er nauðsynlegt til að sækja hlutatriði.
@@ -7333,10 +7408,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Staðfesta gildandi reglu
 DocType: Job Card Item,Job Card Item,Atvinna kort atriði
 DocType: Homepage,Company Tagline for website homepage,Fyrirtæki Merking fyrir heimasíðu heimasíðunnar
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Stilltu svörunartíma og upplausn fyrir forgang {0} í vísitölu {1}.
 DocType: Company,Round Off Cost Center,Round Off Kostnaður Center
 DocType: Supplier Scorecard Criteria,Criteria Weight,Viðmiðunarþyngd
 DocType: Asset,Depreciation Schedules,Afskriftiráætlanir
-DocType: Expense Claim Detail,Claim Amount,Kröfuhæð
 DocType: Subscription,Discounts,Afslættir
 DocType: Shipping Rule,Shipping Rule Conditions,Skilmálar reglna um flutning
 DocType: Subscription,Cancelation Date,Hætta við dagsetningu
@@ -7364,7 +7439,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Sýna núll gildi
 DocType: Employee Onboarding,Employee Onboarding,Starfsmaður um borð
 DocType: POS Closing Voucher,Period End Date,Tímabil Lokadagur
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Sölutækifæri eftir uppspretta
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Fyrsta leyfisveitandinn á listanum verður stilltur sem sjálfgefið leyfi fyrir leyfi.
 DocType: POS Settings,POS Settings,POS stillingar
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Allir reikningar
@@ -7385,7 +7459,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Röðin verður að vera eins og {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Heilbrigðisþjónustudeildir
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Engar færslur fundust
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Aldursbil 3
 DocType: Vital Signs,Blood Pressure,Blóðþrýstingur
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Miða á
@@ -7432,6 +7505,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Hópur
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Vörn
 DocType: Item,Has Batch No,Hefur lota nr
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Frestaðar dagar
 DocType: Lead,Person Name,Nafn persóna
 DocType: Item Variant,Item Variant,Vara Variant
 DocType: Training Event Employee,Invited,Boðið
@@ -7453,7 +7527,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Upphafs- og lokadagar ekki í gildum launum, ekki hægt að reikna {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Sýnið aðeins viðskiptavini þessara viðskiptamanna
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Veldu atriði til að vista reikninginn
-DocType: Service Level,Resolution Time,Upplausnartími
+DocType: Service Level Priority,Resolution Time,Upplausnartími
 DocType: Grading Scale Interval,Grade Description,Einkunn Lýsing
 DocType: Homepage Section,Cards,Spil
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Gæði fundargerðar
@@ -7480,6 +7554,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Uppgjör bankans samkvæmt almennum bókhaldi
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Heilbrigðisþjónusta (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Sjálfgefið vörugeymsla til að búa til sölupöntun og afhendingartilkynningu
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Svarstími fyrir {0} í vísitölu {1} getur ekki verið meiri en Upplausnartími.
 DocType: Opportunity,Customer / Lead Name,Viðskiptavinur / Lead Name
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Óhæfð upphæð
@@ -7526,7 +7601,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Flytja aðila og heimilisföng
 DocType: Item,List this Item in multiple groups on the website.,Skráðu þetta atriði í mörgum hópum á vefsíðunni.
 DocType: Request for Quotation,Message for Supplier,Skilaboð til birgis
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Ekki er hægt að breyta {0} þar sem hlutabréfaútgáfa fyrir lið {1} er til.
 DocType: Healthcare Practitioner,Phone (R),Sími (R)
 DocType: Maintenance Team Member,Team Member,Liðsfélagi
 DocType: Asset Category Account,Asset Category Account,Eignaflokkur reiknings
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 20aea9d..210a456 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Appuntamento {0} e Fattura di vendita {1} annullati
 DocType: Purchase Receipt,Vehicle Number,Numero del veicolo
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Il tuo indirizzo di posta elettronica...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Includi voci libro predefinite
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Includi voci libro predefinite
 DocType: Activity Cost,Activity Type,Tipo di attività
 DocType: Purchase Invoice,Get Advances Paid,Ottieni gli anticipi a pagamento
 DocType: Company,Gain/Loss Account on Asset Disposal,Conto di guadagno / perdita sullo smaltimento delle attività
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Voci di pagamento
 DocType: Employee Education,Class / Percentage,Classe / percentuale
 ,Electronic Invoice Register,Registro elettronico delle fatture
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Il numero di eventi dopo i quali viene eseguita la conseguenza.
 DocType: Sales Invoice,Is Return (Credit Note),È il ritorno (nota di credito)
+DocType: Price List,Price Not UOM Dependent,Prezzo non dipendente da UOM
 DocType: Lab Test Sample,Lab Test Sample,Esempio di test di laboratorio
 DocType: Shopify Settings,status html,stato html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ad esempio 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Retribuzione netta
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Totale fatturato Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Fattura dei materiali di consumo separatamente
+DocType: Shift Type,Working Hours Threshold for Absent,Soglia orario di lavoro assente
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Il budget non può essere assegnato contro l&#39;account di gruppo {0}
 DocType: Purchase Receipt Item,Rate and Amount,Tasso e quantità
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Fuori impostazioni paziente
 DocType: Asset,Insurance End Date,Data di fine dell&#39;assicurazione
 DocType: Bank Account,Branch Code,Codice della filiale
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,È ora di rispondere
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Forum degli utenti
 DocType: Landed Cost Item,Landed Cost Item,Articolo costo di sbarco
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Il venditore e l&#39;acquirente non possono essere uguali
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,Trasferimento
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Cerca elemento (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Risultato inviato
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Dalla data non può essere maggiore di Fino alla data
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo account. Nota: non creare account per clienti e fornitori
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Il gruppo di studenti o il programma del corso sono obbligatori
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,Nome abilità
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Stampa la pagella
 DocType: Soil Texture,Ternary Plot,Trama Ternaria
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Supporta i biglietti
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Più recente
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obbligatorio per lo stato patrimoniale
 DocType: Payment Entry,Total Allocated Amount,Importo totale stanziato
 DocType: Sales Invoice,Get Advances Received,Ricevi gli anticipi ricevuti
+DocType: Shift Type,Last Sync of Checkin,Ultima sincronizzazione del check-in
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Importo IVA incluso nel valore
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,Gruppo sanguigno
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,Crop Spacing UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Il tempo trascorso dopo l&#39;orario di inizio turno quando il check-in è considerato in ritardo (in minuti).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Esplorare
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Non sono state trovate fatture in sospeso
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} posti vacanti e {1} budget per {2} già pianificati per le società controllate di {3}. \ Puoi solo pianificare fino a {4} posti vacanti e budget {5} come da piano di assunzione del personale {6} per la casa madre {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Lastre per prodotti scontati
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Media mobile
 DocType: Employee Attendance Tool,Unmarked Attendance,Presenza non marcata
 DocType: Homepage Section,Number of Columns,Numero di colonne
+DocType: Issue Priority,Issue Priority,Priorità del problema
 DocType: Holiday List,Add Weekly Holidays,Aggiungi festività settimanali
 DocType: Shopify Log,Shopify Log,Log di Shopify
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Crea una busta salariale
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Data di rilascio
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un singolo batch che soddisfi questo requisito
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Impossibile creare il bonus di conservazione per i dipendenti di sinistra
+DocType: Employee Checkin,Location / Device ID,Posizione / ID dispositivo
 DocType: Purchase Order,To Receive,Ricevere
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità offline. Non sarai in grado di ricaricare finché non avrai la rete.
 DocType: Course Activity,Enrollment,Iscrizione
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informazioni sulla fatturazione elettronica mancanti
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nessuna richiesta materiale creata
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marca
 DocType: Loan,Total Amount Paid,Importo totale pagato
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Tutti questi articoli sono già stati fatturati
 DocType: Training Event,Trainer Name,Nome del trainer
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Si prega di citare il Lead Name in Lead {0}
 DocType: Employee,You can enter any date manually,È possibile inserire qualsiasi data manualmente
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articolo riconciliazione
+DocType: Shift Type,Early Exit Consequence,Early Exit Conseguenza
 DocType: Item Group,General Settings,impostazioni generali
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,La Scadenza non può essere effettuata prima della Data di Pubblicazione / Fattura Fornitore
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Inserire il nome del Beneficiario prima di inviarlo.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Conferma di pagamento
 ,Available Stock for Packing Items,Scorte disponibili per articoli di imballaggio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Rimuovi questa fattura {0} da C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Ogni valido check-in e check-out
 DocType: Support Search Source,Query Route String,Query Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Modello di feedback dei clienti
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Preventivi per lead o clienti.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,Controllo di autorizzazione
 ,Daily Work Summary Replies,Riepilogo del lavoro giornaliero Risposte
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
+DocType: Issue,Response By Variance,Risposta per scostamento
 DocType: Item,Sales Details,Dettagli di vendita
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Teste di lettera per modelli di stampa.
 DocType: Salary Detail,Tax on additional salary,Tassa sul salario aggiuntivo
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Progresso delle attività
 DocType: Journal Entry,Opening Entry,Ingresso di apertura
 DocType: Bank Guarantee,Charges Incurred,Spese incorse
+DocType: Shift Type,Working Hours Calculation Based On,Calcolo delle ore di lavoro basato su
 DocType: Work Order,Material Transferred for Manufacturing,Materiale trasferito per la produzione
 DocType: Products Settings,Hide Variants,Nascondi varianti
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Disabilitare la pianificazione della capacità e il monitoraggio del tempo
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,Interessi
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Quantità consumata
 DocType: Education Settings,Education Manager,Responsabile della formazione
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Pianificare i registri del tempo al di fuori degli orari di lavoro della workstation.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Punti fedeltà: {0}
 DocType: Healthcare Settings,Registration Message,Messaggio di registrazione
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Fattura già creata per tutte le ore di fatturazione
 DocType: Sales Partner,Contact Desc,Contatto Desc
 DocType: Purchase Invoice,Pricing Rules,Regole sui prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all&#39;articolo {0}, non è possibile modificare il valore di {1}"
 DocType: Hub Tracked Item,Image List,Elenco immagini
 DocType: Item Variant Settings,Allow Rename Attribute Value,Consenti Rinomina valore attributo
-DocType: Price List,Price Not UOM Dependant,Prezzo non dipendente da UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Tempo (in minuti)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Di base
 DocType: Loan,Interest Income Account,Conto dei redditi da interessi
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Seleziona il profilo POS
 DocType: Support Settings,Get Latest Query,Ottieni l&#39;ultima query
 DocType: Employee Incentive,Employee Incentive,Incentivo dei dipendenti
+DocType: Service Level,Priorities,priorità
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Aggiungi schede o sezioni personalizzate nella home page
 DocType: Homepage,Hero Section Based On,Sezione Hero basata su
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale d&#39;acquisto (tramite fattura d&#39;acquisto)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Quantità ordinata
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riga # {0}: il magazzino rifiutato è obbligatorio contro l&#39;articolo rifiutato {1}
 ,Received Items To Be Billed,Articoli ricevuti da fatturare
-DocType: Salary Slip Timesheet,Working Hours,Ore lavorative
+DocType: Attendance,Working Hours,Ore lavorative
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Metodo di pagamento
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Ordine d&#39;acquisto Articoli non ricevuti in tempo
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Durata in giorni
@@ -1572,7 +1584,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Informazioni legali e altre informazioni generali sul tuo fornitore
 DocType: Item Default,Default Selling Cost Center,Centro di costo di vendita predefinito
 DocType: Sales Partner,Address & Contacts,Indirizzo e contatti
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup&gt; Numerazione serie
 DocType: Subscriber,Subscriber,abbonato
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# modulo / articolo / {0}) non è disponibile
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Seleziona prima la data di registrazione
@@ -1583,7 +1594,7 @@
 DocType: Detected Disease,Tasks Created,Attività create
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,La BOM predefinita ({0}) deve essere attiva per questo articolo o il suo modello
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Tasso di commissione %
-DocType: Service Level,Response Time,Tempo di risposta
+DocType: Service Level Priority,Response Time,Tempo di risposta
 DocType: Woocommerce Settings,Woocommerce Settings,Impostazioni Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,La quantità deve essere positiva
 DocType: Contract,CRM,CRM
@@ -1600,7 +1611,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Transaction Data Mapping
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Un caposquadra richiede il nome di una persona o il nome di un&#39;organizzazione
 DocType: Student,Guardians,Guardiani
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione&gt; Impostazioni istruzione
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Seleziona il marchio ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Reddito medio
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
@@ -1637,6 +1647,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Il record di presenze {0} esiste contro lo studente {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Data della transazione
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Annullare l&#39;iscrizione
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Impossibile impostare il contratto sul livello di servizio {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Salario netto
 DocType: Account,Liability,Responsabilità
 DocType: Employee,Bank A/C No.,Banca A / C No.
@@ -1702,7 +1713,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice articolo materiale grezzo
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,La fattura di acquisto {0} è già stata inviata
 DocType: Fees,Student Email,Email dello studente
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Ricorsione della distinta base: {0} non può essere padre o figlio di {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Ottieni articoli dai servizi sanitari
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,La registrazione di magazzino {0} non è stata inviata
 DocType: Item Attribute Value,Item Attribute Value,Valore attributo articolo
@@ -1727,7 +1737,6 @@
 DocType: Production Plan,Select Items to Manufacture,Seleziona gli articoli da fabbricare
 DocType: Leave Application,Leave Approver Name,Lascia il nome dell&#39;approvatore
 DocType: Shareholder,Shareholder,Azionista
-DocType: Issue,Agreement Status,Stato dell&#39;accordo
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Si prega di selezionare l&#39;ammissione degli studenti, che è obbligatoria per il richiedente studente pagato"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Seleziona BOM
@@ -1990,6 +1999,7 @@
 DocType: Account,Income Account,Conto delle entrate
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Tutti i magazzini
 DocType: Contract,Signee Details,Dettagli del firmatario
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Consenti il check-out dopo l&#39;orario di fine turno (in minuti)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,procurement
 DocType: Item Group,Check this if you want to show in website,Controlla questo se vuoi mostrare nel sito web
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Anno fiscale {0} non trovato
@@ -2056,6 +2066,7 @@
 DocType: Activity Cost,Billing Rate,Tasso di fatturazione
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Avviso: esiste un altro {0} # {1} contro la partita di magazzino {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Si prega di abilitare le impostazioni di Google Maps per stimare e ottimizzare i percorsi
+DocType: Purchase Invoice Item,Page Break,Interruzione di pagina
 DocType: Supplier Scorecard Criteria,Max Score,Punteggio massimo
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,La data di inizio del rimborso non può essere precedente alla data di esborso.
 DocType: Support Search Source,Support Search Source,Supporta la fonte di ricerca
@@ -2124,6 +2135,7 @@
 DocType: Employee Transfer,Employee Transfer,Trasferimento dei dipendenti
 ,Sales Funnel,Canali di vendita
 DocType: Agriculture Analysis Criteria,Water Analysis,Analisi dell&#39;acqua
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Inizia il check-in prima dell&#39;ora di inizio turno (in minuti)
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati fino a
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Non c&#39;è nulla da modificare.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operazione {0} più lunga di qualsiasi orario di lavoro disponibile nella workstation {1}, suddividere l&#39;operazione in più operazioni"
@@ -2137,7 +2149,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},L&#39;ordine di vendita {0} è {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Ritardo nel pagamento (giorni)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Inserire i dettagli di ammortamento
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Cliente PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,La data di consegna prevista dovrebbe essere successiva alla data dell&#39;ordine cliente
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,La quantità dell&#39;articolo non può essere zero
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Attributo non valido
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Seleziona la BOM rispetto all&#39;articolo {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipo di fattura
@@ -2147,6 +2161,7 @@
 DocType: Volunteer,Afternoon,Pomeriggio
 DocType: Vital Signs,Nutrition Values,Valori nutrizionali
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Presenza di febbre (temperatura&gt; 38,5 ° C / 101,3 ° F o temperatura sostenuta&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni HR
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC invertito
 DocType: Project,Collect Progress,Raccogli progressi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energia
@@ -2197,6 +2212,7 @@
 ,Ordered Items To Be Billed,Articoli ordinati da fatturare
 DocType: Taxable Salary Slab,To Amount,Ammontare
 DocType: Purchase Invoice,Is Return (Debit Note),È il ritorno (nota di debito)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo clienti&gt; Territorio
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Iniziare
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,fondersi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Non è possibile modificare la Data di inizio dell&#39;anno fiscale e la Data di fine dell&#39;anno fiscale dopo aver salvato l&#39;anno fiscale.
@@ -2215,8 +2231,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio della manutenzione non può essere precedente alla data di consegna per il numero di serie {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Riga {0}: il tasso di cambio è obbligatorio
 DocType: Purchase Invoice,Select Supplier Address,Seleziona Indirizzo fornitore
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","La quantità disponibile è {0}, hai bisogno di {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Inserisci l&#39;API Consumer Secret
 DocType: Program Enrollment Fee,Program Enrollment Fee,Tariffa di iscrizione al programma
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,Data di scadenza della garanzia
 DocType: Hotel Room Pricing,Hotel Room Pricing,Prezzi camera d&#39;albergo
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Forniture passive passive (diverse da zero, nul rated ed esenti"
@@ -2276,6 +2294,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lettura 5
 DocType: Shopping Cart Settings,Display Settings,Impostazioni di visualizzazione
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Si prega di impostare il numero di ammortamenti prenotati
+DocType: Shift Type,Consequence after,Conseguenza dopo
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Con cosa hai bisogno di aiuto?
 DocType: Journal Entry,Printing Settings,Impostazioni di stampa
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bancario
@@ -2285,6 +2304,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,L&#39;indirizzo di fatturazione è uguale all&#39;indirizzo di spedizione
 DocType: Account,Cash,Contanti
 DocType: Employee,Leave Policy,Lascia politica
+DocType: Shift Type,Consequence,Conseguenza
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Indirizzo dello studente
 DocType: GST Account,CESS Account,Account CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: è richiesto Centro di costo per l&#39;account &quot;Profit and Loss&quot; {2}. Configurare un centro di costo predefinito per la società.
@@ -2349,6 +2369,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Voucher di chiusura del periodo
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Nome Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Si prega di inserire conto spese
+DocType: Issue,Resolution By Variance,Risoluzione per varianza
 DocType: Employee,Resignation Letter Date,Data della lettera di dimissioni
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Frequenza fino alla data
@@ -2361,6 +2382,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Guarda ora
 DocType: Item Price,Valid Upto,Valido fino a
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Il tipo di documento di riferimento deve essere uno di {0}
+DocType: Employee Checkin,Skip Auto Attendance,Salta la presenza automatica
 DocType: Payment Request,Transaction Currency,Valuta di transazione
 DocType: Loan,Repayment Schedule,Piano di rimborso
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Creare una voce di riserva per la conservazione dei campioni
@@ -2432,6 +2454,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Tasse di chiusura del POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Azione inizializzata
 DocType: POS Profile,Applicable for Users,Applicabile per gli utenti
+,Delayed Order Report,Rapporto sull&#39;ordine ritardato
 DocType: Training Event,Exam,Esame
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Rilevato numero errato di voci di contabilità generale. Potresti aver selezionato un Account sbagliato nella transazione.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Pipeline di vendita
@@ -2446,10 +2469,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Le condizioni verranno applicate su tutti gli articoli selezionati combinati.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configurazione
 DocType: Hotel Room,Capacity,Capacità
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Qtà installata
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Il batch {0} dell&#39;articolo {1} è disabilitato.
 DocType: Hotel Room Reservation,Hotel Reservation User,Utente prenotazione hotel
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,La giornata lavorativa è stata ripetuta due volte
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Il contratto di servizio con il tipo di entità {0} e l&#39;entità {1} esiste già.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Gruppo di articoli non menzionato nell&#39;articolo master per l&#39;articolo {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Errore nome: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Il territorio è obbligatorio nel profilo POS
@@ -2497,6 +2521,7 @@
 DocType: Depreciation Schedule,Schedule Date,Data del programma
 DocType: Packing Slip,Package Weight Details,Dettagli del peso del pacchetto
 DocType: Job Applicant,Job Opening,Job Opening
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Ultima sincronizzazione conosciuta con successo del check-in dei dipendenti. Resettare questo solo se si è sicuri che tutti i registri sono sincronizzati da tutte le posizioni. Si prega di non modificare questo se non siete sicuri.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Costo attuale
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),L&#39;anticipo totale ({0}) contro l&#39;ordine {1} non può essere maggiore del Totale generale ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Varianti articolo aggiornate
@@ -2541,6 +2566,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Ottieni invocazioni
 DocType: Tally Migration,Is Day Book Data Imported,I dati del libro del giorno sono importati
 ,Sales Partners Commission,Commissione per i partner di vendita
+DocType: Shift Type,Enable Different Consequence for Early Exit,Abilita la conseguenza diversa per l&#39;uscita anticipata
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,legale
 DocType: Loan Application,Required by Date,Richiesto per data
 DocType: Quiz Result,Quiz Result,Risultato del quiz
@@ -2600,7 +2626,6 @@
 DocType: Pricing Rule,Pricing Rule,Regola dei prezzi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Elenco festività facoltativo non impostato per periodo di ferie {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Impostare il campo ID utente in un record Impiegato per impostare Ruolo dipendente
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Tempo di risolvere
 DocType: Training Event,Training Event,Evento di formazione
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","La normale pressione sanguigna a riposo in un adulto è di circa 120 mmHg sistolica e 80 mmHg diastolica, abbreviata &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Il sistema recupera tutte le voci se il valore limite è zero.
@@ -2644,6 +2669,7 @@
 DocType: Student Applicant,Approved,Approvato
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data dovrebbe essere entro l&#39;anno fiscale. Supponendo dalla data = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Si prega di impostare il gruppo di fornitori in Impostazioni acquisto.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} è uno stato di partecipazione non valido.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Conto di apertura temporaneo
 DocType: Purchase Invoice,Cash/Bank Account,Contanti / conto bancario
 DocType: Quality Meeting Table,Quality Meeting Table,Tavolo riunioni di qualità
@@ -2679,6 +2705,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Cibo, bevande e tabacco"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Orario del corso
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Dettaglio di IVA saggio articolo
+DocType: Shift Type,Attendance will be marked automatically only after this date.,La partecipazione verrà contrassegnata automaticamente solo dopo questa data.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Forniture fatte ai possessori di UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Richiesta di quotazioni
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,La valuta non può essere cambiata dopo aver effettuato le voci utilizzando un&#39;altra valuta
@@ -2727,7 +2754,6 @@
 DocType: Item,Is Item from Hub,È l&#39;oggetto dall&#39;hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Procedura di qualità.
 DocType: Share Balance,No of Shares,No di azioni
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riga {0}: Qtà non disponibile per {4} nel magazzino {1} al momento della registrazione della voce ({2} {3})
 DocType: Quality Action,Preventive,preventivo
 DocType: Support Settings,Forum URL,URL del forum
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Dipendente e presenze
@@ -2949,7 +2975,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Imposte e commissioni predefinite
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su transazioni contro questo Fornitore. Vedi la cronologia qui sotto per i dettagli
 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 dipendente {0} supera {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Inserisci la data di inizio e di fine dell&#39;accordo.
 DocType: Delivery Note Item,Against Sales Invoice,Contro la fattura di vendita
 DocType: Loyalty Point Entry,Purchase Amount,Ammontare dell&#39;acquisto
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Impossibile impostare Lost come ordine di vendita.
@@ -2973,7 +2998,7 @@
 DocType: Lead,Organization Name,Nome dell&#39;organizzazione
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Valido da e valido fino ai campi sono obbligatori per il cumulativo
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Riga n. {0}: il numero di lotto deve essere uguale a {1} {2}
-DocType: Employee,Leave Details,Lasciare i dettagli
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Le transazioni di magazzino prima di {0} sono congelate
 DocType: Driver,Issuing Date,Data di rilascio
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Richiedente
@@ -3018,9 +3043,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Dettagli del modello di mappatura del flusso di cassa
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Reclutamento e formazione
 DocType: Drug Prescription,Interval UOM,Intervallo UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Impostazioni del periodo di tolleranza per la presenza automatica
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Dalla valuta e alla valuta non può essere lo stesso
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Pharmaceuticals
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Ore di supporto
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} è stato cancellato o chiuso
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Riga {0}: l&#39;anticipo sul cliente deve essere accreditato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Raggruppa per voucher (consolidato)
@@ -3130,6 +3157,7 @@
 DocType: Territory,Territory Manager,Responsabile del territorio
 DocType: Lab Test,Sample ID,ID campione
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Il carrello è vuoto
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,La partecipazione è stata contrassegnata come per i check-in dei dipendenti
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,L&#39;asset {0} deve essere inviato
 ,Absent Student Report,Rapporto dello studente assente
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Incluso nel profitto lordo
@@ -3137,7 +3165,9 @@
 DocType: Travel Request Costing,Funded Amount,Importo finanziato
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} non è stato inviato in modo che l&#39;azione non possa essere completata
 DocType: Subscription,Trial Period End Date,Data di fine periodo di prova
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Inserimenti alternati come IN e OUT durante lo stesso turno
 DocType: BOM Update Tool,The new BOM after replacement,La nuova BOM dopo la sostituzione
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Articolo 5
 DocType: Employee,Passport Number,Numero di passaporto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Apertura temporanea
@@ -3253,6 +3283,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Possibile fornitore
 ,Issued Items Against Work Order,Articoli emessi contro l&#39;ordine di lavoro
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creazione di {0} fattura
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il Sistema di denominazione degli istruttori in Istruzione&gt; Impostazioni istruzione
 DocType: Student,Joining Date,Data di adesione
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Sito richiedente
 DocType: Purchase Invoice,Against Expense Account,Contro Conto spese
@@ -3292,6 +3323,7 @@
 DocType: Landed Cost Item,Applicable Charges,Spese applicabili
 ,Point of Sale,Punto vendita
 DocType: Authorization Rule,Approving User  (above authorized value),Approvazione dell&#39;utente (sopra il valore autorizzato)
+DocType: Service Level Agreement,Entity,Entità
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Il cliente {0} non appartiene al progetto {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Dal nome del partito
@@ -3338,6 +3370,7 @@
 DocType: Soil Texture,Sand Composition (%),Composizione di sabbia (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Importa dati del libro del giorno
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie di denominazione per {0} tramite Impostazione&gt; Impostazioni&gt; Serie di denominazione
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Il centro di costo è richiesto per prenotare una richiesta di rimborso spese
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} numero seriale valido per l&#39;articolo {1}
@@ -3398,7 +3431,6 @@
 DocType: Asset,Asset Owner,Proprietario del bene
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Il magazzino è obbligatorio per gli articoli in magazzino {0} nella riga {1}
 DocType: Stock Entry,Total Additional Costs,Totale costi aggiuntivi
-DocType: Marketplace Settings,Last Sync On,Ultima sincronizzazione
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Si prega di impostare almeno una riga nella tabella delle tasse e degli addebiti
 DocType: Asset Maintenance Team,Maintenance Team Name,Nome del team di manutenzione
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Grafico dei centri di costo
@@ -3414,12 +3446,12 @@
 DocType: Job Card,WIP Warehouse,Magazzino WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ID utente non impostato per Dipendente {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Qtà disponibile è {0}, hai bisogno di {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,L&#39;utente {0} creato
 DocType: Stock Settings,Item Naming By,Nome oggetto da
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Ordinato
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Questo è un gruppo clienti root e non può essere modificato.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,La richiesta materiale {0} è stata annullata o interrotta
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Strettamente basato sul tipo di registro nel check-in dei dipendenti
 DocType: Purchase Order Item Supplied,Supplied Qty,Q. fornitura
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,Sabbia
@@ -3478,6 +3510,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Gruppo di articoli duplicati trovato nella tabella del gruppo di articoli
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Salario annuo
 DocType: Supplier Scorecard,Weighting Function,Funzione di ponderazione
+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 articolo: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Errore durante la valutazione della formula dei criteri
 ,Lab Test Report,Rapporto di prova di laboratorio
 DocType: BOM,With Operations,Con le operazioni
@@ -3491,6 +3524,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Nessun rimborso disponibile per l&#39;inserimento prima nota
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} è studente inattivo
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Fai l&#39;entrata di riserva
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Ricorsione della distinta base: {0} non può essere padre o figlio di {1}
 DocType: Employee Onboarding,Activities,attività
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Almeno un magazzino è obbligatorio
 ,Customer Credit Balance,Saldo del credito cliente
@@ -3503,9 +3537,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Programma di fidelizzazione multipla trovato per il cliente. Si prega di selezionare manualmente.
 DocType: Patient,Medication,medicazione
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Seleziona il programma fedeltà
+DocType: Employee Checkin,Attendance Marked,Presenza Segnata
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Materiali grezzi
 DocType: Sales Order,Fully Billed,Completamente fatturato
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Si prega di impostare la tariffa della camera dell&#39;hotel su {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Seleziona solo una priorità come predefinita.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Identifica / crea Account (Ledger) per il tipo - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,L&#39;importo totale del credito / debito dovrebbe essere uguale al valore inserito nel giornale
 DocType: Purchase Invoice Item,Is Fixed Asset,È Fixed Asset
@@ -3526,6 +3562,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Conferma dell&#39;appuntamento
 DocType: Shopping Cart Settings,Orders,Ordini
 DocType: HR Settings,Retirement Age,Età di pensionamento
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configurare le serie di numerazione per Presenze tramite Setup&gt; Numerazione serie
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Qtà proiettata
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},La cancellazione non è consentita per il Paese {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Riga # {0}: il valore {1} è già {2}
@@ -3609,11 +3646,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contabile
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},Alreday del voucher POS Closing esiste per {0} tra la data {1} e {2}
 apps/erpnext/erpnext/config/help.py,Navigating,navigazione
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Nessuna fattura in sospeso richiede una rivalutazione del tasso di cambio
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nome oggetto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Il nuovo numero di serie non può avere il magazzino. Il magazzino deve essere impostato in base all&#39;iscrizione o alla ricevuta d&#39;acquisto
 DocType: Issue,Via Customer Portal,Tramite il Portale del cliente
 DocType: Work Order Operation,Planned Start Time,Ora di inizio prevista
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} è {2}
+DocType: Service Level Priority,Service Level Priority,Priorità del livello di servizio
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Il numero di ammortamenti prenotati non può essere maggiore del numero totale di ammortamenti
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Condividi Ledger
 DocType: Journal Entry,Accounts Payable,È possibile pagare per questi account
@@ -3724,7 +3763,6 @@
 DocType: Delivery Note,Delivery To,Consegnare a
 DocType: Bank Statement Transaction Settings Item,Bank Data,Dati bancari
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Pianificato fino a
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Mantenere le ore di fatturazione e le ore di lavoro uguali su Timesheet
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Traccia i lead per lead source.
 DocType: Clinical Procedure,Nursing User,Utente infermieristico
 DocType: Support Settings,Response Key List,Elenco delle chiavi di risposta
@@ -3892,6 +3930,7 @@
 DocType: Work Order Operation,Actual Start Time,Ora di inizio effettiva
 DocType: Antibiotic,Laboratory User,Utente di laboratorio
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Aste online
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,La priorità {0} è stata ripetuta.
 DocType: Fee Schedule,Fee Creation Status,Stato di creazione della tariffa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,software
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Ordine di vendita a pagamento
@@ -3958,6 +3997,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Impossibile recuperare le informazioni per {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La valuta di fatturazione deve essere uguale alla valuta della società predefinita o alla valuta dell&#39;account del partito
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Inserisci l&#39;ID dipendente di questo addetto alle vendite
+DocType: Shift Type,Early Exit Consequence after,Early Exit Conseguenza dopo
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Creare vendite iniziali e fatture di acquisto
 DocType: Disease,Treatment Period,Periodo di trattamento
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Configurazione di e-mail
@@ -3975,7 +4015,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Nome dello studente:
 DocType: SMS Log,Sent On,Inviato
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Fattura di vendita
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Il tempo di risposta non può essere maggiore del tempo di risoluzione
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","Per il gruppo di studenti basato sul corso, il corso sarà convalidato per ogni studente dai corsi iscritti nell&#39;iscrizione al programma."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Forniture interne allo stato
 DocType: Employee,Create User Permission,Crea autorizzazione utente
@@ -4014,6 +4053,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Condizioni contrattuali standard per vendite o acquisti.
 DocType: Sales Invoice,Customer PO Details,Dettagli ordine cliente
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Paziente non trovato
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Seleziona una priorità predefinita.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Rimuovi l&#39;articolo se l&#39;addebito non è applicabile a quell&#39;oggetto
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Un gruppo di clienti esiste con lo stesso nome, si prega di cambiare il nome del cliente o rinominare il gruppo di clienti"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4053,6 +4093,7 @@
 DocType: Support Settings,Support Portal,Portale di supporto
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,La data di fine dell&#39;attività <b>{0}</b> non può essere inferiore alla <b>{1}</b> data di inizio prevista <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Il dipendente {0} è in attesa su {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Questo accordo sul livello di servizio è specifico per il cliente {0}
 DocType: Employee,Held On,Tenuto acceso
 DocType: Healthcare Practitioner,Practitioner Schedules,Orari del praticante
 DocType: Project Template Task,Begin On (Days),Inizia su (giorni)
@@ -4060,6 +4101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},L&#39;ordine di lavoro è stato {0}
 DocType: Inpatient Record,Admission Schedule Date,Data del programma di ammissione
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Regolazione del valore del patrimonio
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Contrassegnare la presenza in base a &quot;Employee Checkin&quot; per i dipendenti assegnati a questo turno.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Forniture effettuate a persone non registrate
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Tutti i lavori
 DocType: Appointment Type,Appointment Type,Tipo di appuntamento
@@ -4173,7 +4215,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso del materiale di imballaggio. (per la stampa)
 DocType: Plant Analysis,Laboratory Testing Datetime,Test di laboratorio datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,L&#39;articolo {0} non può avere Batch
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Pipeline di vendita per fase
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Forza del gruppo di studenti
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Voce di transazione conto bancario
 DocType: Purchase Order,Get Items from Open Material Requests,Ottieni oggetti da richieste di materiale aperto
@@ -4255,7 +4296,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Mostra l&#39;invecchiamento del magazzino
 DocType: Sales Invoice,Write Off Outstanding Amount,Annullare la quantità eccezionale
 DocType: Payroll Entry,Employee Details,Dettagli del dipendente
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,L&#39;ora di inizio non può essere maggiore dell&#39;ora di fine per {0}.
 DocType: Pricing Rule,Discount Amount,Totale sconto
 DocType: Healthcare Service Unit Type,Item Details,Dettagli dell&#39;articolo
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Dichiarazione fiscale duplicata di {0} per il periodo {1}
@@ -4308,7 +4348,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,La retribuzione netta non può essere negativa
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,No di interazioni
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},La riga {0} # Item {1} non può essere trasferita più di {2} rispetto all&#39;ordine di acquisto {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Cambio
+DocType: Attendance,Shift,Cambio
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Elaborazione del piano dei conti e delle parti
 DocType: Stock Settings,Convert Item Description to Clean HTML,Converti la descrizione dell&#39;oggetto in Pulisci HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Tutti i gruppi di fornitori
@@ -4379,6 +4419,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Unità di servizio genitore
 DocType: Sales Invoice,Include Payment (POS),Includi pagamento (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Private Equity
+DocType: Shift Type,First Check-in and Last Check-out,Primo check-in e ultimo check-out
 DocType: Landed Cost Item,Receipt Document,Documento di ricevuta
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Periodo Scorecard fornitore
 DocType: Employee Grade,Default Salary Structure,Struttura salariale predefinita
@@ -4461,6 +4502,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Creare un ordine d&#39;acquisto
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definire il budget per un esercizio finanziario.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,La tabella degli account non può essere vuota.
+DocType: Employee Checkin,Entry Grace Period Consequence,Entrata Grace Period Conseguenza
 ,Payment Period Based On Invoice Date,Periodo di pagamento basato sulla data della fattura
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},La data di installazione non può essere precedente alla data di consegna per l&#39;articolo {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Link a richiesta materiale
@@ -4469,6 +4511,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: esiste già una voce Riordina per questo magazzino {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Data
 DocType: Monthly Distribution,Distribution Name,Nome di distribuzione
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Il giorno lavorativo {0} è stato ripetuto.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Raggruppa a non-gruppo
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Aggiornamento in corso. Potrebbe volerci un po &#39;.
 DocType: Item,"Example: ABCD.#####
@@ -4481,6 +4524,7 @@
 DocType: Vehicle Log,Fuel Qty,Qtà di carburante
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,erogato
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Tempo dopo la fine del turno durante il quale il check-out è considerato per la partecipazione.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Variazione netta in Contabilità fornitori
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Non disponibile
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Mezza giornata
@@ -4494,7 +4538,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Mostra PDC in stampa
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify fornitore
 DocType: POS Profile User,POS Profile User,Utente profilo POS
-DocType: Student,Middle Name,Secondo nome
 DocType: Sales Person,Sales Person Name,Nome della persona di vendita
 DocType: Packing Slip,Gross Weight,Peso lordo
 DocType: Journal Entry,Bill No,Bill No
@@ -4503,7 +4546,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Accordo sul livello di servizio
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Selezionare prima Dipendente e Data
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Il tasso di valutazione dell&#39;articolo viene ricalcolato in base all&#39;importo del buono del costo a terra
 DocType: Timesheet,Employee Detail,Dipendente
 DocType: Tally Migration,Vouchers,Buoni
@@ -4538,7 +4580,7 @@
 DocType: Additional Salary,Date on which this component is applied,Data in cui questo componente è applicato
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Elenco di azionisti disponibili con numeri di folio
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Imposta account Gateway.
-DocType: Service Level,Response Time Period,Tempo di risposta
+DocType: Service Level Priority,Response Time Period,Tempo di risposta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Tasse e spese di acquisto
 DocType: Course Activity,Activity Date,Data di attività
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Seleziona o aggiungi un nuovo cliente
@@ -4563,6 +4605,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Anno finanziario
 DocType: Sales Invoice Item,Deferred Revenue,Ricavo differito
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Si deve selezionare almeno una delle vendite o degli acquisti
+DocType: Shift Type,Working Hours Threshold for Half Day,Soglia orario di lavoro per mezza giornata
 ,Item-wise Purchase History,Storico acquisti degli articoli
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Impossibile modificare la data di interruzione del servizio per l&#39;articolo nella riga {0}
 DocType: Production Plan,Include Subcontracted Items,Includi elementi in conto lavoro
@@ -4595,6 +4638,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Consenti allo stesso articolo più volte
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Crea BOM
 DocType: Healthcare Practitioner,Charges,oneri
+DocType: Employee,Attendance and Leave Details,Partecipazione e lasciare dettagli
 DocType: Student,Personal Details,Dati personali
 DocType: Sales Order,Billing and Delivery Status,Stato di fatturazione e consegna
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: per il fornitore {0} è richiesto l&#39;indirizzo email per inviare e-mail
@@ -4646,7 +4690,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Inserisci il valore betweeen {0} e {1}
 DocType: Purchase Order,Order Confirmation Date,Data di conferma dell&#39;ordine
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Calcola i tempi di arrivo stimati
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni HR
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,consumabili
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Data di inizio dell&#39;iscrizione
@@ -4669,7 +4712,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Conto di registrazione a giornale
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variante
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Attività del forum
-DocType: Service Level,Resolution Time Period,Periodo di risoluzione
+DocType: Service Level Priority,Resolution Time Period,Periodo di risoluzione
 DocType: Request for Quotation,Supplier Detail,Dettaglio del fornitore
 DocType: Project Task,View Task,Visualizza attività
 DocType: Serial No,Purchase / Manufacture Details,Dettagli di acquisto / fabbricazione
@@ -4736,6 +4779,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Il magazzino può essere modificato solo tramite Registrazione / Nota di consegna / Ricevuta di acquisto
 DocType: Support Settings,Close Issue After Days,Chiudi problema dopo giorni
 DocType: Payment Schedule,Payment Schedule,Programma di pagamento
+DocType: Shift Type,Enable Entry Grace Period,Abilita periodo di grazia di entrata
 DocType: Patient Relation,Spouse,Sposa
 DocType: Purchase Invoice,Reason For Putting On Hold,Motivo per mettere in attesa
 DocType: Item Attribute,Increment,Incremento
@@ -4875,6 +4919,7 @@
 DocType: Vehicle Log,Invoice Ref,Rif. Fattura
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},Il modulo C non è applicabile per la fattura: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Fattura creata
+DocType: Shift Type,Early Exit Grace Period,Periodo di grazia di uscita anticipata
 DocType: Patient Encounter,Review Details,Rivedi i dettagli
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Riga {0}: il valore delle ore deve essere maggiore di zero.
 DocType: Account,Account Number,Numero di conto
@@ -4886,7 +4931,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Applicabile se la società è SpA, SApA o SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Condizioni di sovrapposizione tra:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Pagato e non consegnato
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Il codice articolo è obbligatorio perché l&#39;articolo non viene numerato automaticamente
 DocType: GST HSN Code,HSN Code,Codice HSN
 DocType: GSTR 3B Report,September,settembre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Spese amministrative
@@ -4922,6 +4966,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Account CWIP
 DocType: SMS Log,Sender Name,Nome del mittente
 DocType: Pricing Rule,Supplier Group,Gruppo di fornitori
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Imposta l&#39;ora di inizio e l&#39;ora di fine per il giorno di supporto {0} all&#39;indice {1}.
 DocType: Employee,Date of Issue,Data di emissione
 ,Requested Items To Be Transferred,Elementi richiesti da trasferire
 DocType: Employee,Contract End Date,Data di fine del contratto
@@ -4932,6 +4978,7 @@
 DocType: Opportunity,Sales Stage,Fase di vendita
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Words sarà visibile una volta salvato l&#39;ordine di vendita.
 DocType: Item Reorder,Re-order Level,Livello di riordino
+DocType: Shift Type,Enable Auto Attendance,Abilita presenze automatiche
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Preferenza
 ,Department Analytics,Analisi del dipartimento
 DocType: Crop,Scientific Name,Nome scientifico
@@ -4944,6 +4991,7 @@
 DocType: Quiz Activity,Quiz Activity,Attività del quiz
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} non è in un periodo di stipendio valido
 DocType: Timesheet,Billed,fatturato
+apps/erpnext/erpnext/config/support.py,Issue Type.,Tipo di problema.
 DocType: Restaurant Order Entry,Last Sales Invoice,Ultima fattura di vendita
 DocType: Payment Terms Template,Payment Terms,Termini di pagamento
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Quantità prenotata: quantità ordinata per la vendita, ma non consegnata."
@@ -5039,6 +5087,7 @@
 DocType: Account,Asset,Bene
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} non ha un programma di Practitioner sanitario. Aggiungilo nel master Practitioner sanitario
 DocType: Vehicle,Chassis No,Telaio n
+DocType: Employee,Default Shift,Shift predefinito
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Abbreviazione di società
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Albero della distinta dei materiali
 DocType: Article,LMS User,Utente LMS
@@ -5087,6 +5136,7 @@
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Student Group Creation Tool,Get Courses,Ottieni corsi
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riga # {0}: la quantità deve essere 1, poiché la voce è una risorsa fissa. Si prega di utilizzare una riga separata per più qty."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Ore lavorative sotto le quali Absent è segnato. (Zero da disabilitare)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Solo i nodi foglia sono consentiti nella transazione
 DocType: Grant Application,Organization,Organizzazione
 DocType: Fee Category,Fee Category,Categoria a pagamento
@@ -5099,6 +5149,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Si prega di aggiornare il proprio stato per questo evento di formazione
 DocType: Volunteer,Morning,Mattina
 DocType: Quotation Item,Quotation Item,Quotazione
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Priorità del problema.
 DocType: Journal Entry,Credit Card Entry,Entrata della carta di credito
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Intervallo di tempo saltato, lo slot da {0} a {1} si sovrappone agli slot esistenti da {2} a {3}"
 DocType: Journal Entry Account,If Income or Expense,Se reddito o spesa
@@ -5149,11 +5200,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Importazione e impostazioni dei dati
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Se l&#39;opzione Auto Opt In è selezionata, i clienti saranno automaticamente collegati al Programma fedeltà in questione (salvo)"
 DocType: Account,Expense Account,Conto spese
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Il tempo che precede l&#39;orario di inizio del turno durante il quale viene preso in considerazione il check-in per i dipendenti.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Relazione con Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Crea fattura
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},La richiesta di pagamento esiste già {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Il dipendente alleviato {0} deve essere impostato come &#39;Sinistra&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Paga {0} {1}
+DocType: Company,Sales Settings,Impostazioni di vendita
 DocType: Sales Order Item,Produced Quantity,Quantità prodotta
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,È possibile accedere alla richiesta di preventivo facendo clic sul seguente link
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
@@ -5232,6 +5285,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Vengono creati modelli di imposta predefiniti per vendite e acquisti.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Lasciare il tipo {0} non può essere portato indietro
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Il conto Debit To deve essere un account Receitable
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,La data di fine dell&#39;accordo non può essere inferiore a oggi.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Imposta Account in Magazzino {0} o Account inventario predefinito in Azienda {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Imposta come predefinito
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Il peso netto di questo pacchetto. (calcolato automaticamente come somma del peso netto degli articoli)
@@ -5258,8 +5312,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Lotti scaduti
 DocType: Shipping Rule,Shipping Rule Type,Tipo di regola di spedizione
 DocType: Job Offer,Accepted,Accettato
-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","Per favore cancella il Dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per cancellare questo documento"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Hai già valutato i criteri di valutazione {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Seleziona numeri di serie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Età (giorni)
@@ -5286,6 +5338,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Seleziona i tuoi domini
 DocType: Agriculture Task,Task Name,Nome dell&#39;attività
 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/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Per favore cancella il Dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per cancellare questo documento"
 ,Amount to Deliver,Importo da consegnare
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,L&#39;azienda {0} non esiste
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nessuna richiesta di materiale in sospeso trovata per il collegamento degli articoli indicati.
@@ -5335,6 +5389,7 @@
 DocType: Lab Prescription,Test Code,Codice di prova
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sul totale riga precedente
 DocType: Student,Student Email Address,Indirizzo email dello studente
+,Delayed Item Report,Rapporto sull&#39;articolo ritardato
 DocType: Academic Term,Education,Formazione scolastica
 DocType: Supplier Quotation,Supplier Address,Indirizzo del fornitore
 DocType: Salary Detail,Do not include in total,Non includere in totale
@@ -5342,7 +5397,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} non esiste
 DocType: Purchase Receipt Item,Rejected Quantity,Quantità rifiutata
 DocType: Cashier Closing,To TIme,Per il tempo
-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 articolo: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Utente del gruppo di riepilogo del lavoro giornaliero
 DocType: Fiscal Year Company,Fiscal Year Company,Società dell&#39;anno fiscale
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,L&#39;articolo alternativo non deve essere uguale al codice articolo
@@ -5394,6 +5448,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Ritardo tra le fermate di consegna
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Blocca le scorte più vecchie di [giorni]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Sconto sul prodotto promozionale
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,La priorità del problema esiste già
 DocType: Account,Asset Received But Not Billed,Attività ricevuta ma non fatturata
 DocType: POS Closing Voucher,Total Collected Amount,Importo raccolto totale
 DocType: Course,Default Grading Scale,Scala di valutazione predefinita
@@ -5436,6 +5491,7 @@
 DocType: Contract,Fulfilment Terms,Termini di adempimento
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non gruppo per gruppo
 DocType: Student Guardian,Mother,Madre
+DocType: Issue,Service Level Agreement Fulfilled,Accordo sul livello di servizio Soddisfatto
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Tassa di deduzione per benefici per i dipendenti non rivendicati
 DocType: Travel Request,Travel Funding,Finanziamento di viaggio
 DocType: Shipping Rule,Fixed,Fisso
@@ -5465,10 +5521,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nessun articolo trovato.
 DocType: Item Attribute,From Range,Dalla gamma
 DocType: Clinical Procedure,Consumables,Materiali di consumo
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&quot;employee_field_value&quot; e &quot;timestamp&quot; sono obbligatori.
 DocType: Purchase Taxes and Charges,Reference Row #,Riga di riferimento #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Impostare &quot;Centro costi ammortamento cespiti&quot; nella società {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Riga n. {0}: per completare la transazione è necessario il documento di pagamento
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Fare clic su questo pulsante per estrarre i dati dell&#39;ordine cliente da Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Orario di lavoro al di sotto del quale è contrassegnato Half Day. (Zero da disabilitare)
 ,Assessment Plan Status,Stato del piano di valutazione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Seleziona {0} per primo
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Invia questo per creare il record Dipendente
@@ -5539,6 +5597,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Imposta aperto
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Attiva i filtri
 DocType: Production Plan,Material Request Detail,Dettaglio richiesta materiale
+DocType: Shift Type,Process Attendance After,Partecipazione al processo dopo
 DocType: Material Request Item,Quantity and Warehouse,Quantità e magazzino
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Vai a Programmi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Riga # {0}: voce duplicata in Riferimenti {1} {2}
@@ -5596,6 +5655,7 @@
 DocType: Pricing Rule,Party Information,Informazioni sul partito
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debitori ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Ad oggi non può superare la data di scarico del dipendente
+DocType: Shift Type,Enable Exit Grace Period,Abilita periodo di grazia di uscita
 DocType: Expense Claim,Employees Email Id,ID e-mail dei dipendenti
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Aggiorna prezzo da Shopify al listino prezzi ERPNext
 DocType: Healthcare Settings,Default Medical Code Standard,Standard di codice medico predefinito
@@ -5626,7 +5686,6 @@
 DocType: Budget,Applicable on Material Request,Applicabile su richiesta materiale
 DocType: Support Settings,Search APIs,Cerca API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Percentuale di sovrapproduzione per ordine di vendita
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,specificazioni
 DocType: Purchase Invoice,Supplied Items,Articoli forniti
 DocType: Leave Control Panel,Select Employees,Seleziona dipendenti
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Seleziona il conto interessi attivi in prestito {0}
@@ -5652,7 +5711,7 @@
 ,Supplier-Wise Sales Analytics,Analisi delle vendite corrette per fornitori
 DocType: GSTR 3B Report,February,febbraio
 DocType: Appraisal,For Employee,Per il dipendente
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Data di consegna effettiva
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Data di consegna effettiva
 DocType: Sales Partner,Sales Partner Name,Nome del partner di vendita
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Riga di ammortamento {0}: Data di inizio ammortamento è inserita come data precedente
 DocType: GST HSN Code,Regional,Regionale
@@ -5691,6 +5750,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Scorecard fornitore
 DocType: Travel Itinerary,Travel To,Viaggiare a
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Segna la presenza
+DocType: Shift Type,Determine Check-in and Check-out,Determinare il check-in e il check-out
 DocType: POS Closing Voucher,Difference,Differenza
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Piccolo
 DocType: Work Order Item,Work Order Item,Articolo dell&#39;ordine di lavoro
@@ -5724,6 +5784,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Droga
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} è chiuso
 DocType: Patient,Medical History,Storia medica
+DocType: Expense Claim,Expense Taxes and Charges,Spese e spese
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Numero di giorni trascorsi dalla data della fattura prima di annullare l&#39;abbonamento o di contrassegnare l&#39;abbonamento come non pagato
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,La nota di installazione {0} è già stata inviata
 DocType: Patient Relation,Family,Famiglia
@@ -5756,7 +5817,6 @@
 DocType: Dosage Strength,Strength,Forza
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} unità di {1} necessarie in {2} per completare questa transazione.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush Materie prime di subappalto basati su
-DocType: Bank Guarantee,Customer,Cliente
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Se abilitato, il campo Termine accademico sarà obbligatorio nello strumento di registrazione del programma."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Per il gruppo di studenti basato su batch, lo Student Batch verrà convalidato per ogni studente dall&#39;iscrizione al programma."
 DocType: Course,Topics,Temi
@@ -5836,6 +5896,7 @@
 DocType: Chapter,Chapter Members,Membri del Capitolo
 DocType: Warranty Claim,Service Address,Indirizzo di servizio
 DocType: Journal Entry,Remark,osservazione
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riga {0}: quantità non disponibile per {4} nel magazzino {1} al momento della registrazione della voce ({2} {3})
 DocType: Patient Encounter,Encounter Time,Tempo di incontro
 DocType: Serial No,Invoice Details,Dettagli della fattura
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori account possono essere fatti in Gruppi, ma le voci possono essere fatte contro non Gruppi"
@@ -5916,6 +5977,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Chiusura (apertura + totale)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formula dei criteri
 apps/erpnext/erpnext/config/support.py,Support Analytics,Support Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID dispositivo di presenza (ID tag biometrico / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Revisione e azione
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l&#39;account è bloccato, le voci sono consentite agli utenti con restrizioni."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Importo dopo l&#39;ammortamento
@@ -5937,6 +5999,7 @@
 DocType: Salary Slip,Loan Repayment,Rimborso del prestito
 DocType: Employee Education,Major/Optional Subjects,Soggetti principali / facoltativi
 DocType: Soil Texture,Silt,Limo
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Indirizzi e contatti del fornitore
 DocType: Bank Guarantee,Bank Guarantee Type,Tipo di garanzia bancaria
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Se disabilitato, il campo &quot;Totale arrotondato&quot; non sarà visibile in nessuna transazione"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5975,6 +6038,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Apertura dello strumento per la creazione di fatture
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Includi transazioni POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Nessun dipendente trovato per il dato valore del campo dipendente. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Importo ricevuto (valuta della società)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage è pieno, non salvato"
 DocType: Chapter Member,Chapter Member,Membro del Capitolo
@@ -6007,6 +6071,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nessun gruppo di studenti creato.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Riga duplicata {0} con lo stesso {1}
 DocType: Employee,Salary Details,Dettagli del salario
+DocType: Employee Checkin,Exit Grace Period Consequence,Esci Conseguenza periodo di grazia
 DocType: Bank Statement Transaction Invoice Item,Invoice,Fattura
 DocType: Special Test Items,Particulars,particolari
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base all&#39;elemento o al magazzino
@@ -6108,6 +6173,7 @@
 DocType: Serial No,Out of AMC,Fuori AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilo del lavoro, qualifiche richieste ecc."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Spedire allo stato
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Vuoi inviare la richiesta materiale
 DocType: Opportunity Item,Basic Rate,Tariffa base
 DocType: Compensatory Leave Request,Work End Date,Data di fine lavoro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Richiesta di materie prime
@@ -6293,6 +6359,7 @@
 DocType: Sales Order Item,Gross Profit,Utile lordo
 DocType: Quality Inspection,Item Serial No,Articolo numero di serie
 DocType: Asset,Insurer,Assicuratore
+DocType: Employee Checkin,OUT,SU
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Importo d&#39;acquisto
 DocType: Asset Maintenance Task,Certificate Required,Certificato richiesto
 DocType: Retention Bonus,Retention Bonus,Bonus di conservazione
@@ -6408,6 +6475,8 @@
 DocType: Invoice Discounting,Sanctioned,sanzionato
 DocType: Course Enrollment,Course Enrollment,Iscrizione al corso
 DocType: Item,Supplier Items,Articoli del fornitore
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Ora di inizio non può essere maggiore o uguale a Ora di fine \ per {0}.
 DocType: Sales Order,Not Applicable,Non applicabile
 DocType: Support Search Source,Response Options,Opzioni di risposta
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} dovrebbe essere un valore compreso tra 0 e 100
@@ -6494,7 +6563,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Risorse fisse
 DocType: Purchase Order,Ref SQ,Rif. SQ
 DocType: Salary Structure,Total Earning,Guadagno totale
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo clienti&gt; Territorio
 DocType: Share Balance,From No,Dal n
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Pagamento fattura di riconciliazione
 DocType: Purchase Invoice,Taxes and Charges Added,Tasse e costi aggiunti
@@ -6602,6 +6670,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignora regola dei prezzi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Cibo
 DocType: Lost Reason Detail,Lost Reason Detail,Dettaglio della ragione persa
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Sono stati creati i seguenti numeri di serie: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Opinione del cliente
 DocType: Serial No,Warranty / AMC Details,Garanzia / Dettagli AMC
 DocType: Issue,Opening Time,Orario di apertura
@@ -6651,6 +6720,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Nome della società non uguale
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,La promozione dei dipendenti non può essere presentata prima della data di promozione
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Non è consentito aggiornare le transazioni di magazzino precedenti a {0}
+DocType: Employee Checkin,Employee Checkin,Check-in dei dipendenti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La data di inizio deve essere inferiore alla data di fine per l&#39;articolo {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Crea preventivi cliente
 DocType: Buying Settings,Buying Settings,Impostazioni di acquisto
@@ -6672,6 +6742,7 @@
 DocType: Patient,Patient Demographics,Demografia del paziente
 DocType: Share Transfer,To Folio No,Per Folio n
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Flusso di cassa da operazioni
+DocType: Employee Checkin,Log Type,Tipo di registro
 DocType: Stock Settings,Allow Negative Stock,Consenti scorte negative
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Nessuno degli articoli ha alcun cambiamento di quantità o valore.
 DocType: Asset,Purchase Date,Data di acquisto
@@ -6716,6 +6787,7 @@
 DocType: Vital Signs,Very Hyper,Molto iper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Seleziona la natura della tua attività.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Si prega di selezionare il mese e l&#39;anno
+DocType: Service Level,Default Priority,Priorità predefinita
 DocType: Student Log,Student Log,Registro degli studenti
 DocType: Shopping Cart Settings,Enable Checkout,Abilita il pagamento
 apps/erpnext/erpnext/config/settings.py,Human Resources,Risorse umane
@@ -6744,7 +6816,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Connetti Shopify con ERPNext
 DocType: Homepage Section Card,Subtitle,Sottotitolo
 DocType: Soil Texture,Loam,terra grassa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: BOM,Scrap Material Cost(Company Currency),Costo del materiale di scarto (valuta della società)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,La bolla di consegna {0} non deve essere inviata
 DocType: Task,Actual Start Date (via Time Sheet),Data di inizio effettiva (tramite foglio di lavoro)
@@ -6800,6 +6871,7 @@
 DocType: Drug Prescription,Dosage,Dosaggio
 DocType: Cheque Print Template,Starting position from top edge,Posizione di partenza dal bordo superiore
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Durata dell&#39;appuntamento (min)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Questo dipendente ha già un log con lo stesso timestamp. {0}
 DocType: Accounting Dimension,Disable,disattivare
 DocType: Email Digest,Purchase Orders to Receive,Ordini d&#39;acquisto da ricevere
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Gli ordini di produzione non possono essere raccolti per:
@@ -6815,7 +6887,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Materiale trasferito per conto lavoro
 DocType: Job Card,Timing Detail,Dettaglio dei tempi
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Richiesto
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Importazione di {0} di {1}
 DocType: Job Offer Term,Job Offer Term,Termine dell&#39;offerta di lavoro
 DocType: SMS Center,All Contact,Tutti i contatti
 DocType: Project Task,Project Task,Attività del progetto
@@ -6866,7 +6937,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,L&#39;articolo {0} non è impostato per i numeri seriali. Controllare l&#39;articolo principale
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Da stato
 DocType: Leave Type,Maximum Continuous Days Applicable,Giorni continui massimi applicabili
-apps/erpnext/erpnext/config/support.py,Support Team.,Team di supporto.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Si prega di inserire prima il nome della società
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importa con successo
 DocType: Guardian,Alternate Number,Numero alternativo
@@ -6958,6 +7028,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Riga # {0}: elemento aggiunto
 DocType: Student Admission,Eligibility and Details,Ammissibilità e dettagli
 DocType: Staffing Plan,Staffing Plan Detail,Dettagli del piano di personale
+DocType: Shift Type,Late Entry Grace Period,Periodo di grazia dell&#39;ingresso in ritardo
 DocType: Email Digest,Annual Income,Reddito annuo
 DocType: Journal Entry,Subscription Section,Sezione di abbonamento
 DocType: Salary Slip,Payment Days,Giorni di pagamento
@@ -7008,6 +7079,7 @@
 DocType: Journal Entry Account,Account Balance,Saldo del conto
 DocType: Asset Maintenance Log,Periodicity,Periodicità
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Cartella medica
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Il tipo di registro è richiesto per i check-in che rientrano nello spostamento: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Esecuzione
 DocType: Item,Valuation Method,Metodo di valutazione
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} contro fattura di vendita {1}
@@ -7092,6 +7164,7 @@
 DocType: Loan Type,Loan Name,Nome del prestito
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Imposta la modalità di pagamento predefinita
 DocType: Quality Goal,Revision,Revisione
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Il tempo prima dell&#39;ora di fine turno quando il check-out è considerato come anticipato (in minuti).
 DocType: Healthcare Service Unit,Service Unit Type,Tipo di unità di servizio
 DocType: Purchase Invoice,Return Against Purchase Invoice,Restituzione della fattura d&#39;acquisto
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Genera segreto
@@ -7247,12 +7320,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Cosmetici
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Controlla questo se vuoi forzare l&#39;utente a selezionare una serie prima di salvarla. Non ci sarà nessun valore predefinito se si controlla questo.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo possono impostare account congelati e creare / modificare voci contabili contro account congelati
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marca
 DocType: Expense Claim,Total Claimed Amount,Importo totale rivendicato
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare Time Slot nei prossimi {0} giorni per Operation {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Avvolgendo
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Puoi rinnovare solo se la tua iscrizione scade entro 30 giorni
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Il valore deve essere compreso tra {0} e {1}
 DocType: Quality Feedback,Parameters,parametri
+DocType: Shift Type,Auto Attendance Settings,Impostazioni di presenze auto
 ,Sales Partner Transaction Summary,Riepilogo transazioni partner di vendita
 DocType: Asset Maintenance,Maintenance Manager Name,Nome del responsabile della manutenzione
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,È necessario recuperare i dettagli dell&#39;articolo.
@@ -7344,10 +7419,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Valida la regola applicata
 DocType: Job Card Item,Job Card Item,Job Card Item
 DocType: Homepage,Company Tagline for website homepage,Tagline aziendale per la homepage del sito
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Imposta Tempo di risposta e Risoluzione per Priorità {0} all&#39;indice {1}.
 DocType: Company,Round Off Cost Center,Round Off Cost Center
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteri di peso
 DocType: Asset,Depreciation Schedules,Orari di ammortamento
-DocType: Expense Claim Detail,Claim Amount,Importo del reclamo
 DocType: Subscription,Discounts,sconti
 DocType: Shipping Rule,Shipping Rule Conditions,Condizioni delle regole di spedizione
 DocType: Subscription,Cancelation Date,Data di cancellazione
@@ -7375,7 +7450,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Mostra valori zero
 DocType: Employee Onboarding,Employee Onboarding,Dipendente Onboarding
 DocType: POS Closing Voucher,Period End Date,Data di fine del periodo
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Opportunità di vendita per fonte
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Il primo Lascia Approvatore nell&#39;elenco verrà impostato come predefinito Lascia Approvatore.
 DocType: POS Settings,POS Settings,Impostazioni POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Tutti gli account
@@ -7396,7 +7470,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Riga # {0}: la tariffa deve essere uguale a {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Articoli per servizi sanitari
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Nessun record trovato
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Intervallo di invecchiamento 3
 DocType: Vital Signs,Blood Pressure,Pressione sanguigna
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Obiettivo attivo
@@ -7443,6 +7516,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,lotti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Difesa
 DocType: Item,Has Batch No,No lotto
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Giorni di ritardo
 DocType: Lead,Person Name,Nome della persona
 DocType: Item Variant,Item Variant,Variante articolo
 DocType: Training Event Employee,Invited,Invitato
@@ -7464,7 +7538,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Le date di inizio e di fine non sono in un periodo di stipendio valido, non è possibile calcolare {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Mostra solo i clienti di questi gruppi di clienti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Seleziona gli articoli per salvare la fattura
-DocType: Service Level,Resolution Time,Tempo di risoluzione
+DocType: Service Level Priority,Resolution Time,Tempo di risoluzione
 DocType: Grading Scale Interval,Grade Description,Descrizione del grado
 DocType: Homepage Section,Cards,Carte
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Verbale della riunione della qualità
@@ -7491,6 +7565,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Saldo del conto bancario come da contabilità generale
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Assistenza sanitaria (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Magazzino predefinito per creare ordine di vendita e nota di consegna
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Il tempo di risposta per {0} all&#39;indice {1} non può essere maggiore del tempo di risoluzione.
 DocType: Opportunity,Customer / Lead Name,Nome cliente / lead
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Importo non reclamato
@@ -7537,7 +7612,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Importare parti e indirizzi
 DocType: Item,List this Item in multiple groups on the website.,Elenca questo articolo in più gruppi sul sito web.
 DocType: Request for Quotation,Message for Supplier,Messaggio per il fornitore
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,Impossibile cambiare {0} perché la transazione stock per l&#39;articolo {1} esiste.
 DocType: Healthcare Practitioner,Phone (R),Telefono (R)
 DocType: Maintenance Team Member,Team Member,Membro della squadra
 DocType: Asset Category Account,Asset Category Account,Account categoria di asset
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 392f275..880a9e5 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,予定{0}と販売請求書{1}がキャンセルされました
 DocType: Purchase Receipt,Vehicle Number,車両番号
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,メールアドレス...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,デフォルトのブックエントリを含める
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,デフォルトのブックエントリを含める
 DocType: Activity Cost,Activity Type,活動タイプ
 DocType: Purchase Invoice,Get Advances Paid,前払い金を受け取る
 DocType: Company,Gain/Loss Account on Asset Disposal,資産処分時の損益勘定
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,支払いエントリ
 DocType: Employee Education,Class / Percentage,クラス/割合
 ,Electronic Invoice Register,電子請求書レジスタ
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,結果が実行された後の発生回数。
 DocType: Sales Invoice,Is Return (Credit Note),返品です(クレジットノート)
+DocType: Price List,Price Not UOM Dependent,UOMに依存しない価格
 DocType: Lab Test Sample,Lab Test Sample,ラボテストサンプル
 DocType: Shopify Settings,status html,ステータスHTML
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",例:2012、2012〜13
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,給料
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,合計請求金額
 DocType: Clinical Procedure,Consumables Invoice Separately,消耗品は別に請求します
+DocType: Shift Type,Working Hours Threshold for Absent,欠勤のしきい値
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることはできません
 DocType: Purchase Receipt Item,Rate and Amount,レートと金額
@@ -378,7 +381,6 @@
 DocType: Healthcare Settings,Out Patient Settings,患者設定
 DocType: Asset,Insurance End Date,保険終了日
 DocType: Bank Account,Branch Code,支店コード
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,対応する時間
 apps/erpnext/erpnext/public/js/conf.js,User Forum,ユーザーフォーラム
 DocType: Landed Cost Item,Landed Cost Item,着陸費用明細
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,売り手と買い手は同じではいけません
@@ -596,6 +598,7 @@
 DocType: Share Transfer,Transfer,転送
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),検索項目(Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0}送信された結果
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,開始日は終了日より大きくすることはできません
 DocType: Supplier,Supplier of Goods or Services.,商品またはサービスの供給者。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新しいアカウントの名前注:顧客とサプライヤのアカウントを作成しないでください
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,学生グループまたはコーススケジュールは必須です
@@ -879,7 +882,6 @@
 DocType: Skill,Skill Name,スキル名
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,レポートカードを印刷する
 DocType: Soil Texture,Ternary Plot,三点図
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,サポートチケット
 DocType: Asset Category Account,Fixed Asset Account,固定資産口座
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,最新
@@ -892,6 +894,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,貸借対照表に必須
 DocType: Payment Entry,Total Allocated Amount,合計配分額
 DocType: Sales Invoice,Get Advances Received,前払い金を受け取る
+DocType: Shift Type,Last Sync of Checkin,チェックインの最後の同期
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,値に含まれる品目税額
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -900,7 +903,9 @@
 DocType: Student,Blood Group,血液型
 apps/erpnext/erpnext/config/healthcare.py,Masters,マスターズ
 DocType: Crop,Crop Spacing UOM,クロップスペーシングUOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,シフトイン開始後、チェックインが遅れると見なされる時間(分単位)。
 apps/erpnext/erpnext/templates/pages/home.html,Explore,探検する
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,未払いの請求書が見つかりません
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{2}の{0}個の空室と{1}個の予算が{3}の子会社に既に計画されています。 \親会社{3}の人員計画{6}に従って、計画できるのは最大{4}の空室と予算{5}だけです。
 DocType: Promotional Scheme,Product Discount Slabs,製品割引スラブ
@@ -1002,6 +1007,7 @@
 DocType: Item,Moving Average,移動平均
 DocType: Employee Attendance Tool,Unmarked Attendance,マークされていない出席
 DocType: Homepage Section,Number of Columns,列の数
+DocType: Issue Priority,Issue Priority,問題の優先順位
 DocType: Holiday List,Add Weekly Holidays,毎週の祝日を追加
 DocType: Shopify Log,Shopify Log,ログを買い物する
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,給与明細を作成する
@@ -1010,6 +1016,7 @@
 DocType: Warranty Claim,Issue Date,発行日
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,商品{0}のバッチを選択してください。この要件を満たす単一のバッチが見つかりません
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,残された従業員には保存ボーナスを作成できません
+DocType: Employee Checkin,Location / Device ID,場所/デバイスID
 DocType: Purchase Order,To Receive,受信する
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,あなたはオフラインモードです。あなたがネットワークを持つまであなたはリロードすることができないでしょう。
 DocType: Course Activity,Enrollment,入会
@@ -1018,7 +1025,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},最大:{0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,電子請求情報がありません
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,材料要求は作成されていません
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Loan,Total Amount Paid,支払った合計金額
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,これらの商品はすべて請求済みです
 DocType: Training Event,Trainer Name,トレーナー名
@@ -1129,6 +1135,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},リード{0}にリード名を記入してください
 DocType: Employee,You can enter any date manually,手動で任意の日付を入力できます
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫調整明細
+DocType: Shift Type,Early Exit Consequence,早期終了の影響
 DocType: Item Group,General Settings,一般設定
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,期日を転記/サプライヤ請求日より前にすることはできません。
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,送信する前に受取人の名前を入力してください。
@@ -1167,6 +1174,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,支払い確認
 ,Available Stock for Packing Items,梱包品目の利用可能在庫
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},この請求書{0}をCフォーム{1}から削除してください。
+DocType: Shift Type,Every Valid Check-in and Check-out,有効なチェックインとチェックアウト
 DocType: Support Search Source,Query Route String,ルート文字列の照会
 DocType: Customer Feedback Template,Customer Feedback Template,顧客フィードバックテンプレート
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,見込み客または得意先への見積もり。
@@ -1201,6 +1209,7 @@
 DocType: Authorization Control,Authorization Control,認証管理
 ,Daily Work Summary Replies,デイリーワークサマリー返信
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},プロジェクトの共同作業に招待されました:{0}
+DocType: Issue,Response By Variance,分散による応答
 DocType: Item,Sales Details,販売詳細
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,印刷テンプレート用のレターヘッド。
 DocType: Salary Detail,Tax on additional salary,追加給与に対する課税
@@ -1324,6 +1333,7 @@
 DocType: Project,Task Progress,タスクの進捗
 DocType: Journal Entry,Opening Entry,オープニングエントリー
 DocType: Bank Guarantee,Charges Incurred,発生した料金
+DocType: Shift Type,Working Hours Calculation Based On,に基づく労働時間の計算
 DocType: Work Order,Material Transferred for Manufacturing,製造に転送される品目
 DocType: Products Settings,Hide Variants,バリアントを隠す
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,キャパシティプランニングとタイムトラッキングを無効にする
@@ -1353,6 +1363,7 @@
 DocType: Guardian,Interests,興味
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消費数量
 DocType: Education Settings,Education Manager,教育部長
+DocType: Employee Checkin,Shift Actual Start,実績開始シフト
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ワークステーションの営業時間外に時間ログを計画する。
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},ロイヤリティポイント:{0}
 DocType: Healthcare Settings,Registration Message,登録メッセージ
@@ -1377,9 +1388,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,請求書はすべての請求時間についてすでに作成されています
 DocType: Sales Partner,Contact Desc,Descに連絡する
 DocType: Purchase Invoice,Pricing Rules,価格設定ルール
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",アイテム{0}に対する既存のトランザクションがあるため、{1}の値を変更することはできません
 DocType: Hub Tracked Item,Image List,画像リスト
 DocType: Item Variant Settings,Allow Rename Attribute Value,属性値の名前変更を許可
-DocType: Price List,Price Not UOM Dependant,UOMに依存しない価格
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),時間(分)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,基本
 DocType: Loan,Interest Income Account,受取利息口座
@@ -1389,6 +1400,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POSプロファイルを選択
 DocType: Support Settings,Get Latest Query,最新のクエリを入手
 DocType: Employee Incentive,Employee Incentive,従業員のインセンティブ
+DocType: Service Level,Priorities,優先度
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,ホームページにカードやカスタムセクションを追加する
 DocType: Homepage,Hero Section Based On,に基づくヒーローセクション
 DocType: Project,Total Purchase Cost (via Purchase Invoice),合計購買費用(購買請求書による)
@@ -1449,7 +1461,7 @@
 DocType: Blanket Order Item,Ordered Quantity,注文数量
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行#{0}:拒否されたアイテム{1}に対して拒否された倉庫は必須です
 ,Received Items To Be Billed,請求対象の受信アイテム
-DocType: Salary Slip Timesheet,Working Hours,勤務時間
+DocType: Attendance,Working Hours,勤務時間
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,支払いモード
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,時間通りに受け取られない購買注文品目
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,日数
@@ -1569,7 +1581,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定情報およびその他の一般情報
 DocType: Item Default,Default Selling Cost Center,デフォルト販売原価センタ
 DocType: Sales Partner,Address & Contacts,住所と連絡先
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [採番シリーズ]で出席用の採番シリーズを設定してください。
 DocType: Subscriber,Subscriber,加入者
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form / Item / {0})は在庫切れです
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,最初に投稿日を選択してください
@@ -1580,7 +1591,7 @@
 DocType: Detected Disease,Tasks Created,作成したタスク
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,この品目またはそのテンプレートに対してデフォルトのBOM({0})がアクティブになっている必要があります
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,手数料率%
-DocType: Service Level,Response Time,反応時間
+DocType: Service Level Priority,Response Time,反応時間
 DocType: Woocommerce Settings,Woocommerce Settings,ウーコマース設定
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,数量はプラスでなければなりません
 DocType: Contract,CRM,CRM
@@ -1597,7 +1608,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,トランザクションデータマッピング
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,リードには、個人の名前または組織の名前が必要です。
 DocType: Student,Guardians,保護者
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育設定]で講師命名システムを設定してください。
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ブランドを選択
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,中所得
 DocType: Shipping Rule,Calculate Based On,に基づいて計算
@@ -1634,6 +1644,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},学生{1}に対して出席記録{0}が存在します
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,取引日
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,購読をキャンセル
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,サービスレベル契約{0}を設定できませんでした。
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,正味給与額
 DocType: Account,Liability,責任
 DocType: Employee,Bank A/C No.,銀行A / C番号
@@ -1699,7 +1710,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料品目コード
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,購入請求書{0}は既に送信されています
 DocType: Fees,Student Email,学生のメールアドレス
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM再帰:{0}を{2}の親または子にすることはできません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,ヘルスケアサービスから商品を入手する
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,在庫エントリー{0}は送信されません
 DocType: Item Attribute Value,Item Attribute Value,アイテム属性値
@@ -1724,7 +1734,6 @@
 DocType: Production Plan,Select Items to Manufacture,製造する品目を選択
 DocType: Leave Application,Leave Approver Name,承認者名を残す
 DocType: Shareholder,Shareholder,株主
-DocType: Issue,Agreement Status,契約のステータス
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,売買取引のデフォルト設定。
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,有料学生申請者に必須の学生入学を選択してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOMを選択
@@ -1987,6 +1996,7 @@
 DocType: Account,Income Account,収入アカウント
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,すべての倉庫
 DocType: Contract,Signee Details,署名者の詳細
+DocType: Shift Type,Allow check-out after shift end time (in minutes),シフト終了時間後のチェックアウトを許可する(分単位)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,調達
 DocType: Item Group,Check this if you want to show in website,ウェブサイトに表示したい場合はこれをチェックしてください
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,会計年度{0}が見つかりません
@@ -2053,6 +2063,7 @@
 DocType: Activity Cost,Billing Rate,請求レート
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},警告:在庫エントリ{2}に対して別の{0}#{1}が存在します
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Googleマップ設定を有効にしてルートを推定および最適化してください
+DocType: Purchase Invoice Item,Page Break,改ページ
 DocType: Supplier Scorecard Criteria,Max Score,最大得点
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,返済開始日を支払日より前にすることはできません。
 DocType: Support Search Source,Support Search Source,検索ソースのサポート
@@ -2121,6 +2132,7 @@
 DocType: Employee Transfer,Employee Transfer,従業員の異動
 ,Sales Funnel,セールスファンネル
 DocType: Agriculture Analysis Criteria,Water Analysis,水質分析
+DocType: Shift Type,Begin check-in before shift start time (in minutes),シフト開始時刻の前にチェックインを開始する(分単位)
 DocType: Accounts Settings,Accounts Frozen Upto,アカウントFrozen Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,編集するものはありません。
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}はワークステーション{1}で使用可能な営業時間より長く、操作を複数の操作に分割してください
@@ -2134,7 +2146,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},受注{0}は{1}です
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),支払いの遅延(日数)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,減価償却詳細を入力
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,得意先PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,配達予定日は受注日より後でなければなりません
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,品目数量はゼロにできません
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,無効な属性
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},アイテム{0}に対してBOMを選択してください
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,請求書タイプ
@@ -2144,6 +2158,7 @@
 DocType: Volunteer,Afternoon,午後
 DocType: Vital Signs,Nutrition Values,栄養価
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),発熱がある(38.5°Cを超える温度または38.4°Cを超える持続温度)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt;人事管理設定で従業員命名システムを設定してください。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,反転したITC
 DocType: Project,Collect Progress,進捗状況を収集する
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,エネルギー
@@ -2194,6 +2209,7 @@
 ,Ordered Items To Be Billed,請求対象の注文商品
 DocType: Taxable Salary Slab,To Amount,金額に
 DocType: Purchase Invoice,Is Return (Debit Note),返品です(借方注)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;地域
 apps/erpnext/erpnext/config/desktop.py,Getting Started,入門
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,マージ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,会計年度を保存した後は、会計年度の開始日と会計年度の終了日を変更することはできません。
@@ -2212,8 +2228,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},メンテナンス開始日をシリアル番号{0}の納入日より前にすることはできません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,行{0}:為替レートは必須です
 DocType: Purchase Invoice,Select Supplier Address,サプライヤアドレスを選択
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",利用可能な数量は{0}です。{1}が必要です
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,APIコンシューマーシークレットを入力してください
 DocType: Program Enrollment Fee,Program Enrollment Fee,プログラム登録料
+DocType: Employee Checkin,Shift Actual End,実績終了シフト
 DocType: Serial No,Warranty Expiry Date,保証期限
 DocType: Hotel Room Pricing,Hotel Room Pricing,ホテルの部屋の価格
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted",外部課税対象物(ゼロ評価、ゼロ評価および免除以外)
@@ -2273,6 +2291,7 @@
 DocType: Quality Inspection Reading,Reading 5,読む5
 DocType: Shopping Cart Settings,Display Settings,ディスプレイの設定
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,減価償却数を設定してください
+DocType: Shift Type,Consequence after,後の結果
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,あなたは何が必要ですか?
 DocType: Journal Entry,Printing Settings,印刷設定
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,銀行業
@@ -2282,6 +2301,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,請求先住所は配送先住所と同じです
 DocType: Account,Cash,現金
 DocType: Employee,Leave Policy,ポリシーを残す
+DocType: Shift Type,Consequence,結果
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,学生の住所
 DocType: GST Account,CESS Account,CESSアカウント
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}:コストセンターは &#39;損益&#39;勘定{2}に必要です。会社のデフォルトのコストセンターを設定してください。
@@ -2346,6 +2366,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,期間締め券
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,保護者2の名前
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,経費アカウントを入力してください
+DocType: Issue,Resolution By Variance,差異による解決
 DocType: Employee,Resignation Letter Date,辞任書の発行日
 DocType: Soil Texture,Sandy Clay,サンディクレイ
 DocType: Upload Attendance,Attendance To Date,今日までの出席
@@ -2358,6 +2379,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,今すぐ見る
 DocType: Item Price,Valid Upto,有効期限
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},参照Doctypeは{0}のいずれかでなければなりません
+DocType: Employee Checkin,Skip Auto Attendance,自動参加をスキップする
 DocType: Payment Request,Transaction Currency,取引通貨
 DocType: Loan,Repayment Schedule,返済スケジュール
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,サンプル保存在庫エントリの作成
@@ -2429,6 +2451,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POSクローズ伝票税
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,初期化されたアクション
 DocType: POS Profile,Applicable for Users,ユーザーに適用
+,Delayed Order Report,遅延注文レポート
 DocType: Training Event,Exam,試験
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,総勘定元帳エントリの数が正しくありません。取引で間違った口座を選択した可能性があります。
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,販売パイプライン
@@ -2443,10 +2466,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,選択したすべての項目を組み合わせて条件が適用されます。
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,設定する
 DocType: Hotel Room,Capacity,容量
+DocType: Employee Checkin,Shift End,シフト終了
 DocType: Installation Note Item,Installed Qty,インストール済み数量
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,アイテム{1}のバッチ{0}は無効です。
 DocType: Hotel Room Reservation,Hotel Reservation User,ホテル予約ユーザー
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,勤務日が2回繰り返されました
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,エンティティタイプ{0}とエンティティ{1}のサービスレベル契約が既に存在します。
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},品目グループが品目{0}の品目マスターに記載されていません
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},名前エラー:{0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,地域はPOSプロファイルで必要です
@@ -2494,6 +2518,7 @@
 DocType: Depreciation Schedule,Schedule Date,スケジュール日
 DocType: Packing Slip,Package Weight Details,パッケージ重量の詳細
 DocType: Job Applicant,Job Opening,就職口
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,従業員チェックインの最後の既知の正常な同期。すべてのログがすべての場所から同期されていることが確実な場合にのみ、これをリセットしてください。よくわからない場合は変更しないでください。
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,実費
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),オーダー{1}に対する合計前払い額({0})は、合計合計({2})より大きくなることはできません
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,アイテムバリアントの更新
@@ -2538,6 +2563,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,呼び出しを受ける
 DocType: Tally Migration,Is Day Book Data Imported,Day Bookのデータがインポートされたか
 ,Sales Partners Commission,セールスパートナーズコミッション
+DocType: Shift Type,Enable Different Consequence for Early Exit,早期終了に対して異なる結果を有効にする
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,法的
 DocType: Loan Application,Required by Date,日付で必要
 DocType: Quiz Result,Quiz Result,クイズ結果
@@ -2597,7 +2623,6 @@
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},休暇期間{0}にオプションの休日リストが設定されていません
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,従業員ロールの設定には、従業員レコードのユーザーIDフィールドを設定してください
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,解決する時間
 DocType: Training Event,Training Event,研修イベント
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",成人の通常の安静時血圧は、収縮期で約120 mmHg、拡張期で約80 mmHgで、「120/80 mmHg」と略されます。
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,限界値がゼロの場合、システムはすべてのエントリーを取り出します。
@@ -2641,6 +2666,7 @@
 DocType: Student Applicant,Approved,承認済み
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},開始日は会計年度内にする必要があります。開始日= {0}と仮定
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,購買設定で仕入先グループを設定してください。
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{}は無効な出席ステータスです。
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,臨時口座
 DocType: Purchase Invoice,Cash/Bank Account,現金/銀行口座
 DocType: Quality Meeting Table,Quality Meeting Table,品質会議テーブル
@@ -2676,6 +2702,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",食品、飲料、タバコ
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,コーススケジュール
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムワイズ税詳細
+DocType: Shift Type,Attendance will be marked automatically only after this date.,出席はこの日以降に自動的にマークされます。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,UIN保有者への供給
 apps/erpnext/erpnext/hooks.py,Request for Quotations,見積依頼
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,他の通貨を使用して入力した後で通貨を変更することはできません
@@ -2724,7 +2751,6 @@
 DocType: Item,Is Item from Hub,ハブからの商品です
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,品質手順
 DocType: Share Balance,No of Shares,株式数
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}:エントリーの転記時に倉庫{1}の{4}に数量が使用できません({2} {3})
 DocType: Quality Action,Preventive,予防的
 DocType: Support Settings,Forum URL,フォーラムのURL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,従業員と出席
@@ -2946,7 +2972,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,デフォルトの税金
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,これは、このサプライヤーに対する取引に基づいています。詳細は下記のタイムラインをご覧ください。
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,契約の開始日と終了日を入力します。
 DocType: Delivery Note Item,Against Sales Invoice,売上請求書に対して
 DocType: Loyalty Point Entry,Purchase Amount,購入金額
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,受注があったため、Lostとして設定することはできません。
@@ -2970,7 +2995,7 @@
 DocType: Lead,Organization Name,組織名
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,有効期間および有効期間は累計に必須です。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},行#{0}:バッチ番号は{1} {2}と同じである必要があります
-DocType: Employee,Leave Details,詳細を残す
+DocType: Employee Checkin,Shift Start,シフトスタート
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0}より前の株取引は凍結されています
 DocType: Driver,Issuing Date,発行日
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,要求者
@@ -3015,9 +3040,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,キャッシュフローマッピングテンプレートの詳細
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,採用とトレーニング
 DocType: Drug Prescription,Interval UOM,間隔UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,自動参加の猶予期間の設定
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,開始通貨と終了通貨を同じにすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,医薬品
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,サポート時間
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1}はキャンセルされたか閉じられました
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,行{0}:顧客に対する前払いは貸方である必要があります
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),バウチャー別グループ(連結)
@@ -3127,6 +3154,7 @@
 DocType: Territory,Territory Manager,テリトリーマネージャー
 DocType: Lab Test,Sample ID,サンプルID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,カートは空です
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,従業員のチェックインごとに出席がマークされています
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,アセット{0}を送信する必要があります
 ,Absent Student Report,学生レポート欠席
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,売上総利益に含まれる
@@ -3134,7 +3162,9 @@
 DocType: Travel Request Costing,Funded Amount,積立額
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1}は送信されていないため、操作を完了できません
 DocType: Subscription,Trial Period End Date,試用期間終了日
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,同じシフト中にINとOUTの交互のエントリ
 DocType: BOM Update Tool,The new BOM after replacement,交換後の新しいBOM
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤーの種類
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,項目5
 DocType: Employee,Passport Number,パスポート番号
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,一時的なオープニング
@@ -3250,6 +3280,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,可能なサプライヤー
 ,Issued Items Against Work Order,作業指図に対して発行された明細
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0}請求書の作成
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育設定]で講師命名システムを設定してください。
 DocType: Student,Joining Date,入会日
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,依頼サイト
 DocType: Purchase Invoice,Against Expense Account,費用勘定に対する
@@ -3289,6 +3320,7 @@
 DocType: Landed Cost Item,Applicable Charges,適用料金
 ,Point of Sale,販売時点情報
 DocType: Authorization Rule,Approving User  (above authorized value),承認ユーザー(認証値以上)
+DocType: Service Level Agreement,Entity,エンティティ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},金額{0} {1}が{2}から{3}に転送されました
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,パーティー名から
@@ -3335,6 +3367,7 @@
 DocType: Soil Texture,Sand Composition (%),砂の組成(%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-YYYY-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,デイブックデータのインポート
+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}の命名シリーズを設定してください。
 DocType: Asset,Asset Owner Company,アセットオーナー会社
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,原価センタは経費請求を予約する必要があります
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},品目{1}の{0}個の有効なシリアル番号
@@ -3395,7 +3428,6 @@
 DocType: Asset,Asset Owner,アセットオーナー
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},行{1}の在庫品目{0}には倉庫が必須です
 DocType: Stock Entry,Total Additional Costs,追加費用の合計
-DocType: Marketplace Settings,Last Sync On,最後の同期オン
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,税金テーブルに1行以上設定してください
 DocType: Asset Maintenance Team,Maintenance Team Name,保守チーム名
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,原価センタ表
@@ -3411,12 +3443,12 @@
 DocType: Job Card,WIP Warehouse,仕掛品倉庫
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-YYYY-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ユーザーIDが従業員{0}に設定されていません
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}",利用可能な数量は{0}です。{1}が必要です
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,ユーザー{0}が作成されました
 DocType: Stock Settings,Item Naming By,アイテムの命名
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,順序付けられました
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,これはルート顧客グループであり、編集できません。
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,品目要求{0}が取り消されたか停止されました
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,従業員チェックインのログタイプに厳密に基づく
 DocType: Purchase Order Item Supplied,Supplied Qty,供給数量
 DocType: Cash Flow Mapper,Cash Flow Mapper,キャッシュフローマッパー
 DocType: Soil Texture,Sand,砂
@@ -3475,6 +3507,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,商品グループテーブルに重複する商品グループが見つかりました
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,年俸
 DocType: Supplier Scorecard,Weighting Function,重み付け関数
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},品目{2}の単位変換係数({0}  - &gt; {1})が見つかりません
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,基準式の評価中にエラーが発生しました
 ,Lab Test Report,ラボテストレポート
 DocType: BOM,With Operations,オペレーションとは
@@ -3488,6 +3521,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,仕訳入力に対する返済はありません。
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0}  -  {1}は非アクティブな学生です
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,在庫登録
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM再帰:{0}を{1}の親または子にすることはできません
 DocType: Employee Onboarding,Activities,アクティビティ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,少なくとも1つの倉庫は必須です
 ,Customer Credit Balance,顧客のクレジットバランス
@@ -3500,9 +3534,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,顧客に複数のロイヤリティプログラムが見つかりました。手動で選択してください。
 DocType: Patient,Medication,薬
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,ロイヤリティプログラムを選択
+DocType: Employee Checkin,Attendance Marked,出席マーク
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,原材料
 DocType: Sales Order,Fully Billed,全額請求
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},ホテルの客室料金を{}に設定してください
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,デフォルトとして優先度を1つだけ選択します。
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},タイプ -  {0}のアカウント(元帳)を識別/作成してください
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,合計貸方/借方金額は、リンクされた仕訳伝票と同じである必要があります。
 DocType: Purchase Invoice Item,Is Fixed Asset,固定資産です
@@ -3523,6 +3559,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,予約確認
 DocType: Shopping Cart Settings,Orders,ご注文
 DocType: HR Settings,Retirement Age,退職年齢
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,予測数量
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},国{0}の削除は許可されていません
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},行#{0}:資産{1}はすでに{2}です
@@ -3606,11 +3643,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,会計士
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},日付{1}と{2}の間の{0}にPOS決済伝票がすでに存在します
 apps/erpnext/erpnext/config/help.py,Navigating,ナビゲート
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,未払いの請求書に為替レートの再評価は必要ありません。
 DocType: Authorization Rule,Customer / Item Name,顧客/商品名
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号は倉庫を持つことはできません。倉庫は、在庫または購買入庫で設定する必要があります。
 DocType: Issue,Via Customer Portal,カスタマーポータル経由
 DocType: Work Order Operation,Planned Start Time,計画開始時間
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1}は{2}です
+DocType: Service Level Priority,Service Level Priority,サービスレベル優先度
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,減価償却数は総減価償却数を超えることはできません
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,元帳を共有する
 DocType: Journal Entry,Accounts Payable,買掛金勘定
@@ -3721,7 +3760,6 @@
 DocType: Delivery Note,Delivery To,へ配達する
 DocType: Bank Statement Transaction Settings Item,Bank Data,銀行データ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,予定日
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,タイムシートで請求時間と勤務時間を同じに維持する
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,リードソース別にリードを追跡します。
 DocType: Clinical Procedure,Nursing User,看護ユーザー
 DocType: Support Settings,Response Key List,応答キーリスト
@@ -3889,6 +3927,7 @@
 DocType: Work Order Operation,Actual Start Time,実際の開始時間
 DocType: Antibiotic,Laboratory User,ラボユーザー
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,オンラインオークション
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,優先順位{0}が繰り返されました。
 DocType: Fee Schedule,Fee Creation Status,料金作成ステータス
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,ソフトウェア
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,受注から支払へ
@@ -3955,6 +3994,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0}の情報を取得できませんでした。
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,請求通貨は、デフォルトの会社の通貨またはパーティーアカウントの通貨と同じである必要があります。
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,この販売員の従業員IDを入力してください
+DocType: Shift Type,Early Exit Consequence after,早期終了後の結果
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,開始販売および購買請求書の登録
 DocType: Disease,Treatment Period,治療期間
 apps/erpnext/erpnext/config/settings.py,Setting up Email,メールを設定する
@@ -3972,7 +4012,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,学生の名前:
 DocType: SMS Log,Sent On,送信済み
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,売上請求書
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,応答時間は解決時間より長くすることはできません
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",コースベースの学生グループの場合、コースは、プログラム登録の登録済みコースからすべての学生に対して検証されます。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,州内物資
 DocType: Employee,Create User Permission,ユーザー権限を作成する
@@ -4011,6 +4050,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,販売または購入の標準契約条件
 DocType: Sales Invoice,Customer PO Details,顧客POの詳細
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,患者が見つかりません
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,デフォルトの優先順位を選択します。
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,料金がそのアイテムに適用されない場合はアイテムを削除します
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同じ名前のカスタマーグループが存在しますカスタマーネームを変更するか、カスタマーグループの名前を変更してください。
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4050,6 +4090,7 @@
 DocType: Support Settings,Support Portal,サポートポータル
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,タスク<b>{0}の</b>終了日を<b>{1}</b>予想開始日<b>{2}</b>より小さくすることはできません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},従業員{0}は在籍しています{1}に在籍します
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},このサービスレベル契約は、お客様{0}に固有のものです。
 DocType: Employee,Held On,開催日
 DocType: Healthcare Practitioner,Practitioner Schedules,施術者スケジュール
 DocType: Project Template Task,Begin On (Days),開始日(日)
@@ -4057,6 +4098,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},作業指示は{0}です
 DocType: Inpatient Record,Admission Schedule Date,入学予定日
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,資産価値調整
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,このシフトに割り当てられた従業員の「従業員チェックイン」に基づいて出席をマークします。
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,未登録の人への供給
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,すべての仕事
 DocType: Appointment Type,Appointment Type,予約タイプ
@@ -4170,7 +4212,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),パッケージの総重量。通常、正味重量+包装材の重量。 (印刷用)
 DocType: Plant Analysis,Laboratory Testing Datetime,実験室試験の日時
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,アイテム{0}にはバッチを指定できません
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,段階別販売パイプライン
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,学生グループの強み
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,銀行取引明細書トランザクション入力
 DocType: Purchase Order,Get Items from Open Material Requests,未処理品目依頼から明細を取得
@@ -4252,7 +4293,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,老朽化している倉庫ごとに表示
 DocType: Sales Invoice,Write Off Outstanding Amount,未払い金額の償却
 DocType: Payroll Entry,Employee Details,従業員の詳細
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,開始時間は{0}の終了時間より長くすることはできません。
 DocType: Pricing Rule,Discount Amount,割引額
 DocType: Healthcare Service Unit Type,Item Details,商品の詳細
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},期間{1}に対する{0}の税申告の重複
@@ -4305,7 +4345,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,純支払額はマイナスになることはできません
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,インタラクション数
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},行{0}#品目{1}を発注書{3}に対して{2}を超えて転送することはできません
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,シフト
+DocType: Attendance,Shift,シフト
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,勘定および締約国処理チャート
 DocType: Stock Settings,Convert Item Description to Clean HTML,商品説明をきれいなHTMLに変換する
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,すべてのサプライヤーグループ
@@ -4376,6 +4416,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,親サービスユニット
 DocType: Sales Invoice,Include Payment (POS),支払いを含める(POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,未公開株
+DocType: Shift Type,First Check-in and Last Check-out,最初のチェックインと最後のチェックアウト
 DocType: Landed Cost Item,Receipt Document,領収書
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,サプライヤスコアカード期間
 DocType: Employee Grade,Default Salary Structure,デフォルトの給与構造
@@ -4458,6 +4499,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,発注書を作成する
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,会計年度の予算を定義します。
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,アカウントテーブルを空白にすることはできません。
+DocType: Employee Checkin,Entry Grace Period Consequence,エントリー猶予期間の結果
 ,Payment Period Based On Invoice Date,請求日に基づく支払期間
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},インストール日を商品{0}の納入日より前にすることはできません
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,資料請求へのリンク
@@ -4466,6 +4508,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}:この倉庫{1}の再注文エントリはすでに存在します
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,文書日付
 DocType: Monthly Distribution,Distribution Name,配布名
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,就業日{0}が繰り返されました。
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,グループから非グループ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,更新中です。しばらく時間がかかるかもしれません。
 DocType: Item,"Example: ABCD.#####
@@ -4478,6 +4521,7 @@
 DocType: Vehicle Log,Fuel Qty,燃料量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1モバイルいいえ
 DocType: Invoice Discounting,Disbursed,支払済
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,シフトアウトが終了してからチェックアウトが行われるまでの時間。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,買掛金の純増減
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,利用不可
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,パートタイム
@@ -4491,7 +4535,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,印刷でPDCを表示
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,サプライヤを買う
 DocType: POS Profile User,POS Profile User,POSプロファイルユーザー
-DocType: Student,Middle Name,ミドルネーム
 DocType: Sales Person,Sales Person Name,営業担当者名
 DocType: Packing Slip,Gross Weight,総重量
 DocType: Journal Entry,Bill No,請求書番号
@@ -4500,7 +4543,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-YYYY-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,サービスレベル契約
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,最初に従業員と日付を選択してください
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,着陸費用伝票金額を考慮して明細評価率が再計算されます
 DocType: Timesheet,Employee Detail,従業員詳細
 DocType: Tally Migration,Vouchers,バウチャー
@@ -4535,7 +4577,7 @@
 DocType: Additional Salary,Date on which this component is applied,このコンポーネントが適用される日付
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,フォリオ番号付きの利用可能な株主のリスト
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,ゲートウェイアカウントを設定します。
-DocType: Service Level,Response Time Period,応答期間
+DocType: Service Level Priority,Response Time Period,応答期間
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入税および料金
 DocType: Course Activity,Activity Date,活動日
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,新しい顧客を選択または追加する
@@ -4560,6 +4602,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,会計年度
 DocType: Sales Invoice Item,Deferred Revenue,繰延収益
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,売りまたは買いの少なくとも1つを選択する必要があります
+DocType: Shift Type,Working Hours Threshold for Half Day,半日の就業時間しきい値
 ,Item-wise Purchase History,アイテム別購入履歴
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},行{0}の項目のサービス停止日は変更できません
 DocType: Production Plan,Include Subcontracted Items,外注品目を含める
@@ -4592,6 +4635,7 @@
 DocType: BOM,Allow Same Item Multiple Times,同じアイテムを複数回許可する
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOMを作成する
 DocType: Healthcare Practitioner,Charges,料金
+DocType: Employee,Attendance and Leave Details,出席と休暇の詳細
 DocType: Student,Personal Details,個人情報
 DocType: Sales Order,Billing and Delivery Status,請求と配信のステータス
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,行{0}:サプライヤ{0}の場合電子メールを送信するには電子メールアドレスが必要です
@@ -4643,7 +4687,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},{0}と{1}の間の値を入力してください
 DocType: Purchase Order,Order Confirmation Date,注文確認日
 DocType: Delivery Trip,Calculate Estimated Arrival Times,到着予定時刻を計算する
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt;人事管理設定で従業員命名システムを設定してください。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,消耗品
 DocType: Instructor,EDU-INS-.YYYY.-,エドゥイン-YYYY-
 DocType: Subscription,Subscription Start Date,購読開始日
@@ -4666,7 +4709,7 @@
 DocType: Journal Entry Account,Journal Entry Account,仕訳伝票
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,変種
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,フォーラム活動
-DocType: Service Level,Resolution Time Period,解決期間
+DocType: Service Level Priority,Resolution Time Period,解決期間
 DocType: Request for Quotation,Supplier Detail,サプライヤー詳細
 DocType: Project Task,View Task,タスクを表示
 DocType: Serial No,Purchase / Manufacture Details,購入/製造の詳細
@@ -4733,6 +4776,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は、在庫/納品書/購買入庫でのみ変更することができます。
 DocType: Support Settings,Close Issue After Days,数日後に問題を閉じる
 DocType: Payment Schedule,Payment Schedule,支払いスケジュール
+DocType: Shift Type,Enable Entry Grace Period,エントリ猶予期間を有効にする
 DocType: Patient Relation,Spouse,配偶者
 DocType: Purchase Invoice,Reason For Putting On Hold,保留にした理由
 DocType: Item Attribute,Increment,インクリメント
@@ -4872,6 +4916,7 @@
 DocType: Vehicle Log,Invoice Ref,請求書番号
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C形式は請求書には適用されません:{0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,請求書が作成されました
+DocType: Shift Type,Early Exit Grace Period,早期終了猶予期間
 DocType: Patient Encounter,Review Details,レビュー詳細
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,行{0}:時の値はゼロより大きくなければなりません。
 DocType: Account,Account Number,口座番号
@@ -4883,7 +4928,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL",会社がSpA、SApAまたはSRLの場合に適用可能
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,次の間に重複条件が見つかりました。
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,支払済および未配達
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,品目には自動的に番号が付けられないため、品目コードは必須です。
 DocType: GST HSN Code,HSN Code,HSNコード
 DocType: GSTR 3B Report,September,9月
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,管理経費
@@ -4919,6 +4963,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIPアカウント
 DocType: SMS Log,Sender Name,送信者名
 DocType: Pricing Rule,Supplier Group,サプライヤグループ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",\ Support Day {0}の開始時刻と終了時刻をインデックス{1}に設定してください。
 DocType: Employee,Date of Issue,発行日
 ,Requested Items To Be Transferred,転送依頼のあった商品
 DocType: Employee,Contract End Date,契約終了日
@@ -4929,6 +4975,7 @@
 DocType: Opportunity,Sales Stage,セールスステージ
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,販売注文を保存すると、単語が表示されます。
 DocType: Item Reorder,Re-order Level,再注文レベル
+DocType: Shift Type,Enable Auto Attendance,自動参加を有効にする
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,好み
 ,Department Analytics,部門分析
 DocType: Crop,Scientific Name,学名
@@ -4941,6 +4988,7 @@
 DocType: Quiz Activity,Quiz Activity,クイズ活動
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0}は有効な給与計算期間にありません
 DocType: Timesheet,Billed,請求済み
+apps/erpnext/erpnext/config/support.py,Issue Type.,問題の種類。
 DocType: Restaurant Order Entry,Last Sales Invoice,最終販売請求書
 DocType: Payment Terms Template,Payment Terms,支払い条件
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",予約済み数量:販売用に注文された数量ですが、配送されません。
@@ -5036,6 +5084,7 @@
 DocType: Account,Asset,資産
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0}には医療従事者スケジュールがありません。それを医療従事者マスタに追加する
 DocType: Vehicle,Chassis No,シャーシ番号
+DocType: Employee,Default Shift,デフォルトシフト
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,会社の略語
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,部品表のツリー
 DocType: Article,LMS User,LMSユーザー
@@ -5084,6 +5133,7 @@
 DocType: Sales Person,Parent Sales Person,親セールスパーソン
 DocType: Student Group Creation Tool,Get Courses,コースを受講する
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行#{0}:itemは固定資産なので、Qtyは1でなければなりません。複数の数量には別々の行を使用してください。
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),それ以下の不在がマークされている労働時間。 (無効にするにはゼロ)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,トランザクションで許可されるのはリーフノードだけです
 DocType: Grant Application,Organization,組織
 DocType: Fee Category,Fee Category,料金カテゴリ
@@ -5096,6 +5146,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,このトレーニングイベントのステータスを更新してください
 DocType: Volunteer,Morning,朝
 DocType: Quotation Item,Quotation Item,見積品目
+apps/erpnext/erpnext/config/support.py,Issue Priority.,優先順位を発行します。
 DocType: Journal Entry,Credit Card Entry,クレジットカードの入力
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",タイムスロットがスキップされました。スロット{0}から{1}は既存のスロット{2}から{3}と重なっています
 DocType: Journal Entry Account,If Income or Expense,収入または経費の場合
@@ -5146,11 +5197,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,データのインポートと設定
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",[自動オプトイン]がオンになっていると、顧客は自動的に関連するロイヤリティプログラムにリンクされます(保存時)。
 DocType: Account,Expense Account,経費アカウント
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,従業員チェックインが出席のために考慮される間のシフト開始時間の前の時間。
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Guardian1との関係
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,請求書を作成する
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},支払い請求は既に存在します{0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0}に安心した従業員は &#39;Left&#39;に設定する必要があります
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},{0} {1}を支払う
+DocType: Company,Sales Settings,セールス設定
 DocType: Sales Order Item,Produced Quantity,生産量
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,次のリンクをクリックして見積もり依頼にアクセスできます。
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次分布の名前
@@ -5229,6 +5282,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,販売および購入用のデフォルトの税テンプレートが作成されます。
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,脱退タイプ{0}はキャリー転送できません
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,口座振替は売掛金口座である必要があります
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,契約の終了日を今日より短くすることはできません。
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},倉庫{0}のアカウントまたは会社{1}のデフォルト在庫アカウントを設定してください
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,デフォルトとして設定
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),このパッケージの正味重量。 (品目の正味重量の合計として自動的に計算されます)
@@ -5255,8 +5309,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,期限切れのバッチ
 DocType: Shipping Rule,Shipping Rule Type,配送ルールの種類
 DocType: Job Offer,Accepted,受け入れ済み
-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> \を削除してください"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,あなたはすでに評価基準{}を評価しました。
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,バッチ番号を選択
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),年齢(日数)
@@ -5283,6 +5335,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,ドメインを選択してください
 DocType: Agriculture Task,Task Name,タスク名
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,作業指図に対してすでに登録されている在庫エントリ
+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> \を削除してください"
 ,Amount to Deliver,お届けする金額
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,会社{0}は存在しません
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,指定された商品にリンクする保留中のマテリアル要求はありません。
@@ -5332,6 +5386,7 @@
 DocType: Lab Prescription,Test Code,テストコード
 DocType: Purchase Taxes and Charges,On Previous Row Total,前の行の合計
 DocType: Student,Student Email Address,学生のメールアドレス
+,Delayed Item Report,遅延商品レポート
 DocType: Academic Term,Education,教育
 DocType: Supplier Quotation,Supplier Address,サプライヤアドレス
 DocType: Salary Detail,Do not include in total,合計に含めない
@@ -5339,7 +5394,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}:{1}は存在しません
 DocType: Purchase Receipt Item,Rejected Quantity,拒否数量
 DocType: Cashier Closing,To TIme,時間に
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},品目{2}の単位変換係数({0}  - &gt; {1})が見つかりません
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,日課要約グループ・ユーザー
 DocType: Fiscal Year Company,Fiscal Year Company,年度会社
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,代替品目は品目コードと同じであってはなりません
@@ -5391,6 +5445,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,配達間の遅延
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[日数]より古い在庫を凍結する
 DocType: Promotional Scheme,Promotional Scheme Product Discount,プロモーションスキームの製品割引
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,問題の優先順位はすでに存在します
 DocType: Account,Asset Received But Not Billed,受領したが未請求の資産
 DocType: POS Closing Voucher,Total Collected Amount,総回収額
 DocType: Course,Default Grading Scale,デフォルトのグレーディングスケール
@@ -5433,6 +5488,7 @@
 DocType: Contract,Fulfilment Terms,履行条件
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,非グループ間
 DocType: Student Guardian,Mother,母
+DocType: Issue,Service Level Agreement Fulfilled,達成されたサービスレベル契約
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,未請求従業員給付に対する控除税
 DocType: Travel Request,Travel Funding,旅行資金
 DocType: Shipping Rule,Fixed,一定
@@ -5462,10 +5518,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,項目は見つかりませんでした。
 DocType: Item Attribute,From Range,範囲から
 DocType: Clinical Procedure,Consumables,消耗品
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39;と &#39;timestamp&#39;は必須です。
 DocType: Purchase Taxes and Charges,Reference Row #,参照行番号
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},会社{0}に「資産減価償却費センター」を設定してください。
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,行#{0}:取引を完了するには支払伝票が必要です
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,このボタンをクリックして、Amazon MWSからSales Orderデータを取得します。
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),半日がマークされる労働時間。 (無効にするにはゼロ)
 ,Assessment Plan Status,評価計画のステータス
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,最初に{0}を選択してください
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,これを送信して従業員レコードを作成します
@@ -5536,6 +5594,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,オープンに設定
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,フィルタの切り替え
 DocType: Production Plan,Material Request Detail,資料請求詳細
+DocType: Shift Type,Process Attendance After,後のプロセス参加
 DocType: Material Request Item,Quantity and Warehouse,数量と倉庫
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,プログラムへ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},行#{0}:参照{1} {2}のエントリが重複しています
@@ -5593,6 +5652,7 @@
 DocType: Pricing Rule,Party Information,パーティー情報
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),債務者({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,現在までの日数は、従業員の安心日を超えることはできません
+DocType: Shift Type,Enable Exit Grace Period,猶予期間終了を有効にする
 DocType: Expense Claim,Employees Email Id,従業員のEメールID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,ShopifyからERP次価格リストに価格を更新
 DocType: Healthcare Settings,Default Medical Code Standard,デフォルトの医療コード標準
@@ -5623,7 +5683,6 @@
 DocType: Budget,Applicable on Material Request,材料要求で適当
 DocType: Support Settings,Search APIs,検索API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,受注の過剰生産率
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,仕様
 DocType: Purchase Invoice,Supplied Items,付属品
 DocType: Leave Control Panel,Select Employees,従業員を選択
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},ローンの受取利息口座を選択{0}
@@ -5649,7 +5708,7 @@
 ,Supplier-Wise Sales Analytics,サプライヤ別売上分析
 DocType: GSTR 3B Report,February,2月
 DocType: Appraisal,For Employee,従業員のために
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,実際の配達日
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,実際の配達日
 DocType: Sales Partner,Sales Partner Name,販売パートナー名
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,減価償却行{0}:減価償却開始日が過去の日付として入力されています
 DocType: GST HSN Code,Regional,地域
@@ -5688,6 +5747,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,サプライヤスコアカード
 DocType: Travel Itinerary,Travel To,へ旅をする
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,マーク出席
+DocType: Shift Type,Determine Check-in and Check-out,チェックインとチェックアウトの決定
 DocType: POS Closing Voucher,Difference,差
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,小さい
 DocType: Work Order Item,Work Order Item,作業オーダー明細
@@ -5721,6 +5781,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ドラッグ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1}は閉じています
 DocType: Patient,Medical History,病歴
+DocType: Expense Claim,Expense Taxes and Charges,経費税金
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,請求書の日付が経過してから購読をキャンセルするか、購読を未払いとしてマークするまでの日数
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,インストールノート{0}は既に送信されています
 DocType: Patient Relation,Family,家族
@@ -5753,7 +5814,6 @@
 DocType: Dosage Strength,Strength,力
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,このトランザクションを完了するには、{2}に{1}の{0}単位が必要でした。
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,に基づく外注のバックフラッシュ原材料
-DocType: Bank Guarantee,Customer,顧客
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",有効にすると、プログラム登録ツールのフィールド学術用語が必須になります。
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",バッチベースの学生グループの場合、学生バッチはプログラム登録からのすべての学生に対して検証されます。
 DocType: Course,Topics,トピック
@@ -5832,6 +5892,7 @@
 DocType: Chapter,Chapter Members,章のメンバー
 DocType: Warranty Claim,Service Address,サービスアドレス
 DocType: Journal Entry,Remark,リマーク
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}:エントリーの転記時点で、倉庫{1}の{4}の数量は使用できません({2} {3})
 DocType: Patient Encounter,Encounter Time,出会いの時間
 DocType: Serial No,Invoice Details,請求の詳細
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups",グループで追加のアカウントを作成できますが、グループ以外のメンバーに対してもエントリを作成できます。
@@ -5912,6 +5973,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),決算(始値+総額)
 DocType: Supplier Scorecard Criteria,Criteria Formula,基準式
 apps/erpnext/erpnext/config/support.py,Support Analytics,サポート分析
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),出席デバイスID(バイオメトリック/ RFタグID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,レビューと対処
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",アカウントが凍結されている場合、エントリは制限されたユーザーに許可されます。
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,減価償却後の金額
@@ -5933,6 +5995,7 @@
 DocType: Salary Slip,Loan Repayment,ローン返済
 DocType: Employee Education,Major/Optional Subjects,専攻科目/オプション科目
 DocType: Soil Texture,Silt,シルト
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,サプライヤーの住所と連絡先
 DocType: Bank Guarantee,Bank Guarantee Type,銀行保証タイプ
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",無効にした場合、[丸められた合計]フィールドはどの取引にも表示されません。
 DocType: Pricing Rule,Min Amt,最小額
@@ -5971,6 +6034,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,請求書作成ツールアイテムを開く
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg)/ K
 DocType: Bank Reconciliation,Include POS Transactions,POSトランザクションを含める
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},指定された従業員フィールド値に従業員が見つかりませんでした。 &#39;{}&#39;:{}
 DocType: Payment Entry,Received Amount (Company Currency),受領額(会社通貨)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save",LocalStorageがいっぱいです。保存できませんでした
 DocType: Chapter Member,Chapter Member,チャプターメンバー
@@ -6003,6 +6067,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,学生グループは作成されませんでした。
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},行{0}が同じ{1}と重複しています
 DocType: Employee,Salary Details,給与の詳細
+DocType: Employee Checkin,Exit Grace Period Consequence,猶予期間終了の結果
 DocType: Bank Statement Transaction Invoice Item,Invoice,請求書
 DocType: Special Test Items,Particulars,詳細
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,アイテムまたは倉庫に基づいてフィルタを設定してください
@@ -6104,6 +6169,7 @@
 DocType: Serial No,Out of AMC,AMCから
 DocType: Job Opening,"Job profile, qualifications required etc.",職種、必要な資格など
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,出荷する
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,資料請求を提出しますか
 DocType: Opportunity Item,Basic Rate,基本レート
 DocType: Compensatory Leave Request,Work End Date,作業終了日
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,原材料の請求
@@ -6289,6 +6355,7 @@
 DocType: Sales Order Item,Gross Profit,粗利益
 DocType: Quality Inspection,Item Serial No,品目シリアル番号
 DocType: Asset,Insurer,保険会社
+DocType: Employee Checkin,OUT,でる
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,購入金額
 DocType: Asset Maintenance Task,Certificate Required,証明書が必要です
 DocType: Retention Bonus,Retention Bonus,保持ボーナス
@@ -6404,6 +6471,8 @@
 DocType: Invoice Discounting,Sanctioned,認可済み
 DocType: Course Enrollment,Course Enrollment,コース登録
 DocType: Item,Supplier Items,サプライヤ品目
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",開始時間は{0}に対して終了時間以上にすることはできません。
 DocType: Sales Order,Not Applicable,適用できません
 DocType: Support Search Source,Response Options,応答オプション
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0}は0から100までの値でなければなりません
@@ -6490,7 +6559,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,固定資産
 DocType: Purchase Order,Ref SQ,参照SQ
 DocType: Salary Structure,Total Earning,総収入
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;地域
 DocType: Share Balance,From No,いいえから
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,支払い調整請求書
 DocType: Purchase Invoice,Taxes and Charges Added,追加された税金
@@ -6598,6 +6666,7 @@
 DocType: POS Profile,Ignore Pricing Rule,価格設定ルールを無視
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,フード
 DocType: Lost Reason Detail,Lost Reason Detail,失われた理由の詳細
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},以下のシリアル番号が作成されました。 <br> {0}
 DocType: Maintenance Visit,Customer Feedback,お客様の声
 DocType: Serial No,Warranty / AMC Details,保証/ AMCの詳細
 DocType: Issue,Opening Time,開始時間
@@ -6647,6 +6716,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,会社名が同じではありません
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,昇進日より前に従業員昇進を提出することはできません
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0}より古い株式取引を更新することはできません
+DocType: Employee Checkin,Employee Checkin,従業員チェックイン
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},開始日は、アイテム{0}の終了日より小さくなければなりません
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,顧客見積もりを作成する
 DocType: Buying Settings,Buying Settings,購入設定
@@ -6668,6 +6738,7 @@
 DocType: Patient,Patient Demographics,患者の人口統計
 DocType: Share Transfer,To Folio No,フォリオへ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,営業活動によるキャッシュフロー
+DocType: Employee Checkin,Log Type,ログタイプ
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,数量や金額に変更がない項目はありません。
 DocType: Asset,Purchase Date,購入日
@@ -6712,6 +6783,7 @@
 DocType: Vital Signs,Very Hyper,とてもハイパー
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,あなたのビジネスの性質を選択してください。
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,月と年を選択してください
+DocType: Service Level,Default Priority,デフォルトの優先順位
 DocType: Student Log,Student Log,学生ログ
 DocType: Shopping Cart Settings,Enable Checkout,チェックアウトを有効にする
 apps/erpnext/erpnext/config/settings.py,Human Resources,人事
@@ -6740,7 +6812,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ShopifyとERPの接続
 DocType: Homepage Section Card,Subtitle,字幕
 DocType: Soil Texture,Loam,ローム
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤーの種類
 DocType: BOM,Scrap Material Cost(Company Currency),不良品目原価(会社通貨)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,納品書{0}を送信しないでください。
 DocType: Task,Actual Start Date (via Time Sheet),実際の開始日(タイムシート経由)
@@ -6796,6 +6867,7 @@
 DocType: Drug Prescription,Dosage,投与量
 DocType: Cheque Print Template,Starting position from top edge,上端からの開始位置
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),予約期間(分)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},この従業員はすでに同じタイムスタンプのログを持っています。{0}
 DocType: Accounting Dimension,Disable,無効にする
 DocType: Email Digest,Purchase Orders to Receive,受け取る注文書
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,プロダクションオーダーは
@@ -6811,7 +6883,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,外注に対して転送される品目
 DocType: Job Card,Timing Detail,タイミング詳細
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,必須オン
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{1}の{0}をインポートしています
 DocType: Job Offer Term,Job Offer Term,求人期間
 DocType: SMS Center,All Contact,すべての連絡先
 DocType: Project Task,Project Task,プロジェクト課題
@@ -6862,7 +6933,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,シリアル番号にアイテム{0}が設定されていませんチェックアイテムマスター
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,州から
 DocType: Leave Type,Maximum Continuous Days Applicable,適用可能な最大連続日数
-apps/erpnext/erpnext/config/support.py,Support Team.,支援チーム。
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,最初に会社名を入力してください
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,インポート成功
 DocType: Guardian,Alternate Number,代替番号
@@ -6954,6 +7024,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,行#{0}:項目が追加されました
 DocType: Student Admission,Eligibility and Details,資格と詳細
 DocType: Staffing Plan,Staffing Plan Detail,人員配置計画の詳細
+DocType: Shift Type,Late Entry Grace Period,後期猶予期間
 DocType: Email Digest,Annual Income,年収
 DocType: Journal Entry,Subscription Section,購読セクション
 DocType: Salary Slip,Payment Days,支払い日数
@@ -7004,6 +7075,7 @@
 DocType: Journal Entry Account,Account Balance,勘定残高
 DocType: Asset Maintenance Log,Periodicity,周期性
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,医療記録
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,ログタイプは、シフトに該当するチェックインに必要です:{0}。
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,実行
 DocType: Item,Valuation Method,評価方法
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},売上請求書{1}に対する{0}
@@ -7088,6 +7160,7 @@
 DocType: Loan Type,Loan Name,ローン名
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,デフォルトの支払い方法を設定する
 DocType: Quality Goal,Revision,リビジョン
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,チェックアウト時のシフト終了時刻までの時間が早い(分単位)と見なされます。
 DocType: Healthcare Service Unit,Service Unit Type,サービスユニットの種類
 DocType: Purchase Invoice,Return Against Purchase Invoice,購入請求書に対する返品
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,秘密を生成する
@@ -7243,12 +7316,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,化粧品
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,保存する前にユーザーにシリーズの選択を強制する場合は、これをチェックします。これをチェックするとデフォルトはありません。
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,このロールを持つユーザーは、固定アカウントを設定したり、固定アカウントに対するアカウントエントリを作成/変更することができます。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Expense Claim,Total Claimed Amount,総請求金額
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}の次の{0}日にタイムスロットが見つかりません
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,まとめ
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,あなたの会員資格が30日以内に失効する場合にのみ更新することができます
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},値は{0}と{1}の間でなければなりません
 DocType: Quality Feedback,Parameters,パラメーター
+DocType: Shift Type,Auto Attendance Settings,自動参加設定
 ,Sales Partner Transaction Summary,販売パートナー取引サマリー
 DocType: Asset Maintenance,Maintenance Manager Name,メンテナンスマネージャ名
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,商品詳細を取得する必要があります。
@@ -7340,10 +7415,10 @@
 DocType: Pricing Rule,Validate Applied Rule,適用ルールを検証
 DocType: Job Card Item,Job Card Item,求人カード項目
 DocType: Homepage,Company Tagline for website homepage,ウェブサイトホームページの会社用キャッチフレーズ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,索引{1}の優先順位{0}の応答時間と解決策を設定してください。
 DocType: Company,Round Off Cost Center,丸め原価センタ
 DocType: Supplier Scorecard Criteria,Criteria Weight,基準ウェイト
 DocType: Asset,Depreciation Schedules,減価償却スケジュール
-DocType: Expense Claim Detail,Claim Amount,請求額
 DocType: Subscription,Discounts,割引
 DocType: Shipping Rule,Shipping Rule Conditions,配送ルールの条件
 DocType: Subscription,Cancelation Date,キャンセル日
@@ -7371,7 +7446,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,ゼロ値を表示
 DocType: Employee Onboarding,Employee Onboarding,従業員のオンボーディング
 DocType: POS Closing Voucher,Period End Date,期間終了日
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,ソース別販売機会
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,リストの最初のLeave ApproverがデフォルトのLeave Approverとして設定されます。
 DocType: POS Settings,POS Settings,POS設定
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,全アカウント
@@ -7392,7 +7466,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行#{0}:レートは{1}:{2}と同じである必要があります({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-YYYY-
 DocType: Healthcare Settings,Healthcare Service Items,医療サービス項目
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,レコードが見つかりません
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,エイジングレンジ3
 DocType: Vital Signs,Blood Pressure,血圧
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,ターゲットオン
@@ -7439,6 +7512,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,バッチ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,防衛
 DocType: Item,Has Batch No,バッチなし
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,遅延日数
 DocType: Lead,Person Name,人名
 DocType: Item Variant,Item Variant,品目バリアント
 DocType: Training Event Employee,Invited,招待しました
@@ -7460,7 +7534,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",有効な給与計算期間にない開始日と終了日は、{0}を計算できません。
 DocType: POS Profile,Only show Customer of these Customer Groups,これらの顧客グループの顧客のみを表示
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,請求書を保存するアイテムを選択します
-DocType: Service Level,Resolution Time,解決時間
+DocType: Service Level Priority,Resolution Time,解決時間
 DocType: Grading Scale Interval,Grade Description,グレード説明
 DocType: Homepage Section,Cards,カード
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,質の高い会議議事録
@@ -7487,6 +7561,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,総勘定元帳による銀行報告書残高
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),ヘルスケア(ベータ版)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,受注および出荷伝票を登録するデフォルト倉庫
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,索引{1}の{0}の応答時間は、解決時間より長くすることはできません。
 DocType: Opportunity,Customer / Lead Name,得意先/リード名
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-YYYY-
 DocType: Expense Claim Advance,Unclaimed amount,未請求額
@@ -7533,7 +7608,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,パーティーと住所のインポート
 DocType: Item,List this Item in multiple groups on the website.,このアイテムをWebサイト上の複数のグループにまとめてください。
 DocType: Request for Quotation,Message for Supplier,サプライヤーへのメッセージ
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,品目{1}の在庫取引が存在するため、{0}を変更できません。
 DocType: Healthcare Practitioner,Phone (R),電話番号
 DocType: Maintenance Team Member,Team Member,チームメンバー
 DocType: Asset Category Account,Asset Category Account,資産カテゴリ勘定
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 24b7bbc..b636bea 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,ការលុបចោល {0} និងវិក័យប័ត្រលក់ {1} ត្រូវបានលុបចោល
 DocType: Purchase Receipt,Vehicle Number,លេខរថយន្ត
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,អាសយដ្ឋានអ៊ីមែលរបស់អ្នក ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,រួមបញ្ចូលធាតុសៀវភៅដៃលំនាំដើម
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,រួមបញ្ចូលធាតុសៀវភៅដៃលំនាំដើម
 DocType: Activity Cost,Activity Type,ប្រភេទសកម្មភាព
 DocType: Purchase Invoice,Get Advances Paid,ទទួលប្រាក់កម្ចីជាមុន
 DocType: Company,Gain/Loss Account on Asset Disposal,គណនីចំណេញ / បាត់បង់នៅលើការចោលទ្រព្យសម្បត្តិ
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,ធាតុបង់ប្រាក់
 DocType: Employee Education,Class / Percentage,ថ្នាក់ / ភាគរយ
 ,Electronic Invoice Register,ចុះឈ្មោះវិក្កយបត្រអេឡិចត្រូនិក
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,ចំនួននៃការកើតឡើងដែលលទ្ធផលត្រូវបានប្រតិបត្តិ។
 DocType: Sales Invoice,Is Return (Credit Note),ការវិលត្រឡប់ (ចំណាំឥណទាន)
+DocType: Price List,Price Not UOM Dependent,តម្លៃមិនមែន UOM អ្នកអាស្រ័យ
 DocType: Lab Test Sample,Lab Test Sample,គំរូតេស្តមន្ទីរពិសោធន៍
 DocType: Shopify Settings,status html,html ស្ថានភាព
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",ឧទាហរណ៍ 2012 2012-13
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,ការចំណាយសុទ្ធ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Amt សរុបសរុប
 DocType: Clinical Procedure,Consumables Invoice Separately,វិក័យប័ត្រប្រើប្រាស់ដោយឡែកពីគ្នា
+DocType: Shift Type,Working Hours Threshold for Absent,ចំនួនម៉ោងធ្វើការសម្រាប់អវត្តមាន
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR - .YY.- .MM ។
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},មិនអាចកំណត់ថវិកាលើគណនីក្រុម {0}
 DocType: Purchase Receipt Item,Rate and Amount,អត្រានិងបរិមាណ
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,កំណត់ការកំណត់អ្នកជម្ងឺ
 DocType: Asset,Insurance End Date,ថ្ងៃផុតកំណត់ធានារ៉ាប់រង
 DocType: Bank Account,Branch Code,លេខកូដសាខា
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,ពេលវេលាត្រូវឆ្លើយតប
 apps/erpnext/erpnext/public/js/conf.js,User Forum,វេទិកាអ្នកប្រើ
 DocType: Landed Cost Item,Landed Cost Item,តម្លៃទំនិញចុះចត
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,អ្នកលក់និងអ្នកទិញមិនអាចមានលក្ខណៈដូចគ្នាទេ
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,ផ្ទេរ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),ធាតុស្វែងរក (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} លទ្ធផលដែលបានបញ្ជូន
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ពីកាលបរិច្ឆេទមិនអាចធំជាងកាលបរិច្ឆេទបានទេ
 DocType: Supplier,Supplier of Goods or Services.,អ្នកផ្គត់ផ្គង់ទំនិញឬសេវាកម្ម។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ឈ្មោះគណនីថ្មី។ ចំណាំ: សូមកុំបង្កើតគណនីសម្រាប់អតិថិជននិងអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,ក្រុមនិស្សិតឬកាលវិភាគនៃវគ្គសិក្សាគឺជាការចាំបាច់
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,ឈ្មោះជំនាញ
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,បោះពុម្ពរបាយការណ៍កាត
 DocType: Soil Texture,Ternary Plot,អាថ៌កំបាំង
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,គាំទ្រសំបុត្រ
 DocType: Asset Category Account,Fixed Asset Account,គណនីមានកាលកំណត់
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,ចុងក្រោយ
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,កាតព្វកិច្ចសម្រាប់សន្លឹកតុល្យភាព
 DocType: Payment Entry,Total Allocated Amount,ចំនួនសរុបដែលបានបម្រុងទុក
 DocType: Sales Invoice,Get Advances Received,ទទួលប្រាក់កម្រៃដែលបានទទួល
+DocType: Shift Type,Last Sync of Checkin,ធ្វើសមកាលកម្មចុងក្រោយនៃការធីក
 DocType: Student,B-,ខ -
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,បរិមាណពន្ធធាតុរាប់បញ្ចូលក្នុងតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,ក្រុមឈាម
 apps/erpnext/erpnext/config/healthcare.py,Masters,ថ្នាក់អនុបណ្ឌិត
 DocType: Crop,Crop Spacing UOM,ច្រឹបដំណាំ UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,ពេលវេលាបន្ទាប់ពីការចាប់ផ្តើមការផ្លាស់ប្តូរនៅពេលពិនិត្យមើលត្រូវបានចាត់ទុកថាជាការយឺត (គិតជានាទី) ។
 apps/erpnext/erpnext/templates/pages/home.html,Explore,រុករក
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,រកមិនឃើញវិក័យប័ត្រដែលនៅសល់
 DocType: Promotional Scheme,Product Discount Slabs,ផលិតផលថលបញ្ចុះតម្លៃ
 DocType: Hotel Room Package,Amenities,គ្រឿងបរិក្ខារ
 DocType: Lab Test Groups,Add Test,បន្ថែមតេស្ត
@@ -1003,6 +1008,7 @@
 DocType: Item,Moving Average,ការផ្លាស់ប្តូរមធ្យម
 DocType: Employee Attendance Tool,Unmarked Attendance,ការចូលរួមមិនបានសម្គាល់
 DocType: Homepage Section,Number of Columns,ចំនួនជួរឈរ
+DocType: Issue Priority,Issue Priority,ដាក់បញ្ហាអាទិភាព
 DocType: Holiday List,Add Weekly Holidays,បន្ថែមថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
 DocType: Shopify Log,Shopify Log,ចុះឈ្មោះចូលទំនិញ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,បង្កើតប្រាក់ខែ
@@ -1011,6 +1017,7 @@
 DocType: Warranty Claim,Issue Date,កាលបរិច្ឆេទចេញផ្សាយ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសរើសបាច់សំរាប់ធាតុ {0} ។ មិនអាចស្វែងរកឡូហ្គោតែមួយដែលបំពេញតាមតម្រូវការនេះ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,មិនអាចបង្កើតប្រាក់លើកទឹកចិត្តសំរាប់បុគ្គលិកដែលនៅសល់
+DocType: Employee Checkin,Location / Device ID,ទីតាំង / លេខសម្គាល់ឧបករណ៍
 DocType: Purchase Order,To Receive,ទទួល
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,អ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញបានទេលុះត្រាតែអ្នកមានបណ្តាញ។
 DocType: Course Activity,Enrollment,ចុះឈ្មោះចូលរៀន
@@ -1019,7 +1026,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},អតិបរមា: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ពត៌មានវិក័យប័ត្រដែលបាត់
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,គ្មានការស្នើសុំសម្ភារៈដែលបានបង្កើត
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 DocType: Loan,Total Amount Paid,ចំនួនទឹកប្រាក់សរុបបង់
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,ធាតុទាំងនេះទាំងអស់ត្រូវបានទូទាត់រួចហើយ
 DocType: Training Event,Trainer Name,ឈ្មោះគ្រូបង្គោល
@@ -1129,6 +1135,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},សូមរៀបរាប់ពីឈ្មោះនាំមុខក្នុង {0}
 DocType: Employee,You can enter any date manually,អ្នកអាចបញ្ចូលកាលបរិច្ឆេទណាមួយដោយដៃ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុផ្សះផ្សាផ្សារភាគហ៊ុន
+DocType: Shift Type,Early Exit Consequence,លទ្ធផលចេញពីដំណាក់កាលដំបូង
 DocType: Item Group,General Settings,ការកំណត់ទូទៅ
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,កាលបរិច្ឆេទដល់កំណត់មិនអាចនៅមុនថ្ងៃប្រកាសវិក័យប័ត្រ / អ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,បញ្ចូលឈ្មោះរបស់អ្នកទទួលផលមុនពេលបញ្ជូន។
@@ -1167,6 +1174,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,ការបញ្ជាក់ការទូទាត់
 ,Available Stock for Packing Items,មានស្តុកសម្រាប់ការវេចខ្ចប់ធាតុ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},សូមលុបវិក័យប័ត្រនេះ {0} ពី C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,រាល់ការបញ្ចូលនិងពិនិត្យចេញមានសុពលភាព
 DocType: Support Search Source,Query Route String,ខ្សែអក្សរស្នើសុំផ្លូវ
 DocType: Customer Feedback Template,Customer Feedback Template,គំរូមតិយោបល់របស់អតិថិជន
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,សម្រង់ទៅនាំមុខឬអតិថិជន។
@@ -1201,6 +1209,7 @@
 DocType: Authorization Control,Authorization Control,ការគ្រប់គ្រងការអនុញ្ញាតិ
 ,Daily Work Summary Replies,ស្នាដៃសង្ខេបការងារប្រចាំថ្ងៃ
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},អ្នកត្រូវបានអញ្ជើញឱ្យចូលរួមសហការលើគម្រោង: {0}
+DocType: Issue,Response By Variance,ការឆ្លើយតបដោយវ៉ារ្យង់
 DocType: Item,Sales Details,ព័ត៌មានលក់
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,ក្បាលអក្សរសម្រាប់ពុម្ពបោះពុម្ព។
 DocType: Salary Detail,Tax on additional salary,ពន្ធលើប្រាក់ខែបន្ថែម
@@ -1324,6 +1333,7 @@
 DocType: Project,Task Progress,កិច្ចការវឌ្ឍនភាព
 DocType: Journal Entry,Opening Entry,បើកធាតុ
 DocType: Bank Guarantee,Charges Incurred,ការចោទប្រកាន់កើតឡើង
+DocType: Shift Type,Working Hours Calculation Based On,ការគណនាម៉ោងធ្វើការផ្អែកលើ
 DocType: Work Order,Material Transferred for Manufacturing,បញ្ជូនសម្ភារៈសម្រាប់ផលិត
 DocType: Products Settings,Hide Variants,លាក់វ៉ារ្យង់
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,បិទដំណើរការផែនការសមត្ថភាពនិងតាមដានពេលវេលា
@@ -1353,6 +1363,7 @@
 DocType: Guardian,Interests,ផលប្រយោជន៍
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ចំនួនអ្នកប្រើប្រាស់
 DocType: Education Settings,Education Manager,កម្មវិធីអប់រំ
+DocType: Employee Checkin,Shift Actual Start,ប្ដូរវេនពិតប្រាកដ
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,កំណត់ពេលម៉ោងកំណត់នៅខាងក្រៅស្ថានីយការងារម៉ោងធ្វើការ។
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},ពិន្ទុស្មោះត្រង់: {0}
 DocType: Healthcare Settings,Registration Message,សារចុះឈ្មោះ
@@ -1377,9 +1388,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,វិក្កយបត្រត្រូវបានបង្កើតរួចរាល់សម្រាប់រាល់វិក័យប័ត្រ
 DocType: Sales Partner,Contact Desc,ទំនាក់ទំនងដេ
 DocType: Purchase Invoice,Pricing Rules,ច្បាប់កំណត់តម្លៃ
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",ដោយសារមានប្រតិបត្តិការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0} អ្នកមិនអាចប្តូរតម្លៃនៃ {1}
 DocType: Hub Tracked Item,Image List,បញ្ជីរូបភាព
 DocType: Item Variant Settings,Allow Rename Attribute Value,អនុញ្ញាតឱ្យប្តូរឈ្មោះគុណលក្ខណៈគុណលក្ខណៈ
-DocType: Price List,Price Not UOM Dependant,តម្លៃមិនមែន UOM អ្នកអាស្រ័យ
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),ពេលវេលា (គិតជានាទី)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,មូលដ្ឋាន
 DocType: Loan,Interest Income Account,គណនីចំណូលការប្រាក់
@@ -1389,6 +1400,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,ជ្រើសរើសពត៌មាន POS
 DocType: Support Settings,Get Latest Query,ទទួលយកសំណួរចុងក្រោយបំផុត
 DocType: Employee Incentive,Employee Incentive,ការលើកទឹកចិត្តបុគ្គលិក
+DocType: Service Level,Priorities,អាទិភាព
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,បន្ថែមកាតឬផ្នែកផ្ទាល់ខ្លួននៅលើគេហទំព័រ
 DocType: Homepage,Hero Section Based On,ផ្នែកវីរបុរសដោយផ្អែកលើ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),តម្លៃការទិញសរុប (តាមរយៈវិក័យប័ត្រទិញ)
@@ -1449,7 +1461,7 @@
 DocType: Blanket Order Item,Ordered Quantity,បរិមាណបញ្ជា
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងដែលច្រានចោលគឺជាការចាំបាច់ប្រឆាំងនឹងធាតុបដិសេធ {1}
 ,Received Items To Be Billed,បានទទួលធាតុដែលត្រូវបានចេញវិក្កយបត្រ
-DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
+DocType: Attendance,Working Hours,ម៉ោងធ្វើការ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,របៀបបង់ប្រាក់
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,ការបញ្ជាទិញទំនិញដែលមិនទាន់បានទទួល
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,រយៈពេលជាថ្ងៃ
@@ -1569,7 +1581,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,ព័ត៌មានតាមផ្លូវច្បាប់និងព័ត៌មានទូទៅផ្សេងទៀតអំពីអ្នកផ្គត់ផ្គង់របស់អ្នក
 DocType: Item Default,Default Selling Cost Center,មជឈមណ្ឌលថ្លៃលក់លំនាំដើម
 DocType: Sales Partner,Address & Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 DocType: Subscriber,Subscriber,អតិថិជន
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# សំណុំបែបបទ / ធាតុ / {0}) គឺអស់ពីស្តុក
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,សូមជ្រើសកាលបរិច្ឆេទប្រកាសជាមុនសិន
@@ -1580,7 +1591,7 @@
 DocType: Detected Disease,Tasks Created,កិច្ចការត្រូវបានបង្កើត
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,BOM លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬគំរូរបស់វា
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,អត្រាគណៈកម្មការ%
-DocType: Service Level,Response Time,ពេលវេលាឆ្លើយតប
+DocType: Service Level Priority,Response Time,ពេលវេលាឆ្លើយតប
 DocType: Woocommerce Settings,Woocommerce Settings,ការកំណត់ Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,បរិមាណត្រូវតែជាវិជ្ជមាន
 DocType: Contract,CRM,CRM
@@ -1597,7 +1608,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,ការធ្វើផែនទីទិន្នន័យប្រតិបត្តិការ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,អ្នកដឹកនាំត្រូវការឈ្មោះរបស់បុគ្គលឬឈ្មោះអង្គការ
 DocType: Student,Guardians,អាណាព្យាបាល
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ&gt; ការកំណត់អប់រំ
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ជ្រើសរើសម៉ាក ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,ចំណូលកណ្តាល
 DocType: Shipping Rule,Calculate Based On,គណនាផ្អែកលើ
@@ -1634,6 +1644,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},កំណត់ត្រាចូលរួម {0} មានប្រឆាំងនឹងសិស្ស {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,កាលបរិច្ឆេទនៃប្រតិបត្តិការ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,បោះបង់ការជាវ
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,មិនអាចកំណត់កិច្ចព្រមព្រៀងកម្រិតសេវា {0} ។
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,ចំនួនប្រាក់ខែសុទ្ធ
 DocType: Account,Liability,ការទទួលខុសត្រូវ
 DocType: Employee,Bank A/C No.,ធនាគារអេស៊ីស៊ី No.
@@ -1699,7 +1710,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដសម្ភារៈវត្ថុដើម
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,ការទិញវិក័យប័ត្រ {0} ត្រូវបានដាក់ស្នើរួចហើយ
 DocType: Fees,Student Email,អ៊ីមែលសិស្ស
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},ការហៅតាមលេខរៀង: {0} មិនអាចជាមេឬកូននៃ {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,ទទួលបានរបស់របរពីសេវាកម្មសុខភាព
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,ធាតុបញ្ចូល {0} មិនត្រូវបានដាក់ស្នើទេ
 DocType: Item Attribute Value,Item Attribute Value,តម្លៃគុណលក្ខណៈធាតុ
@@ -1723,7 +1733,6 @@
 DocType: Production Plan,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
 DocType: Leave Application,Leave Approver Name,ទុកឈ្មោះអ្នកអនុម័ត
 DocType: Shareholder,Shareholder,ម្ចាស់ហ៊ុន
-DocType: Issue,Agreement Status,ស្ថានភាពកិច្ចព្រមព្រៀង
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,ការកំណត់លំនាំដើមសម្រាប់ការលក់ប្រតិបត្តិការ។
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,សូមជ្រើសរើសការចូលរៀនរបស់សិស្សដែលចាំបាច់សំរាប់អ្នកដាក់ពាក្យស្នើសុំ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,ជ្រើសមូលបត្រ
@@ -1986,6 +1995,7 @@
 DocType: Account,Income Account,គណនីចំណូល
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,ឃ្លាំងទាំងអស់
 DocType: Contract,Signee Details,ព័ត៌មានលម្អិតអ្នកចុះហត្ថលេខា
+DocType: Shift Type,Allow check-out after shift end time (in minutes),អនុញ្ញាតឱ្យចាកចេញបន្ទាប់ពីវេនបញ្ចប់វេន (គិតជានាទី)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,លទ្ធកម្ម
 DocType: Item Group,Check this if you want to show in website,សូមពិនិត្យមើលនេះប្រសិនបើអ្នកចង់បង្ហាញនៅក្នុងគេហទំព័រ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,រកមិនឃើញឆ្នាំសារពើពន្ធ {0}
@@ -2052,6 +2062,7 @@
 DocType: Activity Cost,Billing Rate,អត្រាចេញវិក្កយបត្រ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},ព្រមាន: {0} # {1} ផ្សេងទៀតកើតឡើងប្រឆាំងនឹងធាតុភាគហ៊ុន {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,សូមបើកការកំណត់ផែនទី Google ដើម្បីប៉ាន់ស្មាននិងបង្កើនផ្លូវ
+DocType: Purchase Invoice Item,Page Break,ការបំបែកទំព័រ
 DocType: Supplier Scorecard Criteria,Max Score,ពិន្ទុអតិបរមា
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,ថ្ងៃចាប់ផ្តើមនៃការបង់ប្រាក់មិនអាចនៅមុនកាលបរិច្ឆេទបញ្ចេញ។
 DocType: Support Search Source,Support Search Source,ប្រភពស្វែងរកការគាំទ្រ
@@ -2120,6 +2131,7 @@
 DocType: Employee Transfer,Employee Transfer,ការផ្ទេរបុគ្គលិក
 ,Sales Funnel,ការលក់បំពង់
 DocType: Agriculture Analysis Criteria,Water Analysis,ការវិភាគទឹក
+DocType: Shift Type,Begin check-in before shift start time (in minutes),ចាប់ផ្តើមចូលមុនពេលវេនពេលវេលាចាប់ផ្តើម (គិតជានាទី)
 DocType: Accounts Settings,Accounts Frozen Upto,គណនីជាប់គាំងរហូតដល់
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,មិនមានអ្វីត្រូវកែសម្រួលទេ។
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",ប្រតិបត្តិការ {0} វែងជាងម៉ោងធ្វើការណាមួយនៅក្នុងស្ថានីយការងារ {1} បំបែកប្រតិបត្ដិការទៅជាប្រតិបត្តិការច្រើន
@@ -2133,7 +2145,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},លំដាប់លក់ {0} គឺ {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),ពន្យារពេលក្នុងការទូទាត់ (ថ្ងៃ)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,បញ្ចូលព័ត៌មានលម្អិតរំលោះ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO អតិថិជន
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,កាលបរិច្ឆេទដឹកជញ្ជូនដែលរំពឹងទុកគួរតែនៅក្រោយកាលបរិច្ឆេទបញ្ជាទិញ
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,បរិមាណវត្ថុមិនអាចជាសូន្យទេ
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,គុណលក្ខណៈមិនត្រឹមត្រូវ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},សូមជ្រើសរើស BOM ប្រឆាំងនឹងធាតុ {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ប្រភេទវិក្កយបត្រ
@@ -2143,6 +2157,7 @@
 DocType: Volunteer,Afternoon,ពេលរសៀល
 DocType: Vital Signs,Nutrition Values,តម្លៃអាហារូបត្ថម្ភ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),វត្តមាននៃជំងឺគ្រុនក្តៅ (temp&gt; 38.5 ° C / 101.3 ° F ឬមានរយះពេលយូរ&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC បញ្ច្រាស
 DocType: Project,Collect Progress,ប្រមូលដំណើរការ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ថាមពល
@@ -2193,6 +2208,7 @@
 ,Ordered Items To Be Billed,ធាតុដែលបានបញ្ជាទិញត្រូវបានចេញវិក្កយបត្រ
 DocType: Taxable Salary Slab,To Amount,ចំនួនទឹកប្រាក់
 DocType: Purchase Invoice,Is Return (Debit Note),គឺជាការវិលមកវិញ (កំណត់សំគាល់ឥណពន្ធ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 apps/erpnext/erpnext/config/desktop.py,Getting Started,ចាប់ផ្តើម
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,បញ្ចូលចូលគ្នា
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,មិនអាចផ្លាស់ប្តូរកាលបរិច្ឆេទចាប់ផ្តើមឆ្នាំសារពើពន្ធនិងកាលបរិច្ឆេទបញ្ចប់នៃសារពើពន្ធនៅពេលដែលឆ្នាំសារពើពន្ធត្រូវបានរក្សាទុក។
@@ -2211,8 +2227,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},កាលបរិច្ឆេទនៃការរៀបចំថែរក្សាមិនអាចនៅមុនកាលបរិច្ឆេទចែកចាយសម្រាប់ស៊េរីលេខ {0} ទេ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,ជួរដេក {0}: អត្រាប្តូរប្រាក់គឺចាំបាច់
 DocType: Purchase Invoice,Select Supplier Address,ជ្រើសរើសអាស័យដ្ឋានអ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",មានបរិមាណគឺ {0} អ្នកត្រូវការ {1}
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,សូមបញ្ចូលសម្ងាត់អ្នកប្រើ API
 DocType: Program Enrollment Fee,Program Enrollment Fee,តម្លៃចុះឈ្មោះចូលរៀន
+DocType: Employee Checkin,Shift Actual End,ប្ដូរចុងក្រោយពិតប្រាកដ
 DocType: Serial No,Warranty Expiry Date,កាលបរិច្ឆេទផុតកំណត់នៃការធានា
 DocType: Hotel Room Pricing,Hotel Room Pricing,តម្លៃបន្ទប់សណ្ឋាគារ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted",ការផ្គត់ផ្គង់ជាប់ពន្ធខាងក្រៅ (លើសពីតម្លៃសូន្យដែលត្រូវបានវាយតម្លៃនិងត្រូវបានលើកលែង
@@ -2272,6 +2290,7 @@
 DocType: Quality Inspection Reading,Reading 5,ការអាន 5
 DocType: Shopping Cart Settings,Display Settings,បង្ហាញការកំណត់
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,សូមកំណត់ចំនួនប័ណ្ណបោះឆ្នោតដែលបានកក់
+DocType: Shift Type,Consequence after,ផលវិបាកបន្ទាប់ពី
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,តើអ្នកត្រូវការជំនួយអ្វីខ្លះ?
 DocType: Journal Entry,Printing Settings,ការកំណត់ការបោះពុម្ព
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ធនាគារ
@@ -2281,6 +2300,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,អាសយដ្ឋានចេញវិក្កយបត្រគឺដូចគ្នានឹងអាសយដ្ឋានដឹកជញ្ជូនដែរ
 DocType: Account,Cash,សាច់ប្រាក់
 DocType: Employee,Leave Policy,ចាកចេញពីគោលនយោបាយ
+DocType: Shift Type,Consequence,ផលវិបាក
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,អាសយដ្ឋានរបស់សិស្ស
 DocType: GST Account,CESS Account,គណនី CESS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: មជ្ឈមណ្ឌលចំណាយត្រូវបានទាមទារសម្រាប់គណនី &quot;ចំណេញនិងការបាត់បង់&quot; {2} ។ សូមបង្កើតមជ្ឈមណ្ឌលតម្លៃលំនាំដើមសម្រាប់ក្រុមហ៊ុន។
@@ -2345,6 +2365,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,រយៈពេលបិទវិញ្ញាបនបត្រ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,ឈ្មោះ Guardian2
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,សូមបញ្ចូលគណនីចំណាយ
+DocType: Issue,Resolution By Variance,គុណភាពបង្ហាញដោយវ៉ារ្យង់
 DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលាលែងពីតំណែង
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,វត្តមានដល់កាលបរិច្ឆេត
@@ -2357,6 +2378,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,មើលឥឡូវ
 DocType: Item Price,Valid Upto,មានសុពលភាពរហូតដល់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},យោង Doctype ត្រូវតែជាផ្នែកមួយនៃ {0}
+DocType: Employee Checkin,Skip Auto Attendance,រំលងការចូលរួមស្វ័យប្រវត្តិ
 DocType: Payment Request,Transaction Currency,រូបិយប័ណ្ណប្រតិបត្តិការ
 DocType: Loan,Repayment Schedule,កាលវិភាគសងប្រាក់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,បង្កើតគំរូរក្សាធាតុគំរូ
@@ -2428,6 +2450,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,កាតបិទបាំងប័ណ្ណ POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,សកម្មភាពត្រូវបានចាប់ផ្ដើម
 DocType: POS Profile,Applicable for Users,អាចប្រើបានសម្រាប់អ្នកប្រើប្រាស់
+,Delayed Order Report,របាយការណ៍បញ្ជាទិញដែលពន្យារពេល
 DocType: Training Event,Exam,ការប្រឡង
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,រកមិនឃើញធាតុបញ្ចូលទូទៅនៃសៀវភៅបញ្ជី។ អ្នកប្រហែលជាបានជ្រើសរើសគណនីខុសនៅក្នុងប្រតិបត្តិការ។
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,ការលក់បំពង់បង្ហូរ
@@ -2442,10 +2465,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,លក្ខខណ្ឌនឹងត្រូវបានអនុវត្តនៅលើធាតុទាំងអស់ដែលបានជ្រើសរួមបញ្ចូលគ្នា។
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,កំណត់រចនាសម្ព័ន្ធ
 DocType: Hotel Room,Capacity,សមត្ថភាព
+DocType: Employee Checkin,Shift End,ប្ដូរ (Shift End)
 DocType: Installation Note Item,Installed Qty,បានដំឡើង Qty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,បាច់ {0} នៃធាតុ {1} ត្រូវបានបិទ។
 DocType: Hotel Room Reservation,Hotel Reservation User,អ្នកកក់សណ្ឋាគារ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,ថ្ងៃធ្វើការត្រូវបានធ្វើម្តងទៀតពីរដង
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,កិច្ចព្រមព្រៀងកម្រិតសេវាកម្មជាមួយប្រភេទធាតុ {0} និង Entity {1} មានរួចហើយ។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},ក្រុមធាតុដែលមិនបានរៀបរាប់នៅក្នុងធាតុមេសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},ឈ្មោះកំហុស: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,ដែនដីត្រូវបានទាមទារនៅក្នុងពត៌មាន POS
@@ -2493,6 +2517,7 @@
 DocType: Depreciation Schedule,Schedule Date,កាលវិភាគកាលបរិច្ឆេទ
 DocType: Packing Slip,Package Weight Details,ព័ត៌មានលម្អិតអំពីទំងន់កញ្ចប់
 DocType: Job Applicant,Job Opening,បើកការងារ
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,បានធ្វើសមកាលកម្មចុងក្រោយនៃការចុះឈ្មោះនិយោជិត។ កំណត់វាឡើងវិញបើអ្នកប្រាកដថាកំណត់ហេតុទាំងអស់ត្រូវបានធ្វើសមកាលកម្មពីគ្រប់ទីតាំង។ សូមកុំកែប្រែវាប្រសិនបើអ្នកមិនប្រាកដ។
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,តម្លៃជាក់ស្តែង
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ប្រាក់ចំណូលសរុប ({0}) ប្រឆាំងនឹងលំដាប់ {1} មិនអាចធំជាង Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,វ៉ារ្យ៉ង់ធាតុត្រូវបានធ្វើបច្ចុប្បន្នភាព
@@ -2537,6 +2562,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,ទទួលបានការញុះញង់
 DocType: Tally Migration,Is Day Book Data Imported,ទិន្នន័យសៀវភៅថ្ងៃបាននាំចូល
 ,Sales Partners Commission,គណៈកម្មការលក់ដៃគូ
+DocType: Shift Type,Enable Different Consequence for Early Exit,អនុញ្ញាតឱ្យមានផលវិបាកផ្សេងៗសម្រាប់ការចេញដំណើរដំបូង
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,ច្បាប់
 DocType: Loan Application,Required by Date,ទាមទារដោយកាលបរិច្ឆេទ
 DocType: Quiz Result,Quiz Result,លទ្ធផលសំណួរ
@@ -2596,7 +2622,6 @@
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},បញ្ជីថ្ងៃឈប់សម្រាកដែលមិនកំណត់សម្រាប់រយៈពេលឈប់សម្រាក {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,សូមកំណត់វាលលេខសម្គាល់អ្នកប្រើនៅក្នុងកំណត់ត្រានិយោជិកដើម្បីកំណត់តួនាទីនិយោជិក
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,ពេលវេលាដើម្បីដោះស្រាយ
 DocType: Training Event,Training Event,ព្រឹត្តិការណ៍បណ្តុះបណ្តាល
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",សម្ពាធឈាមធម្មតាក្នុងមនុស្សពេញវ័យគឺប្រហែល 120 មីលីលីត្រស៊ីហ្គ្យូមនិង 80 មីលីមេសអេដប៊ីលីក្រាមអក្សរកាត់ &quot;120/80 មមអេហជី&quot;
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,ប្រព័ន្ធនឹងប្រមូលធាតុទាំងអស់ប្រសិនបើតម្លៃកំណត់គឺសូន្យ។
@@ -2640,6 +2665,7 @@
 DocType: Student Applicant,Approved,បានអនុម័ត
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},ចាប់ពីកាលបរិច្ឆេទត្រូវស្ថិតនៅក្នុងឆ្នាំសារពើពន្ធ។ សន្មត់ពីកាលបរិច្ឆេទ = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,សូមកំណត់ក្រុមអ្នកផ្គត់ផ្គង់ក្នុងការទិញការកំណត់។
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} គឺជាស្ថានភាពវត្តមានមិនត្រឹមត្រូវ។
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,គណនីបើកបណ្តោះអាសន្ន
 DocType: Purchase Invoice,Cash/Bank Account,សាច់ប្រាក់ / គណនីធនាគារ
 DocType: Quality Meeting Table,Quality Meeting Table,តារាងកិច្ចប្រជុំប្រកបដោយគុណភាព
@@ -2675,6 +2701,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",ម្ហូបអាហារភេសជ្ជៈនិងថ្នាំជក់
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,កាលវិភាគវគ្គសិក្សា
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ធាតុលម្អិតស្តីពីពន្ធប្រាជ្ញា
+DocType: Shift Type,Attendance will be marked automatically only after this date.,ការចូលរួមនឹងត្រូវបានសម្គាល់ដោយស្វ័យប្រវត្តិបន្ទាប់ពីកាលបរិច្ឆេទនេះ។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,ការផ្គត់ផ្គង់ដល់អ្នកកាន់ UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,សំណើសុំសម្រង់
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,រូបិយប័ណ្ណមិនអាចត្រូវបានផ្លាស់ប្តូរទេបន្ទាប់ពីធ្វើធាតុដោយប្រើរូបិយប័ណ្ណផ្សេង
@@ -2723,7 +2750,6 @@
 DocType: Item,Is Item from Hub,គឺជាធាតុពី Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,នីតិវិធីគុណភាព។
 DocType: Share Balance,No of Shares,ចំនួនភាគហ៊ុន
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅពេលប្រកាសនៃធាតុ ({2} {3})
 DocType: Quality Action,Preventive,ការការពារ
 DocType: Support Settings,Forum URL,URL វេទិកា
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,និយោជិកនិងវត្តមាន
@@ -2945,7 +2971,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,ពន្ធនិងការគិតថ្លៃលំនាំដើម
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,នេះគឺផ្អែកទៅលើប្រតិបត្តិការជាមួយអ្នកផ្គត់ផ្គង់នេះ។ សូមមើលតារាងពេលវេលាខាងក្រោមសម្រាប់ព័ត៌មានលំអិត
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,បញ្ចូលកាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់សម្រាប់កិច្ចព្រមព្រៀង។
 DocType: Delivery Note Item,Against Sales Invoice,ប្រឆាំងនឹងវិក័យប័ត្រលក់
 DocType: Loyalty Point Entry,Purchase Amount,បរិមាណទិញ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,មិនអាចកំណត់ថាបានបាត់បង់ដូចលំដាប់បញ្ជាទំនិញ។
@@ -2969,7 +2994,7 @@
 DocType: Lead,Organization Name,ឈ្មោះអង្គការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,សុពលភាពពីវាលដែលមានសុពលភាពនិងមានសុពលភាពគឺចាំបាច់សម្រាប់ការតម្លើង
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់លេខត្រូវតែដូចគ្នានឹង {1} {2}
-DocType: Employee,Leave Details,ទុកសេចក្ដីលម្អិត
+DocType: Employee Checkin,Shift Start,ចាប់ផ្តើមប្ដូរ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,ប្រតិបត្តិការភាគហ៊ុនមុន {0} ត្រជាក់
 DocType: Driver,Issuing Date,កាលបរិច្ឆេទចេញ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,អ្នកស្នើសុំ
@@ -3014,9 +3039,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ពត៌មានលំអិតគំរូលំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,ការជ្រើសរើសនិងបណ្តុះបណ្តាល
 DocType: Drug Prescription,Interval UOM,ចន្លោះពេលវេលា UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,ការកំណត់ពេលវេលាព្រះគុណសម្រាប់ការចូលរួមដោយស្វ័យប្រវត្តិ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ពីរូបិយប័ណ្ណនិងរូបិយប័ណ្ណមិនអាចដូចគ្នាទេ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,ឱសថ
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,ការគាំទ្រម៉ោង
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} ត្រូវបានលុបចោលឬបិទ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ការចំណាយលើអតិថិជនត្រូវតែជាឥណទាន
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),ក្រុមដោយប័ណ្ណ (រួម)
@@ -3126,6 +3153,7 @@
 DocType: Territory,Territory Manager,អ្នកគ្រប់គ្រងដែនដី
 DocType: Lab Test,Sample ID,លេខសម្គាល់គំរូ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,កោធន៍ទទេ
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,ការចូលរួមត្រូវបានសម្គាល់ដោយបុគ្គលិកពិនិត្យចូល
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,ត្រូវតែដាក់បញ្ចូលទ្រព្យសម្បត្តិ {0}
 ,Absent Student Report,របាយការណ៍សិស្សអវត្តមាន
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,បានរួមបញ្ចូលនៅក្នុងប្រាក់ចំណេញសុទ្ធ
@@ -3133,7 +3161,9 @@
 DocType: Travel Request Costing,Funded Amount,ចំនួនទឹកប្រាក់ដែលបានផ្តល់មូលនិធិ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} មិនត្រូវបានដាក់ស្នើដូច្នេះសកម្មភាពនេះមិនអាចបញ្ចប់បានទេ
 DocType: Subscription,Trial Period End Date,កាលបរិច្ឆេទបញ្ចប់សវនាការ
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,ធាតុជំនួសគឺ IN និង OUT ក្នុងអំឡុងពេលដូចគ្នា
 DocType: BOM Update Tool,The new BOM after replacement,BOM ថ្មីបន្ទាប់ពីការជំនួស
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,ធាតុទី 5
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,បើកបណ្តោះអាសន្ន
@@ -3249,6 +3279,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,អ្នកផ្គត់ផ្គង់ដែលអាចធ្វើបាន
 ,Issued Items Against Work Order,ចេញនូវវត្ថុប្រឆាំងនឹងការងារ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,បង្កើត {0} វិក័យប័ត្រ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះគ្រូបង្រៀននៅក្នុងការអប់រំ&gt; ការកំណត់អប់រំ
 DocType: Student,Joining Date,ចូលរួមកាលបរិច្ឆេទ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,ស្នើសុំតំបន់
 DocType: Purchase Invoice,Against Expense Account,ប្រឆាំងនឹងគណនីចំណាយ
@@ -3288,6 +3319,7 @@
 DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់
 ,Point of Sale,ចំនុចនៃការលក់
 DocType: Authorization Rule,Approving User  (above authorized value),ការអនុម័តអ្នកប្រើប្រាស់ (ខាងលើតម្លៃដែលបានអនុញ្ញាត)
+DocType: Service Level Agreement,Entity,អង្គភាព
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជាកម្មសិទ្ធិរបស់គម្រោង {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,ពីឈ្មោះគណបក្ស
@@ -3334,6 +3366,7 @@
 DocType: Soil Texture,Sand Composition (%),សមាសធាតុខ្សាច់ (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP -YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,នាំចូលទិន្នន័យសៀវភៅថ្ងៃ
+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
 DocType: Asset,Asset Owner Company,ក្រុមហ៊ុនទ្រព្យសកម្ម
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,មជ្ឈមណ្ឌលចំណាយត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងចំណាយ
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} សៀរៀលត្រឹមត្រូវសម្រាប់ធាតុ {1}
@@ -3394,7 +3427,6 @@
 DocType: Asset,Asset Owner,ម្ចាស់ទ្រព្យ
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},ឃ្លាំងគឺចាំបាច់សម្រាប់ធាតុហ៊ុន {0} នៅក្នុងជួរដេក {1}
 DocType: Stock Entry,Total Additional Costs,ចំណាយបន្ថែមសរុប
-DocType: Marketplace Settings,Last Sync On,ធ្វើសមកាលកម្មចុងក្រោយ
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,សូមកំណត់យ៉ាងហោចណាស់មួយជួរនៅក្នុងតារាងពន្ធនិងការចោទប្រកាន់
 DocType: Asset Maintenance Team,Maintenance Team Name,ឈ្មោះក្រុមថែទាំ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,តារាងនៃមជ្ឈមណ្ឌលចំណាយ
@@ -3410,12 +3442,12 @@
 DocType: Job Card,WIP Warehouse,ឃ្លាំង WIP
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-yYYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},លេខសម្គាល់អ្នកប្រើមិនបានកំណត់សម្រាប់និយោជិក {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}",មាន qty គឺ {0} អ្នកត្រូវការ {1}
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,បានបង្កើត {0} អ្នកប្រើ
 DocType: Stock Settings,Item Naming By,ធាតុដាក់ឈ្មោះតាម
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,បញ្ជា
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,នេះជាក្រុមអតិថិជន root ហើយមិនអាចកែប្រែបានទេ។
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,សំណើសម្ភារៈ {0} ត្រូវបានលុបចោលឬបញ្ឈប់
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,ផ្អែកយ៉ាងតឹងរ៉ឹងលើប្រភេទកំណត់ហេតុក្នុងការពិនិត្យបុគ្គលិក
 DocType: Purchase Order Item Supplied,Supplied Qty,បានផ្គត់ផ្គង់ Qty
 DocType: Cash Flow Mapper,Cash Flow Mapper,ឧបករណ៍ពិនិត្យលំហូរសាច់ប្រាក់
 DocType: Soil Texture,Sand,ខ្សាច់
@@ -3474,6 +3506,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,ស្ទួនក្រុមធាតុដែលរកឃើញក្នុងតារាងក្រុមធាតុ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,ប្រាក់ខែប្រចាំឆ្នាំ
 DocType: Supplier Scorecard,Weighting Function,មុខងារថ្លឹង
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,កំហុសក្នុងការវាយតម្លៃរូបមន្តលក្ខណៈវិនិច្ឆ័យ
 ,Lab Test Report,របាយការណ៍តេស្តមន្ទីរពិសោធន៍
 DocType: BOM,With Operations,ជាមួយប្រតិបត្តិការ
@@ -3487,6 +3520,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,គ្មានការទូទាត់សងសម្រាប់ធាតុទិនានុប្បវត្តិទេ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} គឺជាសិស្សអសកម្ម
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ធ្វើឱ្យធាតុបញ្ចូល
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},ការហៅតាមលេខសម្គាល់: {0} មិនអាចជាមេឬកូននៃ {1}
 DocType: Employee Onboarding,Activities,សកម្មភាព
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,មានឃ្លាំងមួយយ៉ាងហោចណាស់ចាំបាច់
 ,Customer Credit Balance,តុល្យភាពឥណទានអតិថិជន
@@ -3499,9 +3533,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,កម្មវិធីភក្តីភាពជាច្រើនបានរកឃើញសំរាប់អតិថិជន។ សូមជ្រើសរើសដោយដៃ។
 DocType: Patient,Medication,ថ្នាំ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,ជ្រើសកម្មវិធីភក្ដីភាព
+DocType: Employee Checkin,Attendance Marked,វត្តមានត្រូវបានសម្គាល់
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,វត្ថុធាតុដើម
 DocType: Sales Order,Fully Billed,បានចេញវិក្កយបត្រពេញលេញ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},សូមកំណត់តម្លៃបន្ទប់សណ្ឋាគារលើ {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,ជ្រើសតែអាទិភាពមួយជាលំនាំដើម។
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},សូមកំណត់អត្តសញ្ញាណឬបង្កើតគណនី (Ledger) សម្រាប់ប្រភេទ - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,ចំនួនទឹកប្រាក់ឥណទាន / ឥណពន្ធសរុបគួរតែដូចគ្នានឹងតំណភ្ជាប់ធាតុទិនានុប្បវត្តិ
 DocType: Purchase Invoice Item,Is Fixed Asset,គឺជាទ្រព្យមានតម្លៃ
@@ -3522,6 +3558,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,ការបញ្ជាក់អំពីការណាត់ជួប
 DocType: Shopping Cart Settings,Orders,ការបញ្ជាទិញ
 DocType: HR Settings,Retirement Age,អាយុចូលនិវត្តន៍
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈ Setup&gt; Serial Number
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,គិតជាចំនួន
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ការលុបមិនត្រូវបានអនុញ្ញាតសម្រាប់ប្រទេស {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសម្បត្តិ {1} មានរួចហើយ {2}
@@ -3605,11 +3642,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,គណនេយ្យ
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},ប័ណ្ណទូទាត់វិក្កយបត្របូកនឹងមាន {0} រវាងកាលបរិច្ឆេទ {1} និង {2}
 apps/erpnext/erpnext/config/help.py,Navigating,កំពុងរុករក
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,គ្មានវិក័យប័ត្រដែលមិនទាន់ទូទាត់ត្រូវការការវាយតម្លៃអត្រាប្តូរប្រាក់
 DocType: Authorization Rule,Customer / Item Name,ឈ្មោះអតិថិជន / ឈ្មោះ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,លេខស៊េរីថ្មីមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែកំណត់តាមធាតុចូលឬបង្កាន់ដៃទិញ
 DocType: Issue,Via Customer Portal,តាមរយៈវិបផតថលរបស់អតិថិជន
 DocType: Work Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្តើមដែលបានគ្រោងទុក
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} គឺ {2}
+DocType: Service Level Priority,Service Level Priority,អាទិភាពកម្រិតសេវា
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃកម្រើកចំណូលដែលបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃកម្រៃ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,ចែករំលែក Ledger
 DocType: Journal Entry,Accounts Payable,គណនីត្រូវបង់
@@ -3720,7 +3759,6 @@
 DocType: Delivery Note,Delivery To,បញ្ជូនទៅ
 DocType: Bank Statement Transaction Settings Item,Bank Data,ទិន្នន័យធនាគារ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,គ្រោងទុករហូតដល់
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,ថែរក្សាម៉ោងទូទាត់និងម៉ោងធ្វើការដូចទៅនឹងតារាងពេលវេលា
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,បទដឹកនាំដោយប្រភពនាំមុខ។
 DocType: Clinical Procedure,Nursing User,អ្នកប្រើថែទាំ
 DocType: Support Settings,Response Key List,បញ្ជីគន្លឹះឆ្លើយតប
@@ -3888,6 +3926,7 @@
 DocType: Work Order Operation,Actual Start Time,ម៉ោងចាប់ផ្ដើមពិតប្រាកដ
 DocType: Antibiotic,Laboratory User,អ្នកប្រើមន្ទីរពិសោធន៍
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,ការដេញថ្លៃលើបណ្តាញ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,អាទិភាព {0} ត្រូវបានធ្វើម្តងទៀត។
 DocType: Fee Schedule,Fee Creation Status,ស្ថានភាពថ្លៃសេវា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,កម្មវិធី
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,ការបញ្ជាទិញដើម្បីទូទាត់
@@ -3954,6 +3993,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,មិនអាចរកបានព័ត៌មានសម្រាប់ {0} ។
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើនឹងរូបិយប័ណ្ណឬរូបិយប័ណ្ណគណនីរបស់ភាគីដើម
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,សូមបញ្ចូលលេខសំគាល់បុគ្គលិកនៃអ្នកលក់នេះ
+DocType: Shift Type,Early Exit Consequence after,លទ្ធផលចេញពីដំណាក់កាលដំបូង
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,បង្កើតការបើកនិងការទិញវិក្កយបត្រ
 DocType: Disease,Treatment Period,រយៈពេលព្យាបាល
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ការបង្កើតអ៊ីម៉ែល
@@ -3971,7 +4011,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,ឈ្មោះរបស់សិស្ស:
 DocType: SMS Log,Sent On,បានបញ្ជូន
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,វិក័យប័ត្រលក់
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,ពេលវេលាឆ្លើយតបមិនអាចធំជាងពេលវេលាដោះស្រាយទេ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",សម្រាប់ក្រុមនិស្សិតតាមវគ្គសិក្សាវគ្គសិក្សានឹងត្រូវបានផ្តល់សុពលភាពសម្រាប់សិស្សគ្រប់រូបពីវគ្គសិក្សាចុះឈ្មោះចូលរៀន។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,ការផ្គត់ផ្គង់នៅក្នុងរដ្ឋ
 DocType: Employee,Create User Permission,បង្កើតសិទ្ធិអ្នកប្រើ
@@ -4010,6 +4049,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,លក្ខខណ្ឌកិច្ចសន្យាស្តង់ដារសម្រាប់ការលក់ឬការទិញ។
 DocType: Sales Invoice,Customer PO Details,ពត៌មានលម្អិតអតិថិជន
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,រកមិនឃើញអ្នកជម្ងឺ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,ជ្រើសអាទិភាពលំនាំដើម។
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,យកធាតុចេញប្រសិនបើការគិតប្រាក់មិនអនុវត្តចំពោះធាតុនោះ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ក្រុមអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះអតិថិជនឬប្តូរឈ្មោះក្រុមអតិថិជន
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4049,6 +4089,7 @@
 DocType: Support Settings,Support Portal,ការគាំទ្រវិបផតថល
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,កាលបរិច្ឆេទបញ្ចប់នៃកិច្ចការ <b>{0}</b> មិនអាចតិចជាង <b>{1}</b> កាលបរិច្ឆេទចាប់ផ្ដើមដែលរំពឹងទុក <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},និយោជិក {0} បានបើកទុកនៅលើ {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},កិច្ចព្រមព្រៀងកម្រិតសេវានេះគឺជាក់លាក់ចំពោះអតិថិជន {0}
 DocType: Employee,Held On,បានប្រារព្ធឡើង
 DocType: Healthcare Practitioner,Practitioner Schedules,កាលវិភាគកម្មវិធី
 DocType: Project Template Task,Begin On (Days),ចាប់ផ្ដើមថ្ងៃ (ថ្ងៃ)
@@ -4056,6 +4097,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},លំដាប់ការងារត្រូវបានគេ {0}
 DocType: Inpatient Record,Admission Schedule Date,កាលបរិច្ឆេទចូលរៀន
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,ការលៃតម្រូវតម្លៃទ្រព្យសម្បត្តិ
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Mark ចូលរៀនដោយផ្អែកលើ &#39;Employee Checkin&#39; សម្រាប់និយោជិតដែលបានចាត់តាំងអោយធ្វើការផ្លាស់ប្តូរនេះ។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,ការផ្គត់ផ្គង់ដល់អ្នកដែលមិនបានចុះបញ្ជី
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,ការងារទាំងអស់
 DocType: Appointment Type,Appointment Type,ប្រភេទការតែងតាំង
@@ -4169,7 +4211,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាទម្ងន់សុទ្ធ + ទំងន់សម្ភារៈវេចខ្ចប់។ (សម្រាប់ការបោះពុម្ព)
 DocType: Plant Analysis,Laboratory Testing Datetime,ការធ្វើតេស្តមន្ទីរពិសោធន៍រយៈពេល
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,ធាតុ {0} មិនអាចមានបំណះ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,ការលក់បំពង់បង្ហូរប្រេងតាមដំណាក់កាល
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,កម្លាំងសិស្សក្រុម
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,របាយការណ៍ប្រតិបត្តិការធនាគារ
 DocType: Purchase Order,Get Items from Open Material Requests,ទទួលយកធាតុពីសំណើសម្ភារៈបើកចំហ
@@ -4251,7 +4292,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,បង្ហាញឃ្លាំងចាស់ - ឆ្លាត
 DocType: Sales Invoice,Write Off Outstanding Amount,សរសេរបរិមាណឆ្នើម
 DocType: Payroll Entry,Employee Details,ព័ត៌មានលំអិតពីនិយោជិក
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,ម៉ោងចាប់ផ្ដើមមិនអាចធំជាងពេលវេលាបញ្ចប់សម្រាប់ {0} ។
 DocType: Pricing Rule,Discount Amount,ចំនួនបញ្ចុះតម្លៃ
 DocType: Healthcare Service Unit Type,Item Details,ព័ត៌មានលម្អិតអំពីទំនិញ
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},សេចក្តីប្រកាសពន្ធដែលស្ទួនពី {0} សម្រាប់រយៈពេល {1}
@@ -4304,7 +4344,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,ប្រាក់ខែសុទ្ធមិនអាចជាអវិជ្ជមានទេ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,លេខនៃអន្តរកម្ម
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},ជួរដេក {0} ធាតុ # 1 {1} មិនអាចត្រូវបានផ្ទេរច្រើនជាង {2} ទល់នឹងបញ្ជាទិញ {3} ទេ
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,ប្ដូរ
+DocType: Attendance,Shift,ប្ដូរ
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,ដំណើរការប្លង់គណនេយ្យនិងភាគី
 DocType: Stock Settings,Convert Item Description to Clean HTML,បម្លែងពិពណ៌នាធាតុទៅស្អាត HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,ក្រុមអ្នកផ្គត់ផ្គង់ទាំងអស់
@@ -4375,6 +4415,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,អង្គភាពសេវាមាតាឬបិតា
 DocType: Sales Invoice,Include Payment (POS),រួមបញ្ចូលការបង់ប្រាក់ (ម៉ាស៊ីនឆូតកាត)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,សមធម៌ឯកជន
+DocType: Shift Type,First Check-in and Last Check-out,ពិនិត្យមុននិងពិនិត្យចុងក្រោយ
 DocType: Landed Cost Item,Receipt Document,ឯកសារបង្កាន់ដៃ
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,រយៈពេលនៃតារាងពិន្ទុអ្នកផ្គត់ផ្គង់
 DocType: Employee Grade,Default Salary Structure,រចនាសម្ព័ន្ធប្រាក់ខែលំនាំដើម
@@ -4457,6 +4498,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,បង្កើតលំដាប់ទិញ
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,កំណត់ថវិកាសម្រាប់ឆ្នាំហិរញ្ញវត្ថុ។
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេបានទេ។
+DocType: Employee Checkin,Entry Grace Period Consequence,ពេលវេលាចូលនិវត្តន៍
 ,Payment Period Based On Invoice Date,រយៈពេលបង់ប្រាក់ដោយផ្អែកលើកាលបរិច្ឆេទវិក្កយបត្រ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},កាលបរិច្ឆេទដំឡើងមិនអាចនៅមុនកាលបរិវិស័យសម្រាប់ធាតុ {0} ទេ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,ភ្ជាប់ទៅសំណើសម្ភារៈ
@@ -4465,6 +4507,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុតម្រៀបមានរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,កាលបរិច្ឆេទឯកសារ
 DocType: Monthly Distribution,Distribution Name,ឈ្មោះចែកចាយ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,ថ្ងៃធ្វើការ {0} ត្រូវបានធ្វើម្តងទៀត។
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,ក្រុមទៅក្រុមមិនមែន
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,កំពុងធ្វើបច្ចុប្បន្នភាព។ វាអាចចំណាយពេលបន្តិច។
 DocType: Item,"Example: ABCD.#####
@@ -4477,6 +4520,7 @@
 DocType: Vehicle Log,Fuel Qty,ប្រេងឥន្ធនៈ Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,អាណាព្យាបាល 1 ទូរស័ព្ទដៃលេខ
 DocType: Invoice Discounting,Disbursed,ការចំណាយ
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,ពេលវេលាបន្ទាប់ពីការបញ្ចប់ការផ្លាស់ប្តូរក្នុងកំឡុងពេលពិនិត្យចេញត្រូវបានចាត់ទុកថាចូលរួម។
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,ការផ្លាស់ប្តូរគណនីត្រូវបង់
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,មិនអាច
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,ក្រៅម៉ោង
@@ -4490,7 +4534,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,បង្ហាញ PDC នៅក្នុងការបោះពុម្ព
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,ទិញទំនិញអ្នកទិញ
 DocType: POS Profile User,POS Profile User,អ្នកប្រើប្រាស់បណ្តាញ POS
-DocType: Student,Middle Name,ជាឈ្មោះកណ្តាល
 DocType: Sales Person,Sales Person Name,ឈ្មោះអ្នកលក់
 DocType: Packing Slip,Gross Weight,ទំងន់សរុប
 DocType: Journal Entry,Bill No,លេខវិក្កយបត្រ
@@ -4499,7 +4542,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG -YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,កិច្ចព្រមព្រៀងកម្រិតសេវា
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,សូមជ្រើសរើសបុគ្គលិកនិងកាលបរិច្ឆេទជាមុន
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,អត្រាតម្លៃវត្ថុត្រូវបានគណនាឡើងវិញដោយពិចារណាលើចំនួនទឹកប្រាក់នៃប័ណ្ណបញ្ចុះតម្លៃ
 DocType: Timesheet,Employee Detail,ពត៌មានលំអិតបុគ្គលិក
 DocType: Tally Migration,Vouchers,ប័ណ្ណទូទាត់
@@ -4534,7 +4576,7 @@
 DocType: Additional Salary,Date on which this component is applied,កាលបរិច្ឆេទដែលសមាសភាគនេះត្រូវបានអនុវត្ត
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,បញ្ជីឈ្មោះម្ចាស់ភាគហ៊ុនដែលមានលេខទូរស័ព្ទ
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,រៀបចំគណនី Gateway ។
-DocType: Service Level,Response Time Period,កំឡុងពេលឆ្លើយតប
+DocType: Service Level Priority,Response Time Period,កំឡុងពេលឆ្លើយតប
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
 DocType: Course Activity,Activity Date,កាលបរិច្ឆេទសកម្មភាព
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
@@ -4559,6 +4601,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,ឆ្នាំហិរញ្ញវត្ថុ
 DocType: Sales Invoice Item,Deferred Revenue,ចំណូលដែលពន្យាពេល
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,ត្រូវតែជ្រើសរើសមួយក្នុងចំណោមការលក់ឬការទិញ
+DocType: Shift Type,Working Hours Threshold for Half Day,ចំនួនម៉ោងធ្វើការរយៈពេលពាក់កណ្ដាល
 ,Item-wise Purchase History,ប្រវត្តិទិញទំនិញ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},មិនអាចប្តូរកាលបរិច្ឆេទបញ្ឈប់សេវាកម្មសម្រាប់ធាតុក្នុងជួរដេក {0}
 DocType: Production Plan,Include Subcontracted Items,រួមបញ្ចូលធាតុដែលបានបន្តកិច្ចសន្យា
@@ -4591,6 +4634,7 @@
 DocType: BOM,Allow Same Item Multiple Times,អនុញ្ញាតធាតុដូចគ្នាច្រើនដង
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,បង្កើត BOM
 DocType: Healthcare Practitioner,Charges,ការចោទប្រកាន់
+DocType: Employee,Attendance and Leave Details,ព័ត៌មានលំអិតពីការចូលរួមនិងការចាកចេញ
 DocType: Student,Personal Details,ព័ត៌មានផ្ទាល់ខ្លួន
 DocType: Sales Order,Billing and Delivery Status,ស្ថានភាពវិក្កយបត្រនិងដឹកជញ្ជូន
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,ជួរដេក {0}: សំរាប់អាសយដ្ឋានផ្គត់ផ្គង់ {0} អាស័យដ្ឋានអ៊ីម៉ែលត្រូវបានទាមទារដើម្បីផ្ញើអ៊ីម៉ែល
@@ -4642,7 +4686,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},បញ្ចូលតម្លៃ betweeen {0} និង {1}
 DocType: Purchase Order,Order Confirmation Date,កាលបរិច្ឆេទបញ្ជាក់ការបញ្ជាទិញ
 DocType: Delivery Trip,Calculate Estimated Arrival Times,គណនាពេលវេលាមកដល់ប៉ាន់ស្មាន
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះនិយោជិកនៅក្នុងធនធានមនុស្ស&gt; ការកំណត់ធនធានមនុស្ស
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ប្រើប្រាស់
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS -YYYY.-
 DocType: Subscription,Subscription Start Date,កាលបរិច្ឆេទចាប់ផ្តើមការជាវប្រចាំ
@@ -4665,7 +4708,7 @@
 DocType: Journal Entry Account,Journal Entry Account,គណនីធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,វ៉ារ្យង់
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,សកម្មភាពវេទិកា
-DocType: Service Level,Resolution Time Period,រយៈពេលនៃដំណោះស្រាយ
+DocType: Service Level Priority,Resolution Time Period,រយៈពេលនៃដំណោះស្រាយ
 DocType: Request for Quotation,Supplier Detail,ព័ត៌មានលម្អិតអ្នកផ្គត់ផ្គង់
 DocType: Project Task,View Task,មើលភារកិច្ច
 DocType: Serial No,Purchase / Manufacture Details,ព័ត៌មានលម្អិតទិញ / ផលិត
@@ -4732,6 +4775,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំងអាចត្រូវបានផ្លាស់ប្តូរតែតាមរយៈធាតុចូលទំនិញ / លិខិតប្រគល់ទំនិញ / វិក័យប័ត្រទិញប៉ុណ្ណោះ
 DocType: Support Settings,Close Issue After Days,បិទបញ្ហាបន្ទាប់ពីថ្ងៃ
 DocType: Payment Schedule,Payment Schedule,កាលវិភាគទូទាត់
+DocType: Shift Type,Enable Entry Grace Period,បើកដំណើរការពេលវេលាអនុគ្រោះ
 DocType: Patient Relation,Spouse,ប្តីប្រពន្ធ
 DocType: Purchase Invoice,Reason For Putting On Hold,ហេតុផលសម្រាប់ដាក់នៅរង់ចាំ
 DocType: Item Attribute,Increment,ការកើនឡើង
@@ -4871,6 +4915,7 @@
 DocType: Vehicle Log,Invoice Ref,ការទូទាត់វិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},សំណុំបែបបទ -C មិនអាចអនុវត្តចំពោះវិក្កយបត្រ: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,វិក្កយប័ត្របានបង្កើត
+DocType: Shift Type,Early Exit Grace Period,រយៈពេលទទួលព្រះគុណពីដំណាក់កាលដំបូង
 DocType: Patient Encounter,Review Details,ពិនិត្យឡើងវិញលម្អិត
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃម៉ោងត្រូវតែធំជាងសូន្យ។
 DocType: Account,Account Number,លេខគណនី
@@ -4882,7 +4927,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","អាចអនុវត្តបានប្រសិនបើក្រុមហ៊ុននេះមាន SpA, SApA ឬ SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,លក្ខខណ្ឌត្រួតស៊ីគ្នាបានរកឃើញរវាង:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,បានបង់និងមិនបានបញ្ជូន
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,កូដធាតុគឺចាំបាច់ពីព្រោះធាតុមិនត្រូវបានបង់លេខដោយស្វ័យប្រវត្តិទេ
 DocType: GST HSN Code,HSN Code,លេខ HSN
 DocType: GSTR 3B Report,September,កញ្ញា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,ចំណាយរដ្ឋបាល
@@ -4918,6 +4962,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,គណនី CWIP
 DocType: SMS Log,Sender Name,ឈ្មោះអ្នកផ្ញើ
 DocType: Pricing Rule,Supplier Group,ក្រុមអ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",កំណត់ពេលវេលាចាប់ផ្តើមនិងពេលវេលាបញ្ចប់សម្រាប់ \ ថ្ងៃគាំទ្រ {0} នៅលិបិក្រម {1} ។
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទចេញផ្សាយ
 ,Requested Items To Be Transferred,ទំនិញដែលបានស្នើត្រូវផ្ទេរ
 DocType: Employee,Contract End Date,កាលបរិច្ឆេទបញ្ចប់កិច្ចសន្យា
@@ -4928,6 +4974,7 @@
 DocType: Opportunity,Sales Stage,ដំណាក់កាលលក់
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅក្នុងពាក្យនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកលំដាប់លក់។
 DocType: Item Reorder,Re-order Level,លំដាប់ឡើងវិញ
+DocType: Shift Type,Enable Auto Attendance,បើកការចូលរួមស្វ័យប្រវត្តិ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,ចំណូលចិត្ត
 ,Department Analytics,នាយកដ្ឋានវិភាគ
 DocType: Crop,Scientific Name,ឈ្មោះវិទ្យាសាស្រ្ត
@@ -4940,6 +4987,7 @@
 DocType: Quiz Activity,Quiz Activity,សកម្មភាពសំណួរ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} មិនស្ថិតនៅក្នុងអំឡុងពេលបើកប្រាក់ខែដែលមានសុពលភាពទេ
 DocType: Timesheet,Billed,បានចេញវិក្កយបត្រ
+apps/erpnext/erpnext/config/support.py,Issue Type.,ប្រភេទបញ្ហា។
 DocType: Restaurant Order Entry,Last Sales Invoice,វិក័យប័ត្រលក់ចុងក្រោយ
 DocType: Payment Terms Template,Payment Terms,ល័ក្ខខ័ណ្ឌទូទាត់
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",Qty បានបំរុង: បរិមាណដែលបានបញ្ជាទិញសម្រាប់លក់ប៉ុន្តែមិនត្រូវបានប្រគល់ឱ្យ។
@@ -5035,6 +5083,7 @@
 DocType: Account,Asset,ទ្រព្យសកម្ម
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} មិនមានកាលវិភាគសុខភាពអ្នកអនុវត្តន៍។ បន្ថែមវានៅក្នុងមេថែទាំសុខភាព
 DocType: Vehicle,Chassis No,តួលេខ
+DocType: Employee,Default Shift,ប្តូរលំនាំដើម
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,ក្រុមហ៊ុនអក្សរកាត់
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,មែកធាងតារាងនៃសំភារៈ
 DocType: Article,LMS User,អ្នកប្រើ LMS
@@ -5083,6 +5132,7 @@
 DocType: Sales Person,Parent Sales Person,ការលក់របស់ឪពុកម្តាយ
 DocType: Student Group Creation Tool,Get Courses,ទទួលបានវគ្គសិក្សា
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: ចំនួនត្រូវតែជា 1, ជាធាតុគឺជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដេកដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),ម៉ោងធ្វើការខាងក្រោមអវត្តមានត្រូវបានសម្គាល់។ (សូន្យដើម្បីបិទ)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,មានតែសញ្ញាថ្នាំងប៉ុណ្ណោះដែលត្រូវបានអនុញ្ញាតនៅក្នុងប្រតិបត្តិការ
 DocType: Grant Application,Organization,អង្គការ
 DocType: Fee Category,Fee Category,ថ្លៃសេវា
@@ -5095,6 +5145,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,សូមធ្វើបច្ចុប្បន្នភាពស្ថានភាពរបស់អ្នកសម្រាប់ព្រឹត្តិការណ៍បណ្តុះបណ្តាលនេះ
 DocType: Volunteer,Morning,ព្រឹក
 DocType: Quotation Item,Quotation Item,ធាតុសម្រង់
+apps/erpnext/erpnext/config/support.py,Issue Priority.,ដាក់បញ្ហាអាទិភាព។
 DocType: Journal Entry,Credit Card Entry,កាតឥណទាន
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",រន្ធដោតបានរំលងរន្ធដោត {0} ដល់ {1} ត្រួតលើរន្ធដោត {2} ទៅ {3}
 DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើប្រាក់ចំណូលឬចំណាយ
@@ -5145,11 +5196,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,ការនាំចូលទិន្នន័យនិងការកំណត់
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",ប្រសិនបើជ្រើសរើសយកការជ្រើសរើសស្វ័យប្រវត្តិនោះអតិថិជននឹងត្រូវបានភ្ជាប់ដោយស្វ័យប្រវត្តិជាមួយកម្មវិធីភាពស្មោះត្រង់ដែលពាក់ព័ន្ធ (នៅពេលរក្សាទុក)
 DocType: Account,Expense Account,គណនីចំណាយ
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,ពេលវេលាមុនពេលចាប់ផ្តើមផ្លាស់ប្តូរអំឡុងពេលដែលនិយោជិកចូលពិនិត្យត្រូវបានពិចារណាសម្រាប់ការចូលរួម។
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ទំនាក់ទំនងជាមួយអាណាព្យាបាល 1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,បង្កើតវិក្កយបត្រ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},សំណើទូទាត់រួចហើយ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',និយោជិកធូរចិត្តនៅ {0} ត្រូវតែកំណត់ជា &#39;Left&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},បង់ {0} {1}
+DocType: Company,Sales Settings,ការកំណត់ការលក់
 DocType: Sales Order Item,Produced Quantity,ផលិតបរិមាណ
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,សំណូមពរសម្រាប់សម្រង់អាចត្រូវបានចូលដំណើរការដោយចុចលើតំណខាងក្រោម
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះនៃការចែកចាយប្រចាំខែ
@@ -5228,6 +5281,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,គំរូពន្ធលំនាំដើមសម្រាប់ការលក់និងការទិញត្រូវបានបង្កើត។
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ចាកចេញពីប្រភេទ {0} មិនអាចបញ្ជូនបន្តបានទេ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,ឥណពន្ធទៅគណនីត្រូវតែជាគណនីដែលអាចទទួលបាន
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,កាលបរិច្ឆេទបញ្ចប់នៃកិច្ចព្រមព្រៀងមិនអាចតិចជាងថ្ងៃនេះទេ។
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},សូមកំណត់គណនីនៅក្នុងឃ្លាំង {0} ឬបញ្ជីសារពើភណ្ឌលំនាំដើមនៅក្នុងក្រុមហ៊ុន {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,កំណត់ជាលំនាំដើម
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ទំងន់សុទ្ធនៃកញ្ចប់នេះ។ (គណនាដោយស្វ័យប្រវត្តិជាការបូកនៃទំងន់សុទ្ធនៃធាតុ)
@@ -5254,8 +5308,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,ការស៊ីសងដែលផុតកំណត់
 DocType: Shipping Rule,Shipping Rule Type,ដឹកជញ្ជូនប្រភេទច្បាប់
 DocType: Job Offer,Accepted,បានទទួល
-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> \ ដើម្បីបោះបង់ឯកសារនេះ"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,អ្នកបានវាយតំលៃរួចហើយសម្រាប់លក្ខណៈវិនិច្ឆ័យវាយតម្លៃ {} ។
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,ជ្រើសលេខបាច់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),អាយុ (ថ្ងៃ)
@@ -5282,6 +5334,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,ជ្រើសដែនរបស់អ្នក
 DocType: Agriculture Task,Task Name,ឈ្មោះភារកិច្ច
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,ធាតុភាគហ៊ុនដែលបានបង្កើតរួចហើយសម្រាប់លំដាប់ការងារ
+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> \ ដើម្បីបោះបង់ឯកសារនេះ"
 ,Amount to Deliver,បរិមាណដើម្បីផ្តល់
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,ក្រុមហ៊ុន {0} មិនមានទេ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,គ្មានការស្នើសុំសម្ភារៈដែលមិនទាន់បានរកឃើញដើម្បីភ្ជាប់សម្រាប់ធាតុដែលបានផ្តល់។
@@ -5331,6 +5385,7 @@
 DocType: Lab Prescription,Test Code,កូដសាកល្បង
 DocType: Purchase Taxes and Charges,On Previous Row Total,នៅលើសរុបជួរដេកសរុប
 DocType: Student,Student Email Address,អាស័យដ្ឋានអ៊ីម៉ែលរបស់សិស្ស
+,Delayed Item Report,របាយការណ៍ធាតុពន្យាពេល
 DocType: Academic Term,Education,ការអប់រំ
 DocType: Supplier Quotation,Supplier Address,អាសយដ្ឋានអ្នកផ្គត់ផ្គង់
 DocType: Salary Detail,Do not include in total,កុំរួមបញ្ចូលសរុប
@@ -5338,7 +5393,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} មិនមានទេ
 DocType: Purchase Receipt Item,Rejected Quantity,បរិមាណច្រានចោល
 DocType: Cashier Closing,To TIme,ដើម្បី TIme
-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: Daily Work Summary Group User,Daily Work Summary Group User,អ្នកប្រើក្រុមសង្ខេបការងារប្រចាំថ្ងៃ
 DocType: Fiscal Year Company,Fiscal Year Company,ក្រុមហ៊ុនសារពើពន្ធប្រចាំឆ្នាំ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,ធាតុជំនួសមិនត្រូវដូចគ្នានឹងលេខកូដធាតុទេ
@@ -5390,6 +5444,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,ការពន្យារពេលរវាងការដឹកជញ្ជូនឈប់
 DocType: Stock Settings,Freeze Stocks Older Than [Days],បង្កកភាគហ៊ុនចាស់ជាង [ថ្ងៃ]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,គ្រោងការណ៍ផ្សព្វផ្សាយការបញ្ចុះតម្លៃផលិតផល
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,អាទិភាពបញ្ហាមានរួចហើយ
 DocType: Account,Asset Received But Not Billed,ទ្រព្យសកម្មបានទទួលប៉ុន្តែមិនបានទូទាត់
 DocType: POS Closing Voucher,Total Collected Amount,ចំនួនសរុបដែលបានប្រមូល
 DocType: Course,Default Grading Scale,មាត្រដ្ឋានធ្វើមាត្រដ្ឋានលំនាំដើម
@@ -5432,6 +5487,7 @@
 DocType: Contract,Fulfilment Terms,លក្ខខណ្ឌនៃការបំពេញ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,មិនមែនជាក្រុមទៅជាក្រុម
 DocType: Student Guardian,Mother,ម្តាយ
+DocType: Issue,Service Level Agreement Fulfilled,កិច្ចព្រមព្រៀងកម្រិតសេវាកម្មបានបំពេញ
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,កាត់បន្ថយពន្ធសម្រាប់អត្ថប្រយោជន៍របស់និយោជិកដែលមិនបានទាមទារ
 DocType: Travel Request,Travel Funding,ការធ្វើដំណើរថវិកា
 DocType: Shipping Rule,Fixed,ថេរ
@@ -5461,10 +5517,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,រកមិនឃើញធាតុ។
 DocType: Item Attribute,From Range,ពីជួរ
 DocType: Clinical Procedure,Consumables,ការប្រើប្រាស់
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; និង &#39;timestamp&#39; ត្រូវបានទាមទារ។
 DocType: Purchase Taxes and Charges,Reference Row #,សេចក្តីយោងជួរដេក #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},សូមកំណត់ &#39;មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ&#39; នៅក្នុងក្រុមហ៊ុន {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,ជួរដេក # {0}: ឯកសារបង់ប្រាក់ត្រូវបានទាមទារដើម្បីបញ្ចប់ការបំលែង
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,ចុចប៊ូតុងនេះដើម្បីទាញទិន្នន័យការបញ្ជាទិញរបស់អ្នកពី Amazon MWS ។
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),ម៉ោងធ្វើការខាងក្រោមដែលពាក់កណ្តាលថ្ងៃត្រូវបានសម្គាល់។ (សូន្យដើម្បីបិទ)
 ,Assessment Plan Status,ស្ថានភាពផែនការវាយតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,សូមជ្រើសរើស {0} ជាមុន
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ដាក់ស្នើនេះដើម្បីបង្កើតកំណត់ត្រានិយោជិក
@@ -5535,6 +5593,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,កំណត់បើក
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,បិទ / បើកតម្រង
 DocType: Production Plan,Material Request Detail,សម្ភារៈស្នើសុំពត៌មាន
+DocType: Shift Type,Process Attendance After,ដំណើរការវត្តមានបន្ទាប់ពី
 DocType: Material Request Item,Quantity and Warehouse,បរិមាណនិងឃ្លាំង
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,ចូលទៅកាន់កម្មវិធី
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},ជួរដេក # {0}: ធាតុស្ទួននៅក្នុងសេចក្តីយោង {1} {2}
@@ -5592,6 +5651,7 @@
 DocType: Pricing Rule,Party Information,ពត៌មានគណបក្ស
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),អ្នកបំណុល ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,ដល់កាលបរិច្ឆេតមិនអាចធំជាងថ្ងៃធ្វើការរបស់និយោជិតទេ
+DocType: Shift Type,Enable Exit Grace Period,បើកដំណើរការការលើកលែងការចាកចេញ
 DocType: Expense Claim,Employees Email Id,អ៊ីម៉ែលបុគ្គលិកអ៊ីម៉ែល
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,ធ្វើបច្ចុប្បន្នភាពតម្លៃពីបញ្ជីតម្លៃទំនិញពីហាង Shopify ទៅក្នុងតារាងតម្លៃ ERPNext
 DocType: Healthcare Settings,Default Medical Code Standard,ស្តង់ដារវេជ្ជសាស្ត្រលំនាំដើម
@@ -5622,7 +5682,6 @@
 DocType: Budget,Applicable on Material Request,អនុវត្តលើសំណើសុំសម្ភារៈ
 DocType: Support Settings,Search APIs,ស្វែងរក APIs
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,ភាគរយលើសផលិតកម្មសម្រាប់លំដាប់លក់
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,ការបញ្ជាក់
 DocType: Purchase Invoice,Supplied Items,ធាតុដែលបានផ្គត់ផ្គង់
 DocType: Leave Control Panel,Select Employees,ជ្រើសបុគ្គលិក
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},ជ្រើសរើសគណនីប្រាក់ចំណូលក្នុងការប្រាក់ {0}
@@ -5648,7 +5707,7 @@
 ,Supplier-Wise Sales Analytics,អ្នកផ្គត់ផ្គង់ - វិភាគការលក់ឆ្លាត
 DocType: GSTR 3B Report,February,ខែកុម្ភៈ
 DocType: Appraisal,For Employee,សម្រាប់បុគ្គលិក
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,កាលបរិច្ឆេទដឹកជញ្ជូនជាក់ស្តែង
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,កាលបរិច្ឆេទដឹកជញ្ជូនជាក់ស្តែង
 DocType: Sales Partner,Sales Partner Name,ឈ្មោះដៃគូលក់
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,រំលោះជួរដេក {0}: កាលបរិច្ឆេទចាប់ផ្តើមរំលោះត្រូវបានបញ្ចូលជាកាលបរិច្ឆេទកន្លងមក
 DocType: GST HSN Code,Regional,តំបន់
@@ -5687,6 +5746,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,ប័ណ្ណពិន្ទុរបស់អ្នកផ្គត់ផ្គង់
 DocType: Travel Itinerary,Travel To,ធ្វើដំណើរទៅកាន់
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,កំណត់ការចូលនិងចេញ
 DocType: POS Closing Voucher,Difference,ភាពខុសគ្នា
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,តូច
 DocType: Work Order Item,Work Order Item,កិច្ចការបញ្ជាទិញ
@@ -5720,6 +5780,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ឱសថ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ត្រូវបានបិទ
 DocType: Patient,Medical History,ប្រវត្តិពេទ្យ
+DocType: Expense Claim,Expense Taxes and Charges,ពន្ធលើថ្លៃចំណាយនិងថ្លៃឈ្នួល
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ចំនួនថ្ងៃបន្ទាប់ពីកាលវិក័យប័ត្របានកន្លងផុតមុនពេលលុបចោលការជាវឬការចុះឈ្មៃថាជាការមិនបង់ប្រាក់
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ចំណាំដំឡើង {0} ត្រូវបានដាក់ស្នើរួចហើយ
 DocType: Patient Relation,Family,គ្រួសារ
@@ -5752,7 +5813,6 @@
 DocType: Dosage Strength,Strength,កម្លាំង
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} ឯកតា {1} ដែលត្រូវការក្នុង {2} ដើម្បីបញ្ចប់ប្រតិបត្តិការនេះ។
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush វត្ថុធាតុដើមនៃកិច្ចសន្យាដែលមានមូលដ្ឋានលើ
-DocType: Bank Guarantee,Customer,អតិថិជន
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",ប្រសិនបើបានបើកដំណើរការវគ្គសិក្សាសិក្សាគឺចាំបាច់នៅក្នុងឧបករណ៍ចុះឈ្មោះកម្មវិធី។
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","សម្រាប់ក្រុមនិស្សិតដែលមានមូលដ្ឋានគ្រាប់បញ្ចប់, សិស្សបាច់នឹងត្រូវបានធ្វើឱ្យមានសុពលភាពសម្រាប់សិស្សគ្រប់រូបពីការចុះឈ្មោះចូលរៀន។"
 DocType: Course,Topics,ប្រធានបទ
@@ -5832,6 +5892,7 @@
 DocType: Chapter,Chapter Members,ជំពូកសមាជិក
 DocType: Warranty Claim,Service Address,អាសយដ្ឋានសេវាកម្ម
 DocType: Journal Entry,Remark,សម្គាល់
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: បរិមាណមិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅពេលប្រកាសនៃធាតុ ({2} {3})
 DocType: Patient Encounter,Encounter Time,ពេលវេលាជួប
 DocType: Serial No,Invoice Details,ព័ត៌មានលម្អិតអំពីវិក្កយបត្រ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","គណនីផ្សេងទៀតអាចត្រូវបានធ្វើឡើងក្រោមក្រុម, ប៉ុន្តែធាតុអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងក្រុមដែលមិនមែនជាក្រុម"
@@ -5912,6 +5973,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),ការបិទ (បើក + សរុប)
 DocType: Supplier Scorecard Criteria,Criteria Formula,រូបមន្តលក្ខណៈវិនិច្ឆ័យ
 apps/erpnext/erpnext/config/support.py,Support Analytics,ការគាំទ្រវិភាគ
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),លេខសម្គាល់ឧបករណ៍វត្តមាន (លេខសម្គាល់ស្លាក Biometric / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,ពិនិត្យឡើងវិញនិងសកម្មភាព
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីត្រូវបានបង្កកធាតុត្រូវបានអនុញ្ញាតឱ្យដាក់កម្រិតអ្នកប្រើ។
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,ចំនួនទឹកប្រាក់បន្ទាប់ពីការរំលស់
@@ -5933,6 +5995,7 @@
 DocType: Salary Slip,Loan Repayment,ការសងប្រាក់កម្ចី
 DocType: Employee Education,Major/Optional Subjects,មុខវិជ្ជាសំខាន់ៗ / ជម្រើស
 DocType: Soil Texture,Silt,ខ្សាច់
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,អាស័យដ្ឋានអ្នកផ្គត់ផ្គង់និងទំនាក់ទំនង
 DocType: Bank Guarantee,Bank Guarantee Type,ប្រភេទលិខិតធានា
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",ប្រសិនបើបិទដំណើរការវាលសរុប &#39;Rounded Total&#39; នឹងមិនអាចមើលឃើញនៅក្នុងប្រតិបត្តិការណាមួយទេ
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5971,6 +6034,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,បើកធាតុឧបករណ៍បង្កើតវិក័យប័ត្រ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,បញ្ចូលប្រតិបត្តិការលក់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},រកមិនឃើញនិយោជិកសម្រាប់តម្លៃវាលបុគ្គលិកដែលបានផ្តល់។ &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលទទួលបាន (រូបិយប័ណ្ណក្រុមហ៊ុន)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage ពេញ, មិនរក្សាទុកទេ"
 DocType: Chapter Member,Chapter Member,ជំពូកសមាជិក
@@ -6003,6 +6067,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,មិនមានក្រុមនិស្សិតបង្កើតឡើយ។
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},ស្ទួនជួរ {0} ជាមួយ {1} ដូចគ្នា
 DocType: Employee,Salary Details,ព័ត៌មានលម្អិតអំពីប្រាក់ខែ
+DocType: Employee Checkin,Exit Grace Period Consequence,ចេញពេលសមស្រប
 DocType: Bank Statement Transaction Invoice Item,Invoice,វិក្កយបត្រ
 DocType: Special Test Items,Particulars,ពិសេស
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,សូមកំណត់តម្រងដែលមានមូលដ្ឋានលើធាតុឬឃ្លាំង
@@ -6104,6 +6169,7 @@
 DocType: Serial No,Out of AMC,ចេញពី AMC
 DocType: Job Opening,"Job profile, qualifications required etc.",ប្រវត្តិរូបការងារលក្ខណៈសម្បត្តិដែលត្រូវការ។ ល។
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,នាវាទៅរដ្ឋ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,តើអ្នកចង់ដាក់ស្នើសម្ភារៈ
 DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
 DocType: Compensatory Leave Request,Work End Date,កាលបរិច្ឆេទបញ្ចប់ការងារ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,ស្នើសុំវត្ថុធាតុដើម
@@ -6289,6 +6355,7 @@
 DocType: Sales Order Item,Gross Profit,ប្រាក់ចំណេញដុល
 DocType: Quality Inspection,Item Serial No,លេខស៊េរីលេខ
 DocType: Asset,Insurer,ធានារ៉ាប់រង
+DocType: Employee Checkin,OUT,ចេញ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,ការទិញចំនួនទឹកប្រាក់
 DocType: Asset Maintenance Task,Certificate Required,វិញ្ញាបនបត្រត្រូវបានទាមទារ
 DocType: Retention Bonus,Retention Bonus,ប្រាក់លើកទឹកចិត្ត
@@ -6404,6 +6471,8 @@
 DocType: Invoice Discounting,Sanctioned,បានដាក់ទណ្ឌកម្ម
 DocType: Course Enrollment,Course Enrollment,ចុះឈ្មោះចូលរៀនវគ្គសិក្សា
 DocType: Item,Supplier Items,របស់អ្នកផ្គត់ផ្គង់
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",ពេលវេលាចាប់ផ្ដើមមិនអាចធំជាងឬស្មើនឹងពេលវេលាបញ្ចប់ \ for {0} ។
 DocType: Sales Order,Not Applicable,មិនអាចអនុវត្តបាន
 DocType: Support Search Source,Response Options,ជម្រើសឆ្លើយតប
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} គួរតែជាតម្លៃចន្លោះ 0 និង 100
@@ -6490,7 +6559,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,ទ្រព្យមានកាលកំណត់
 DocType: Purchase Order,Ref SQ,Ref QQ
 DocType: Salary Structure,Total Earning,ការរកប្រាក់ចំណូលសរុប
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 DocType: Share Balance,From No,ពីលេខ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,វិក័យប័ត្រសម្រុះសម្រួលការទូទាត់
 DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងបន្ទុកដែលបានបន្ថែម
@@ -6598,6 +6666,7 @@
 DocType: POS Profile,Ignore Pricing Rule,មិនអើពើគោលការណ៍កំណត់តម្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,អាហារ
 DocType: Lost Reason Detail,Lost Reason Detail,ព័ត៌មានលំអិតដែលបានបាត់បង់
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},លេខសៀរៀលខាងក្រោមត្រូវបានបង្កើតឡើង: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,មតិយោបល់របស់អតិថិជន
 DocType: Serial No,Warranty / AMC Details,ព័ត៌មានលម្អិតអំពីការធានា / AMC
 DocType: Issue,Opening Time,បើកម៉ោង
@@ -6647,6 +6716,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,ឈ្មោះក្រុមហ៊ុនមិនដូចគ្នាទេ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,ការលើកកម្ពស់និយោជិកមិនអាចត្រូវបានដាក់ជូនមុនកាលបរិច្ឆេទផ្សព្វផ្សាយទេ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើបច្ចុប្បន្នភាពប្រតិបតិ្តការហ៊ុនចាស់ជាង {0}
+DocType: Employee Checkin,Employee Checkin,និយោជិកពិនិត្យ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,បង្កើតសម្រង់អតិថិជន
 DocType: Buying Settings,Buying Settings,ការទិញការកំណត់
@@ -6668,6 +6738,7 @@
 DocType: Patient,Patient Demographics,ប្រជាសាស្ត្រអ្នកជំងឺ
 DocType: Share Transfer,To Folio No,ទៅ Folio លេខ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីប្រតិបត្តិការ
+DocType: Employee Checkin,Log Type,ប្រភេទកំណត់ហេតុ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យភាគហ៊ុនអវិជ្ជមាន
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,គ្មានធាតុណាមួយមានការប្រែប្រួលណាមួយលើបរិមាណឬតម្លៃទេ។
 DocType: Asset,Purchase Date,កាលបរិច្ឆេទទិញ
@@ -6712,6 +6783,7 @@
 DocType: Vital Signs,Very Hyper,ខ្លាំងណាស់
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,ជ្រើសរើសលក្ខណៈអាជីវកម្មរបស់អ្នក។
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,សូមជ្រើសរើសខែនិងឆ្នាំ
+DocType: Service Level,Default Priority,អាទិភាពលំនាំដើម
 DocType: Student Log,Student Log,កំណត់ហេតុសិស្ស
 DocType: Shopping Cart Settings,Enable Checkout,បើកដំណើរការ Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,ធនធានមនុស្ស
@@ -6740,7 +6812,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ភ្ជាប់ Connectify ជាមួយ ERPNext
 DocType: Homepage Section Card,Subtitle,ចំណងជើងរង
 DocType: Soil Texture,Loam,លាមក
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ក្រុមហ៊ុនផ្គត់ផ្គង់&gt; ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: BOM,Scrap Material Cost(Company Currency),ចំណាយសម្ភារៈសំណល់អេតចាយ (រូបិយប័ណ្ណក្រុមហ៊ុន)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,មិនត្រូវបញ្ជូនសេចក្តីជូនដំណឹង {0}
 DocType: Task,Actual Start Date (via Time Sheet),កាលបរិច្ឆេទចាប់ផ្ដើមពិតប្រាកដ (តាមរយៈសន្លឹកពេល)
@@ -6796,6 +6867,7 @@
 DocType: Drug Prescription,Dosage,កិតើ
 DocType: Cheque Print Template,Starting position from top edge,ចាប់ផ្តើមទីតាំងពីគែមកំពូល
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),រយៈពេលនៃការតែងតាំង (នាទី)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},និយោជិតនេះមានកំណត់ត្រាដែលមានត្រាពេលវេលាដូចគ្នា។ {0}
 DocType: Accounting Dimension,Disable,បិទ
 DocType: Email Digest,Purchase Orders to Receive,ទិញការបញ្ជាទិញដើម្បីទទួល
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលមិនអាចត្រូវបានលើកឡើងសម្រាប់:
@@ -6811,7 +6883,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,បញ្ជូនសម្ភារៈសម្រាប់កិច្ចសន្យាម៉ៅការ
 DocType: Job Card,Timing Detail,ពត៌មានពេលវេលា
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,ទាមទារលើ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},ការនាំចូល {0} នៃ {1}
 DocType: Job Offer Term,Job Offer Term,រយៈពេលផ្តល់ការងារ
 DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
 DocType: Project Task,Project Task,ភារកិច្ចគម្រោង
@@ -6862,7 +6933,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,ធាតុ {0} មិនត្រូវបានរៀបចំសម្រាប់លេខស៊េរីទេ។ ពិនិត្យធាតុមេ
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,ពីរដ្ឋ
 DocType: Leave Type,Maximum Continuous Days Applicable,ថ្ងៃបន្តអតិបរមាអាចអនុវត្តបាន
-apps/erpnext/erpnext/config/support.py,Support Team.,ក្រុមគាំទ្រ។
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,សូមបញ្ចូលឈ្មោះក្រុមហ៊ុនដំបូង
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,នាំចូលជោគជ័យ
 DocType: Guardian,Alternate Number,លេខជម្មើសជំនួស
@@ -6954,6 +7024,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,ជួរដេក # {0}: ធាតុបានបន្ថែម
 DocType: Student Admission,Eligibility and Details,សិទ្ធិទទួលនិងព័ត៌មានលម្អិត
 DocType: Staffing Plan,Staffing Plan Detail,ពត៌មានលំអិតបុគ្គលិក
+DocType: Shift Type,Late Entry Grace Period,ពេលចូលសម័យយឺត ៗ
 DocType: Email Digest,Annual Income,ចំនូលប្រចាំឆ្នាំ
 DocType: Journal Entry,Subscription Section,ផ្នែកបរិវិសកម្ម
 DocType: Salary Slip,Payment Days,ថ្ងៃទូទាត់
@@ -7004,6 +7075,7 @@
 DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
 DocType: Asset Maintenance Log,Periodicity,រយៈពេល
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,កំណត់ត្រាវេជ្ជសាស្រ្ត
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,ប្រភេទកំណត់ហេតុត្រូវបានទាមទារសម្រាប់ការចុះឈ្មោះធ្លាក់ក្នុងវេន: {0} ។
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,ការប្រតិបត្តិ
 DocType: Item,Valuation Method,វិធីសាស្រ្តវាយតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
@@ -7088,6 +7160,7 @@
 DocType: Loan Type,Loan Name,ឈ្មោះឥណទាន
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,កំណត់របៀបទូទាត់លំនាំដើម
 DocType: Quality Goal,Revision,ការពិនិត្យឡើងវិញ
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,ពេលវេលាមុនពេលម៉ោងវេនវេននៅពេលពិនិត្យចេញត្រូវបានគេចាត់ទុកថាឆាប់រហ័ស (គិតជានាទី) ។
 DocType: Healthcare Service Unit,Service Unit Type,ប្រភេទសេវាកម្ម
 DocType: Purchase Invoice,Return Against Purchase Invoice,ត្រឡប់មកវិក័យប័ត្រទិញ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,បង្កើតសម្ងាត់
@@ -7243,11 +7316,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,គ្រឿងសំអាង
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ពិនិត្យនេះប្រសិនបើអ្នកចង់បង្ខំអ្នកប្រើឱ្យជ្រើសរើសស៊េរីមុនពេលរក្សាទុក។ វានឹងមិនមានលំនាំដើមទេប្រសិនបើអ្នកពិនិត្យមើលវា។
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នកប្រើដែលមានតួនាទីនេះត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីដែលបង្កកនិងបង្កើត / កែប្រែធាតុគណនេយ្យប្រឆាំងនឹងគណនីដែលបង្កក
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដធាតុ&gt; ក្រុមធាតុ&gt; ម៉ាក
 DocType: Expense Claim,Total Claimed Amount,បរិមាណសរុបដែលបានទាមទារ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,រុំឡើង
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,អ្នកអាចបន្តបានលុះត្រាតែសមាជិកភាពរបស់អ្នកផុតកំណត់ក្នុងរយៈពេល 30 ថ្ងៃ
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},តម្លៃត្រូវតែនៅចន្លោះ {0} និង {1}
 DocType: Quality Feedback,Parameters,ប៉ារ៉ាម៉ែត្រ
+DocType: Shift Type,Auto Attendance Settings,ការកំណត់វត្តមានស្វ័យប្រវត្តិ
 ,Sales Partner Transaction Summary,សង្ខេបប្រតិបត្តិការលក់ដៃគូ
 DocType: Asset Maintenance,Maintenance Manager Name,ឈ្មោះអ្នកគ្រប់គ្រងថែទាំ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,វាចាំបាច់ដើម្បីទៅយកព័ត៌មានលំអិតអំពីធាតុ។
@@ -7339,10 +7414,10 @@
 DocType: Pricing Rule,Validate Applied Rule,ធ្វើឱ្យមានសុពលភាពអនុវត្តវិធាន
 DocType: Job Card Item,Job Card Item,ធាតុកាតការងារ
 DocType: Homepage,Company Tagline for website homepage,ក្រុមហ៊ុនសរសេរពាក្យសំរាប់វេបសាយវេបសាយ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,កំណត់ម៉ោងឆ្លើយតបនិងដំណោះស្រាយសម្រាប់អាទិភាព {0} នៅសន្ទស្សន៍ {1} ។
 DocType: Company,Round Off Cost Center,មជ្ឈមណ្ឌលមជ្ឈដ្ឋានជុំបិទ
 DocType: Supplier Scorecard Criteria,Criteria Weight,លក្ខណៈវិនិច្ឆ័យទំងន់
 DocType: Asset,Depreciation Schedules,តារាងរំលោះ
-DocType: Expense Claim Detail,Claim Amount,ចំនួនប្រាក់សំណង
 DocType: Subscription,Discounts,ការបញ្ចុះតម្លៃ
 DocType: Shipping Rule,Shipping Rule Conditions,ល័ក្ខខ័ណ្ឌច្បាប់ដឹកជញ្ជូន
 DocType: Subscription,Cancelation Date,កាលបរិច្ឆេទបោះបង់
@@ -7370,7 +7445,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,បង្ហាញតម្លៃសូន្យ
 DocType: Employee Onboarding,Employee Onboarding,បុគ្គលិកនៅលើនាវា
 DocType: POS Closing Voucher,Period End Date,កាលបរិច្ឆេទបញ្ចប់
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,ឱកាសលក់តាមប្រភព
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,អ្នកគាំទ្រដំបូងនៅក្នុងបញ្ជីនេះនឹងត្រូវបានកំណត់ជាលំនាំដើមទុកអ្នកអនុម័ត។
 DocType: POS Settings,POS Settings,ការកំណត់ POS
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,គណនីទាំងអស់
@@ -7391,7 +7465,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ជួរដេក # {0}: អត្រាត្រូវតែដូចគ្នានឹង {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-yYYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,សេវាកម្មថែទាំសុខភាព
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,មិនមានកំណត់ត្រា
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,អាយុជំពូក 3
 DocType: Vital Signs,Blood Pressure,សម្ពាធឈាម
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,គោលដៅលើ
@@ -7438,6 +7511,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,ជំនាន់
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,ការពារ
 DocType: Item,Has Batch No,មានបំណះលេខ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,ថ្ងៃពន្យារពេល
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យ៉ង់
 DocType: Training Event Employee,Invited,បានអញ្ជើញ
@@ -7459,7 +7533,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",កាលបរិច្ឆេទចាប់ផ្ដើមនិងបញ្ចប់មិននៅក្នុងអំឡុងពេលបើកប្រាក់បៀវត្សរ៍ត្រឹមត្រូវមិនអាចគណនា {0} ។
 DocType: POS Profile,Only show Customer of these Customer Groups,បង្ហាញតែអតិថិជននៃក្រុមអតិថិជនទាំងនេះ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកវិក័យប័ត្រ
-DocType: Service Level,Resolution Time,ពេលវេលាដោះស្រាយ
+DocType: Service Level Priority,Resolution Time,ពេលវេលាដោះស្រាយ
 DocType: Grading Scale Interval,Grade Description,កម្រិតពណ៌នា
 DocType: Homepage Section,Cards,កាត
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,នាទីប្រជុំគុណភាព
@@ -7486,6 +7560,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,សមតុល្យគណនីធនាគារតាមបញ្ជីរាយនាមទូទៅ
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),សុខភាព (បែតា)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,ឃ្លាំងលំនាំដើមដើម្បីបង្កើតលំដាប់លក់និងកំណត់សំគាល់ការដឹកជញ្ជូន
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,ពេលវេលាឆ្លើយតបសម្រាប់ {0} នៅលិបិក្រម {1} មិនអាចធំជាងពេលវេលាដោះស្រាយបានទេ។
 DocType: Opportunity,Customer / Lead Name,ឈ្មោះអតិថិជន / នាំមុខ
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-yYYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,ចំនួនទឹកប្រាក់មិនបានទាមទារ
@@ -7532,7 +7607,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,ការនាំចូលភាគីនិងអាសយដ្ឋាន
 DocType: Item,List this Item in multiple groups on the website.,រាយធាតុនេះជាក្រុមច្រើននៅលើគេហទំព័រ។
 DocType: Request for Quotation,Message for Supplier,សារសំរាប់អ្នកផ្គត់ផ្គង់
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,មិនអាចប្តូរ {0} ជាសកម្មភាពប្រតិបត្តិការសម្រាប់ធាតុ {1} បានទេ។
 DocType: Healthcare Practitioner,Phone (R),ទូរស័ព្ទ (R)
 DocType: Maintenance Team Member,Team Member,សមាជិកក្រុម
 DocType: Asset Category Account,Asset Category Account,គណនីប្រភេទទ្រព្យ
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 7985571..706e14e 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,ನೇಮಕಾತಿ {0} ಮತ್ತು ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {1} ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸ ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,ಡೀಫಾಲ್ಟ್ ಬುಕ್ ನಮೂದುಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,ಡೀಫಾಲ್ಟ್ ಬುಕ್ ನಮೂದುಗಳನ್ನು ಸೇರಿಸಿ
 DocType: Activity Cost,Activity Type,ಚಟುವಟಿಕೆ ಪ್ರಕಾರ
 DocType: Purchase Invoice,Get Advances Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿ
 DocType: Company,Gain/Loss Account on Asset Disposal,ಸ್ವತ್ತು ವಿಲೇವಾರಿ ಮೇಲೆ ಲಾಭ / ನಷ್ಟ ಖಾತೆ
@@ -222,7 +222,9 @@
 DocType: Bank Reconciliation,Payment Entries,ಪಾವತಿ ನಮೂದುಗಳು
 DocType: Employee Education,Class / Percentage,ವರ್ಗ / ಶೇಕಡಾವಾರು
 ,Electronic Invoice Register,ವಿದ್ಯುನ್ಮಾನ ಸರಕುಪಟ್ಟಿ ನೋಂದಣಿ
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,ಪರಿಣಾಮವನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸಿದ ನಂತರ ಸಂಭವಿಸಿದ ಸಂಖ್ಯೆ.
 DocType: Sales Invoice,Is Return (Credit Note),ರಿಟರ್ನ್ (ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ)
+DocType: Price List,Price Not UOM Dependent,ಬೆಲೆ UOM ಅವಲಂಬಿತವಲ್ಲ
 DocType: Lab Test Sample,Lab Test Sample,ಲ್ಯಾಬ್ ಪರೀಕ್ಷಾ ಮಾದರಿ
 DocType: Shopify Settings,status html,ಸ್ಥಿತಿ html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ಉದಾಹರಣೆಗೆ 2012, 2012-13"
@@ -324,6 +326,7 @@
 DocType: Salary Slip,Net Pay,ನಿವ್ವಳ ಪೇ
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,ಒಟ್ಟು ಇನ್ವಾಯ್ಸ್ಡ್ ಆಮ್ಟ್
 DocType: Clinical Procedure,Consumables Invoice Separately,ಗ್ರಾಹಕರ ಸರಕುಪಟ್ಟಿ ಪ್ರತ್ಯೇಕವಾಗಿ
+DocType: Shift Type,Working Hours Threshold for Absent,ಗೈರುಹಾಜರಿಗಾಗಿ ಕೆಲಸದ ಸಮಯ ಮಿತಿ
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},ಗುಂಪಿನ ಖಾತೆಗೆ ಬಜೆಟ್ ಅನ್ನು ನಿಯೋಜಿಸಲಾಗುವುದಿಲ್ಲ {0}
 DocType: Purchase Receipt Item,Rate and Amount,ದರ ಮತ್ತು ಮೊತ್ತ
@@ -377,7 +380,6 @@
 DocType: Healthcare Settings,Out Patient Settings,ರೋಗಿಯ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಔಟ್ ಮಾಡಿ
 DocType: Asset,Insurance End Date,ವಿಮಾ ಮುಕ್ತಾಯ ದಿನಾಂಕ
 DocType: Bank Account,Branch Code,ಶಾಖೆ ಕೋಡ್
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,ಪ್ರತಿಕ್ರಿಯಿಸಲು ಸಮಯ
 apps/erpnext/erpnext/public/js/conf.js,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
 DocType: Landed Cost Item,Landed Cost Item,ಭೂಮಿ ವೆಚ್ಚದ ಐಟಂ
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,ಮಾರಾಟಗಾರ ಮತ್ತು ಖರೀದಿದಾರರು ಒಂದೇ ಆಗಿರಬಾರದು
@@ -594,6 +596,7 @@
 DocType: Share Transfer,Transfer,ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),ಹುಡುಕಾಟ ಐಟಂ (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} ಫಲಿತಾಂಶವನ್ನು ಸಲ್ಲಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ದಿನಾಂಕದಿಂದ ಇಲ್ಲಿಯವರೆಗೆ ದೊಡ್ಡದಾಗಿರಬಾರದು
 DocType: Supplier,Supplier of Goods or Services.,ಸರಕು ಅಥವಾ ಸೇವೆಗಳ ಪೂರೈಕೆದಾರ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ಹೊಸ ಖಾತೆಯ ಹೆಸರು. ಗಮನಿಸಿ: ದಯವಿಟ್ಟು ಗ್ರಾಹಕರಿಗೆ ಮತ್ತು ಪೂರೈಕೆದಾರರಿಗಾಗಿ ಖಾತೆಗಳನ್ನು ರಚಿಸಬೇಡಿ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಅಥವಾ ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿ ಕಡ್ಡಾಯವಾಗಿದೆ
@@ -688,6 +691,7 @@
 DocType: Shipping Rule,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಮೊತ್ತ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Total Absent,ಒಟ್ಟು ಆಬ್ಸೆಂಟ್
 DocType: Fee Validity,Reference Inv,ರೆಫರೆನ್ಸ್ ಆಹ್ವಾನ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Row {0}: {1} is required to create the Opening {2} Invoices,ಆರಂಭಿಕ {2} ಇನ್‌ವಾಯ್ಸ್‌ಗಳನ್ನು ರಚಿಸಲು ಸಾಲು {0}: {1} ಅಗತ್ಯವಿದೆ
 DocType: Bank Account,Is Company Account,ಕಂಪನಿ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Do you want to notify all the customers by email?,ಎಲ್ಲಾ ಗ್ರಾಹಕರನ್ನು ಇಮೇಲ್ ಮೂಲಕ ತಿಳಿಸಲು ನೀವು ಬಯಸುವಿರಾ?
 DocType: Opening Invoice Creation Tool,Sales,ಮಾರಾಟ
@@ -707,6 +711,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html,ERPNext Demo,ERPNext ಡೆಮೊ
 DocType: Patient,Other Risk Factors,ಇತರೆ ಅಪಾಯಕಾರಿ ಅಂಶಗಳು
 DocType: Item Attribute,To Range,ರೇಂಜ್ಗೆ
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,{0} applicable after {1} working days,{1} ಕೆಲಸದ ದಿನಗಳ ನಂತರ {0} ಅನ್ವಯಿಸುತ್ತದೆ
 DocType: Task,Task Description,ಕಾರ್ಯ ವಿವರಣೆ
 DocType: Bank Account,SWIFT Number,ಸ್ವಿಫ್ಟ್ ಸಂಖ್ಯೆ
 DocType: Accounts Settings,Show Payment Schedule in Print,ಮುದ್ರಣದಲ್ಲಿ ಪಾವತಿ ವೇಳಾಪಟ್ಟಿ ತೋರಿಸಿ
@@ -887,6 +892,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್‌ಗೆ ಕಡ್ಡಾಯ
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ಹಂಚಿಕೆ ಮೊತ್ತ
 DocType: Sales Invoice,Get Advances Received,ಅಡ್ವಾನ್ಸಸ್ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
+DocType: Shift Type,Last Sync of Checkin,ಚೆಕ್ಇನ್ನ ಕೊನೆಯ ಸಿಂಕ್
 DocType: Student,B-,ಬಿ-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,ಮೌಲ್ಯದಲ್ಲಿ ಐಟಂ ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಸೇರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -895,7 +901,9 @@
 DocType: Student,Blood Group,ರಕ್ತ ಗುಂಪು
 apps/erpnext/erpnext/config/healthcare.py,Masters,ಮಾಸ್ಟರ್ಸ್
 DocType: Crop,Crop Spacing UOM,ಕ್ರಾಪ್ ಸ್ಪೇಸಿಂಗ್ UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,ಚೆಕ್-ಇನ್ ಅನ್ನು ತಡವಾಗಿ (ನಿಮಿಷಗಳಲ್ಲಿ) ಪರಿಗಣಿಸಿದಾಗ ಶಿಫ್ಟ್ ಪ್ರಾರಂಭದ ಸಮಯದ ನಂತರ.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,ಅನ್ವೇಷಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,ಯಾವುದೇ ಅತ್ಯುತ್ತಮ ಇನ್‌ವಾಯ್ಸ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} ಹುದ್ದೆಯ ಮತ್ತು {1} ಬಜೆಟ್ {2} ಈಗಾಗಲೇ {3} ನ ಅಂಗಸಂಸ್ಥೆ ಕಂಪೆನಿಗಳಿಗೆ ಯೋಜಿಸಲಾಗಿದೆ. \ ನೀವು ಪೋಷಕ ಕಂಪನಿಗೆ {3} ಸಿಬ್ಬಂದಿ ಯೋಜನೆ {6} ಪ್ರಕಾರ {4} ಹುದ್ದೆಯವರೆಗೆ ಮತ್ತು ಬಜೆಟ್ {5} ವರೆಗೆ ಮಾತ್ರ ಯೋಜಿಸಬಹುದು.
 DocType: Promotional Scheme,Product Discount Slabs,ಉತ್ಪನ್ನ ಡಿಸ್ಕೌಂಟ್ ಸ್ಲ್ಯಾಬ್ಗಳು
@@ -996,6 +1004,7 @@
 DocType: Item,Moving Average,ಸರಾಸರಿ ಸರಿಸಲಾಗುತ್ತಿದೆ
 DocType: Employee Attendance Tool,Unmarked Attendance,ಗುರುತಿಸದ ಹಾಜರಾತಿ
 DocType: Homepage Section,Number of Columns,ಕಾಲಮ್ಗಳ ಸಂಖ್ಯೆ
+DocType: Issue Priority,Issue Priority,ಸಂಚಿಕೆ ಆದ್ಯತೆ
 DocType: Holiday List,Add Weekly Holidays,ಸಾಪ್ತಾಹಿಕ ರಜಾದಿನಗಳನ್ನು ಸೇರಿಸಿ
 DocType: Shopify Log,Shopify Log,ಲಾಗ್ Shopify
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
@@ -1004,6 +1013,7 @@
 DocType: Warranty Claim,Issue Date,ಸಂಚಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ದಯವಿಟ್ಟು ಐಟಂಗಾಗಿ ಬ್ಯಾಚ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ {0}. ಈ ಅಗತ್ಯವನ್ನು ಪೂರೈಸುವ ಒಂದೇ ಬ್ಯಾಚ್ ಅನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,ಎಡ ನೌಕರರಿಗೆ ಧಾರಣ ಬೋನಸ್ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
+DocType: Employee Checkin,Location / Device ID,ಸ್ಥಳ / ಸಾಧನ ID
 DocType: Purchase Order,To Receive,ಸ್ವೀಕರಿಸಲು
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,ನೀವು ಆಫ್ಲೈನ್ ಮೋಡ್ನಲ್ಲಿರುವಿರಿ. ನೀವು ನೆಟ್ವರ್ಕ್ ಹೊಂದಿದವರೆಗೂ ನೀವು ಮರುಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
 DocType: Course Activity,Enrollment,ದಾಖಲಾತಿ
@@ -1012,7 +1022,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},ಗರಿಷ್ಠ: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ಇ-ಇನ್ವಾಯ್ಸಿಂಗ್ ಮಾಹಿತಿ ಕಾಣೆಯಾಗಿದೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ಯಾವುದೇ ವಸ್ತು ವಿನಂತಿಯು ರಚಿಸಲಾಗಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 DocType: Loan,Total Amount Paid,ಒಟ್ಟು ಮೊತ್ತ ಪಾವತಿಸಿದೆ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,ಈ ಎಲ್ಲ ವಸ್ತುಗಳನ್ನು ಈಗಾಗಲೇ ಇನ್ವಾಯ್ಸ್ ಮಾಡಲಾಗಿದೆ
 DocType: Training Event,Trainer Name,ತರಬೇತುದಾರ ಹೆಸರು
@@ -1122,6 +1131,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},ಲೀಡ್ನಲ್ಲಿರುವ ಲೀಡ್ ಹೆಸರು {0} ಅನ್ನು ದಯವಿಟ್ಟು ಗಮನಿಸಿ.
 DocType: Employee,You can enter any date manually,ನೀವು ಯಾವುದೇ ದಿನಾಂಕವನ್ನು ಹಸ್ತಚಾಲಿತವಾಗಿ ನಮೂದಿಸಬಹುದು
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
+DocType: Shift Type,Early Exit Consequence,ಆರಂಭಿಕ ನಿರ್ಗಮನ ಪರಿಣಾಮ
 DocType: Item Group,General Settings,ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,ಕಾರಣ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ / ಪೂರೈಕೆದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕದ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,ಸಲ್ಲಿಸುವ ಮೊದಲು ಫಲಾನುಭವಿಯ ಹೆಸರನ್ನು ನಮೂದಿಸಿ.
@@ -1160,6 +1170,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,ಹಣ ಪಾವತಿ ದೃಢೀಕರಣ
 ,Available Stock for Packing Items,ಐಟಂಗಳನ್ನು ಪ್ಯಾಕಿಂಗ್ ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},ದಯವಿಟ್ಟು C- ಫಾರ್ಮ್ {1} ನಿಂದ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ
+DocType: Shift Type,Every Valid Check-in and Check-out,ಪ್ರತಿ ಮಾನ್ಯ ಚೆಕ್-ಇನ್ ಮತ್ತು ಚೆಕ್- .ಟ್
 DocType: Support Search Source,Query Route String,ಪ್ರಶ್ನೆ ಮಾರ್ಗ ಸ್ಟ್ರಿಂಗ್
 DocType: Customer Feedback Template,Customer Feedback Template,ಗ್ರಾಹಕ ಪ್ರತಿಕ್ರಿಯೆ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,ಲೀಡ್ಸ್ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಉಲ್ಲೇಖಗಳು.
@@ -1194,6 +1205,7 @@
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ನಿಯಂತ್ರಣ
 ,Daily Work Summary Replies,ಡೈಲಿ ವರ್ಕ್ ಸಾರಾಂಶ ಪ್ರತ್ಯುತ್ತರಗಳನ್ನು
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},ಯೋಜನೆಯಲ್ಲಿ ಸಹಯೋಗಿಸಲು ನಿಮ್ಮನ್ನು ಆಹ್ವಾನಿಸಲಾಗಿದೆ: {0}
+DocType: Issue,Response By Variance,ವ್ಯತ್ಯಾಸದಿಂದ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,ಪತ್ರ ಮುದ್ರಣ ಟೆಂಪ್ಲೆಟ್ಗಳಿಗಾಗಿ ಮುಖ್ಯಸ್ಥರು.
 DocType: Salary Detail,Tax on additional salary,ಹೆಚ್ಚುವರಿ ಸಂಬಳದ ತೆರಿಗೆ
@@ -1317,10 +1329,12 @@
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
 DocType: Journal Entry,Opening Entry,ಪ್ರವೇಶ ಪ್ರವೇಶ
 DocType: Bank Guarantee,Charges Incurred,ಶುಲ್ಕಗಳು ಉಂಟಾಗಿದೆ
+DocType: Shift Type,Working Hours Calculation Based On,ಕೆಲಸದ ಸಮಯದ ಲೆಕ್ಕಾಚಾರವನ್ನು ಆಧರಿಸಿದೆ
 DocType: Work Order,Material Transferred for Manufacturing,ಉತ್ಪಾದನೆಗೆ ವಸ್ತು ವರ್ಗಾಯಿಸಲಾಗಿದೆ
 DocType: Products Settings,Hide Variants,ರೂಪಾಂತರಗಳನ್ನು ಮರೆಮಾಡಿ
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ಸಾಮರ್ಥ್ಯ ಯೋಜನೆ ಮತ್ತು ಸಮಯ ಟ್ರ್ಯಾಕಿಂಗ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ವ್ಯವಹಾರದಲ್ಲಿ ಲೆಕ್ಕ ಹಾಕಲಾಗುವುದು.
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} is required for 'Balance Sheet' account {1}.,&#39;ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್&#39; ಖಾತೆಗೆ {0} ಅಗತ್ಯವಿದೆ {1}.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,{0} not allowed to transact with {1}. Please change the Company.,{0} {1} ನೊಂದಿಗೆ ವರ್ಗಾವಣೆ ಮಾಡಲು ಅನುಮತಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಕಂಪನಿ ಬದಲಿಸಿ.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}","ಖರೀದಿಯ ಸೆಟ್ಟಿಂಗ್ಗಳ ಪ್ರಕಾರ ಖರೀದಿ ಮರುಪಡೆಯುವಿಕೆ ಅಗತ್ಯವಿದ್ದರೆ == &#39;ಹೌದು&#39;, ನಂತರ ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ರಚಿಸುವುದಕ್ಕಾಗಿ, ಐಟಂ {0} ಗಾಗಿ ಖರೀದಿಯ ರಸೀದಿವನ್ನು ಮೊದಲು ರಚಿಸಬೇಕಾಗಿದೆ."
 DocType: Delivery Trip,Delivery Details,ವಿತರಣಾ ವಿವರಗಳು
@@ -1345,6 +1359,7 @@
 DocType: Guardian,Interests,ಆಸಕ್ತಿಗಳು
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ಕ್ಯೂಟಿ ಬಳಕೆ
 DocType: Education Settings,Education Manager,ಶಿಕ್ಷಣ ನಿರ್ವಾಹಕ
+DocType: Employee Checkin,Shift Actual Start,ನಿಜವಾದ ಪ್ರಾರಂಭವನ್ನು ಬದಲಾಯಿಸಿ
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ಕಾರ್ಯಕ್ಷೇತ್ರದ ಕೆಲಸದ ಸಮಯದ ಹೊರಗೆ ಯೋಜನೆ ಸಮಯದ ದಾಖಲೆಗಳು.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},ಲಾಯಲ್ಟಿ ಪಾಯಿಂಟುಗಳು: {0}
 DocType: Healthcare Settings,Registration Message,ನೋಂದಣಿ ಸಂದೇಶ
@@ -1371,7 +1386,6 @@
 DocType: Purchase Invoice,Pricing Rules,ಬೆಲೆ ನಿಯಮಗಳು
 DocType: Hub Tracked Item,Image List,ಇಮೇಜ್ ಪಟ್ಟಿ
 DocType: Item Variant Settings,Allow Rename Attribute Value,ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯವನ್ನು ಮರುಹೆಸರಿಸಲು ಅನುಮತಿಸಿ
-DocType: Price List,Price Not UOM Dependant,ಬೆಲೆ UOM ಅವಲಂಬಿತವಲ್ಲ
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),ಸಮಯ (ನಿಮಿಷಗಳಲ್ಲಿ)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,ಮೂಲಭೂತ
 DocType: Loan,Interest Income Account,ಬಡ್ಡಿ ಆದಾಯ ಖಾತೆ
@@ -1381,6 +1395,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POS ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Support Settings,Get Latest Query,ಇತ್ತೀಚಿನ ಪ್ರಶ್ನೆ ಪಡೆಯಿರಿ
 DocType: Employee Incentive,Employee Incentive,ನೌಕರರ ಪ್ರೋತ್ಸಾಹ
+DocType: Service Level,Priorities,ಆದ್ಯತೆಗಳು
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,ಮುಖಪುಟದಲ್ಲಿ ಕಾರ್ಡ್ಗಳನ್ನು ಅಥವಾ ಕಸ್ಟಮ್ ವಿಭಾಗಗಳನ್ನು ಸೇರಿಸಿ
 DocType: Homepage,Hero Section Based On,ಹೀರೋ ವಿಭಾಗವು ಆಧರಿಸಿರುತ್ತದೆ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
@@ -1441,7 +1456,7 @@
 DocType: Blanket Order Item,Ordered Quantity,ಆದೇಶ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ಸಾಲು # {0}: ನಿರಾಕರಿಸಿದ ಐಟಂ ವಿರುದ್ಧ ತಿರಸ್ಕರಿಸಲಾದ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯವಾಗಿದೆ {1}
 ,Received Items To Be Billed,ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು ಬಿಲ್ ಮಾಡಲು
-DocType: Salary Slip Timesheet,Working Hours,ಕೆಲಸದ ಸಮಯ
+DocType: Attendance,Working Hours,ಕೆಲಸದ ಸಮಯ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,ಪಾವತಿ ಮೋಡ್
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,ಖರೀದಿ ಆರ್ಡರ್ ಐಟಂಗಳನ್ನು ಸಮಯಕ್ಕೆ ಸ್ವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,ದಿನಗಳಲ್ಲಿ ಅವಧಿ
@@ -1561,7 +1576,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,ನಿಮ್ಮ ಸರಬರಾಜುದಾರರ ಬಗ್ಗೆ ಶಾಸನಬದ್ಧ ಮಾಹಿತಿ ಮತ್ತು ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
 DocType: Item Default,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಸೆಲ್ಲಿಂಗ್ ವೆಚ್ಚ ಕೇಂದ್ರ
 DocType: Sales Partner,Address & Contacts,ವಿಳಾಸ &amp; ಸಂಪರ್ಕಗಳು
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Subscriber,Subscriber,ಚಂದಾದಾರ
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ಫಾರ್ಮ್ / ಐಟಂ / {0}) ಸ್ಟಾಕ್ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,ಪೋಸ್ಟ್ ದಿನಾಂಕವನ್ನು ಮೊದಲು ಆಯ್ಕೆಮಾಡಿ
@@ -1572,7 +1586,7 @@
 DocType: Detected Disease,Tasks Created,ಕಾರ್ಯಗಳು ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ಗಾಗಿ ಸಕ್ರಿಯವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,ಕಮೀಷನ್ ದರ%
-DocType: Service Level,Response Time,ಪ್ರತಿಕ್ರಿಯೆ ಸಮಯ
+DocType: Service Level Priority,Response Time,ಪ್ರತಿಕ್ರಿಯೆ ಸಮಯ
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,ಪ್ರಮಾಣ ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
 DocType: Contract,CRM,ಸಿಆರ್ಎಂ
@@ -1589,7 +1603,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,ವ್ಯವಹಾರ ಡೇಟಾ ಮ್ಯಾಪಿಂಗ್
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,ಲೀಡ್ಗೆ ಒಬ್ಬ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಅಥವಾ ಸಂಸ್ಥೆಯ ಹೆಸರು ಬೇಕಾಗುತ್ತದೆ
 DocType: Student,Guardians,ಗಾರ್ಡಿಯನ್ಸ್
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ಬ್ರ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,ಮಧ್ಯಮ ಆದಾಯ
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿ ಲೆಕ್ಕಾಚಾರ
@@ -1689,7 +1702,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ರಾ ಮೆಟೀರಿಯಲ್ ಐಟಂ ಕೋಡ್
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Fees,Student Email,ವಿದ್ಯಾರ್ಥಿ ಇಮೇಲ್
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM ರಿಕರ್ಶನ್: {0} ಪೋಷಕ ಅಥವಾ ಮಗುವಿನ {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,ಆರೋಗ್ಯ ಸೇವೆಗಳಿಂದ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅನ್ನು ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ
 DocType: Item Attribute Value,Item Attribute Value,ಐಟಂ ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ
@@ -1714,7 +1726,6 @@
 DocType: Production Plan,Select Items to Manufacture,ಉತ್ಪಾದನೆಗೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Leave Application,Leave Approver Name,ಅಪ್ರೋವರ್ ಹೆಸರನ್ನು ಬಿಡಿ
 DocType: Shareholder,Shareholder,ಷೇರುದಾರ
-DocType: Issue,Agreement Status,ಒಪ್ಪಂದದ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,ವ್ಯವಹಾರಗಳನ್ನು ಮಾರಾಟ ಮಾಡಲು ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,ವಿದ್ಯಾರ್ಥಿಗಳ ಅರ್ಜಿದಾರರಿಗೆ ಕಡ್ಡಾಯವಾಗಿರುವ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM ಆಯ್ಕೆಮಾಡಿ
@@ -1975,6 +1986,7 @@
 DocType: Account,Income Account,ವರಮಾನ ಖಾತೆ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,ಎಲ್ಲಾ ಗೋದಾಮುಗಳು
 DocType: Contract,Signee Details,ಸಿಗ್ನಿ ವಿವರಗಳು
+DocType: Shift Type,Allow check-out after shift end time (in minutes),ಶಿಫ್ಟ್ ಅಂತಿಮ ಸಮಯದ ನಂತರ (ನಿಮಿಷಗಳಲ್ಲಿ) ಚೆಕ್- out ಟ್ ಮಾಡಲು ಅನುಮತಿಸಿ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,ಖರೀದಿ
 DocType: Item Group,Check this if you want to show in website,ನೀವು ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ತೋರಿಸಲು ಬಯಸಿದರೆ ಇದನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಕಂಡುಬಂದಿಲ್ಲ
@@ -2040,6 +2052,7 @@
 DocType: Activity Cost,Billing Rate,ಬಿಲ್ಲಿಂಗ್ ದರ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},ಎಚ್ಚರಿಕೆ: ಮತ್ತೊಂದು {0} # {1} ಸ್ಟಾಕ್ ನಮೂದನ್ನು ಎದುರಿಸಿದೆ {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,ಮಾರ್ಗಸೂಚಿಯನ್ನು ಅಂದಾಜು ಮಾಡಲು ಮತ್ತು ಉತ್ತಮಗೊಳಿಸಲು Google ನಕ್ಷೆಗಳ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
+DocType: Purchase Invoice Item,Page Break,ಪುಟ ಬ್ರೇಕ್
 DocType: Supplier Scorecard Criteria,Max Score,ಗರಿಷ್ಠ ಸ್ಕೋರ್
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,ಮರುಪಾವತಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕವನ್ನು ವಿತರಣೆ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Support Search Source,Support Search Source,ಹುಡುಕಾಟ ಮೂಲವನ್ನು ಬೆಂಬಲಿಸು
@@ -2108,6 +2121,7 @@
 DocType: Employee Transfer,Employee Transfer,ಉದ್ಯೋಗಿ ವರ್ಗಾವಣೆ
 ,Sales Funnel,ಮಾರಾಟದ ಸುರಂಗ
 DocType: Agriculture Analysis Criteria,Water Analysis,ನೀರಿನ ವಿಶ್ಲೇಷಣೆ
+DocType: Shift Type,Begin check-in before shift start time (in minutes),ಶಿಫ್ಟ್ ಪ್ರಾರಂಭದ ಸಮಯದ ಮೊದಲು (ನಿಮಿಷಗಳಲ್ಲಿ) ಚೆಕ್-ಇನ್ ಪ್ರಾರಂಭಿಸಿ
 DocType: Accounts Settings,Accounts Frozen Upto,ಖಾತೆಗಳು ಫ್ರೋಜನ್ ವರೆಗೆ
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ಕಾರ್ಯಸ್ಥಳ {1} ನಲ್ಲಿ ಲಭ್ಯವಿರುವ ಯಾವುದೇ ಕೆಲಸದ ಸಮಯಕ್ಕಿಂತಲೂ ಆಪರೇಷನ್ {0} ಉದ್ದವಾಗಿದೆ, ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಬಹು ಕಾರ್ಯಾಚರಣೆಗಳಾಗಿ ವಿಭಜಿಸುತ್ತದೆ"
@@ -2121,7 +2135,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},ಮಾರಾಟದ ಆದೇಶ {0} ಆಗಿದೆ {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,ಸವಕಳಿ ವಿವರಗಳನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,ಗ್ರಾಹಕ ಪಿಒ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಮಾರಾಟದ ಆದೇಶದ ದಿನಾಂಕದ ನಂತರ ಇರಬೇಕು
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,ಐಟಂ ಪ್ರಮಾಣ ಶೂನ್ಯವಾಗಿರಬಾರದು
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},ದಯವಿಟ್ಟು ಐಟಂನ ವಿರುದ್ಧ BOM ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
@@ -2131,6 +2147,7 @@
 DocType: Volunteer,Afternoon,ಮಧ್ಯಾಹ್ನ
 DocType: Vital Signs,Nutrition Values,ನ್ಯೂಟ್ರಿಷನ್ ಮೌಲ್ಯಗಳು
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ಜ್ವರದ ಉಪಸ್ಥಿತಿ (ಟೆಂಪ್&gt; 38.5 ° C / 101.3 ° F ಅಥವಾ ನಿರಂತರ ತಾಪಮಾನವು&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ಐಟಿಸಿ ರಿವರ್ಸ್ಡ್
 DocType: Project,Collect Progress,ಪ್ರೋಗ್ರೆಸ್ ಸಂಗ್ರಹಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ಶಕ್ತಿ
@@ -2180,6 +2197,7 @@
 ,Ordered Items To Be Billed,ಆದೇಶಿಸಿದ ಐಟಂಗಳನ್ನು ಬಿಲ್ ಮಾಡಿ
 DocType: Taxable Salary Slab,To Amount,ಮೊತ್ತಕ್ಕೆ
 DocType: Purchase Invoice,Is Return (Debit Note),ರಿಟರ್ನ್ (ಡೆಬಿಟ್ ಸೂಚನೆ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/config/desktop.py,Getting Started,ಶುರುವಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ವಿಲೀನಗೊಳ್ಳಲು
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಉಳಿಸಿದ ನಂತರ ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕವನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ.
@@ -2200,6 +2218,7 @@
 DocType: Purchase Invoice,Select Supplier Address,ಪೂರೈಕೆದಾರ ವಿಳಾಸವನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,ದಯವಿಟ್ಟು API ಗ್ರಾಹಕ ರಹಸ್ಯವನ್ನು ನಮೂದಿಸಿ
 DocType: Program Enrollment Fee,Program Enrollment Fee,ಪ್ರೋಗ್ರಾಂ ದಾಖಲಾತಿ ಶುಲ್ಕ
+DocType: Employee Checkin,Shift Actual End,ನಿಜವಾದ ಅಂತ್ಯವನ್ನು ಬದಲಾಯಿಸಿ
 DocType: Serial No,Warranty Expiry Date,ಖಾತರಿ ಅವಧಿ ದಿನಾಂಕ
 DocType: Hotel Room Pricing,Hotel Room Pricing,ಹೋಟೆಲ್ ರೂಂ ಬೆಲೆ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","ಹೊರಗಣ ತೆರಿಗೆ ಮಾಡಬಹುದಾದ ಸರಬರಾಜುಗಳು (ಶೂನ್ಯ ದರದ ಹೊರತಾಗಿ, ರೇಟ್ ಮಾಡದ ಮತ್ತು ವಿನಾಯಿತಿ ಮಾಡಲಾಗುವುದಿಲ್ಲ"
@@ -2259,6 +2278,7 @@
 DocType: Quality Inspection Reading,Reading 5,ಓದುವಿಕೆ 5
 DocType: Shopping Cart Settings,Display Settings,ಪ್ರದರ್ಶನ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಬುಕ್ ಮಾಡಲಾದ ಸಂಖ್ಯೆಗಳ ಸಂಖ್ಯೆಯನ್ನು ನಿಗದಿಪಡಿಸಿ
+DocType: Shift Type,Consequence after,ನಂತರದ ಪರಿಣಾಮ
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,ನಿಮಗೆ ಯಾವ ಸಹಾಯ ಬೇಕು?
 DocType: Journal Entry,Printing Settings,ಮುದ್ರಣ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ಬ್ಯಾಂಕಿಂಗ್
@@ -2268,6 +2288,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸವು ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸದಂತೆ ಇರುತ್ತದೆ
 DocType: Account,Cash,ನಗದು
 DocType: Employee,Leave Policy,ಪಾಲಿಸಿಯನ್ನು ಬಿಡಿ
+DocType: Shift Type,Consequence,ಪರಿಣಾಮ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,ವಿದ್ಯಾರ್ಥಿ ವಿಳಾಸ
 DocType: GST Account,CESS Account,CESS ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,"While creating account for child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA","ಮಗುವಿನ ಕಂಪನಿ {0} ಖಾತೆ ರಚಿಸುವಾಗ, ಮೂಲ ಖಾತೆ {1} ಕಂಡುಬಂದಿಲ್ಲ. ದಯವಿಟ್ಟು ಸಂಬಂಧಿಸಿದ COA ನಲ್ಲಿ ಪೋಷಕ ಖಾತೆಯನ್ನು ರಚಿಸಿ"
@@ -2331,6 +2352,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,ಅವಧಿ ಮುಕ್ತಾಯದ ಚೀಟಿ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,ಗಾರ್ಡಿಯನ್ 2 ಹೆಸರು
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,ದಯವಿಟ್ಟು ಖರ್ಚು ಖಾತೆ ನಮೂದಿಸಿ
+DocType: Issue,Resolution By Variance,ವ್ಯತ್ಯಾಸದಿಂದ ನಿರ್ಣಯ
 DocType: Employee,Resignation Letter Date,ರಾಜೀನಾಮೆ ಪತ್ರ ದಿನಾಂಕ
 DocType: Soil Texture,Sandy Clay,ಸ್ಯಾಂಡಿ ಕ್ಲೇ
 DocType: Upload Attendance,Attendance To Date,ಹಾಜರಾತಿಗೆ ದಿನಾಂಕ
@@ -2343,6 +2365,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,ಈಗ ವೀಕ್ಷಿಸಿ
 DocType: Item Price,Valid Upto,ವರೆಗೆ ಮಾನ್ಯ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},ಉಲ್ಲೇಖ ಡಾಕ್ಟೈಪ್ {0}
+DocType: Employee Checkin,Skip Auto Attendance,ಸ್ವಯಂ ಹಾಜರಾತಿಯನ್ನು ಬಿಟ್ಟುಬಿಡಿ
 DocType: Payment Request,Transaction Currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ
 DocType: Loan,Repayment Schedule,ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,ಮಾದರಿ ಧಾರಣ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ರಚಿಸಿ
@@ -2414,6 +2437,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,ಪಿಓಎಸ್ ವೂಚರ್ ತೆರಿಗೆಗಳನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸುತ್ತದೆ
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,ಆಕ್ಷನ್ ಪ್ರಾರಂಭಿಸಲಾಗಿದೆ
 DocType: POS Profile,Applicable for Users,ಬಳಕೆದಾರರಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
+,Delayed Order Report,ವಿಳಂಬ ಆದೇಶ ವರದಿ
 DocType: Training Event,Exam,ಪರೀಕ್ಷೆ
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ತಪ್ಪಾದ ಸಂಖ್ಯೆಯ ಜನರಲ್ ಲೆಡ್ಜರ್ ನಮೂದುಗಳು ಕಂಡುಬಂದಿವೆ. ನೀವು ವಹಿವಾಟಿನಲ್ಲಿ ತಪ್ಪು ಖಾತೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿರಬಹುದು.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
@@ -2428,10 +2452,10 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,ಸಂಯೋಜಿಸಲಾದ ಎಲ್ಲಾ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂಗಳಲ್ಲಿ ನಿಯಮಗಳು ಅನ್ವಯವಾಗುತ್ತವೆ.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,ಕಾನ್ಫಿಗರ್ ಮಾಡಿ
 DocType: Hotel Room,Capacity,ಸಾಮರ್ಥ್ಯ
+DocType: Employee Checkin,Shift End,ಶಿಫ್ಟ್ ಎಂಡ್
 DocType: Installation Note Item,Installed Qty,Qty ಸ್ಥಾಪಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,ಐಟಂ {1} ದ ಬ್ಯಾಚ್ {0} ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ.
 DocType: Hotel Room Reservation,Hotel Reservation User,ಹೋಟೆಲ್ ಮೀಸಲಾತಿ ಬಳಕೆದಾರ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,ಕೆಲಸದ ದಿನವನ್ನು ಎರಡು ಬಾರಿ ಪುನರಾವರ್ತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},ಐಟಂ ಗ್ರೂಪ್ನಲ್ಲಿ item master ನಲ್ಲಿ ಉಲ್ಲೇಖಿಸಲಾಗಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},ಹೆಸರು ದೋಷ: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,ಪ್ರದೇಶವು POS ಪ್ರೊಫೈಲ್ನಲ್ಲಿ ಅಗತ್ಯವಿದೆ
@@ -2479,6 +2503,7 @@
 DocType: Depreciation Schedule,Schedule Date,ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
 DocType: Job Applicant,Job Opening,ಉದ್ಯೋಗಾವಕಾಶದ
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,ನೌಕರರ ಚೆಕ್ಇನ್‌ನ ಕೊನೆಯ ತಿಳಿದಿರುವ ಯಶಸ್ವಿ ಸಿಂಕ್. ಎಲ್ಲಾ ಲಾಗ್‌ಗಳನ್ನು ಎಲ್ಲಾ ಸ್ಥಳಗಳಿಂದ ಸಿಂಕ್ ಮಾಡಲಾಗಿದೆ ಎಂದು ನಿಮಗೆ ಖಚಿತವಾಗಿದ್ದರೆ ಮಾತ್ರ ಇದನ್ನು ಮರುಹೊಂದಿಸಿ. ನಿಮಗೆ ಖಚಿತವಿಲ್ಲದಿದ್ದರೆ ದಯವಿಟ್ಟು ಇದನ್ನು ಮಾರ್ಪಡಿಸಬೇಡಿ.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,ವಾಸ್ತವಿಕ ವೆಚ್ಚ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ಆರ್ಡರ್ {1} ವಿರುದ್ಧ ಒಟ್ಟು ಮುಂಗಡ ({0}) ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,ಐಟಂ ರೂಪಾಂತರಗಳು ನವೀಕರಿಸಲಾಗಿದೆ
@@ -2523,6 +2548,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,ಆಕ್ರಮಣಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Tally Migration,Is Day Book Data Imported,ದಿನ ಪುಸ್ತಕ ಡೇಟಾ ಆಮದು ಮಾಡಲಾಗಿದೆ
 ,Sales Partners Commission,ಮಾರಾಟ ಪಾಲುದಾರರ ಆಯೋಗ
+DocType: Shift Type,Enable Different Consequence for Early Exit,ಆರಂಭಿಕ ನಿರ್ಗಮನಕ್ಕಾಗಿ ವಿಭಿನ್ನ ಪರಿಣಾಮಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,ಕಾನೂನು
 DocType: Loan Application,Required by Date,ದಿನಾಂಕದ ಅಗತ್ಯವಿದೆ
 DocType: Quiz Result,Quiz Result,ರಸಪ್ರಶ್ನೆ ಫಲಿತಾಂಶ
@@ -2582,7 +2608,6 @@
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ನಿಯಮ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},ಐಚ್ಛಿಕ ಹಾಲಿಡೇ ಪಟ್ಟಿ ರಜೆಯ ಅವಧಿಯನ್ನು ಹೊಂದಿಸುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,ನೌಕರರ ಪಾತ್ರವನ್ನು ಹೊಂದಿಸಲು ನೌಕರರ ದಾಖಲೆ ಯಲ್ಲಿ ಬಳಕೆದಾರ ID ಕ್ಷೇತ್ರವನ್ನು ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,ಪರಿಹರಿಸಲು ಸಮಯ
 DocType: Training Event,Training Event,ತರಬೇತಿ ಕಾರ್ಯಕ್ರಮ
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","ವಯಸ್ಕರಲ್ಲಿ ಸಾಮಾನ್ಯವಾದ ವಿಶ್ರಾಂತಿ ರಕ್ತದೊತ್ತಡ ಸುಮಾರು 120 mmHg ಸಂಕೋಚನ, ಮತ್ತು 80 mmHg ಡಯಾಸ್ಟೊಲಿಕ್, ಸಂಕ್ಷಿಪ್ತ &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,ಮಿತಿ ಮೌಲ್ಯವು ಶೂನ್ಯವಾಗಿದ್ದರೆ ಸಿಸ್ಟಮ್ ಎಲ್ಲಾ ನಮೂದುಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳುತ್ತದೆ.
@@ -2626,6 +2651,7 @@
 DocType: Student Applicant,Approved,ಅನುಮೋದಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},ದಿನಾಂಕದಿಂದ ಹಣಕಾಸಿನ ವರ್ಷದೊಳಗೆ ಇರಬೇಕು. ದಿನಾಂಕದಿಂದ ಊಹಿಸಲಾಗುತ್ತಿದೆ = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,ದಯವಿಟ್ಟು ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಖರೀದಿಸಲು ಸರಬರಾಜುದಾರ ಗುಂಪನ್ನು ಹೊಂದಿಸಿ.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,}} ಅಮಾನ್ಯ ಹಾಜರಾತಿ ಸ್ಥಿತಿ.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ತಾತ್ಕಾಲಿಕ ತೆರೆಯುವ ಖಾತೆ
 DocType: Purchase Invoice,Cash/Bank Account,ನಗದು / ಬ್ಯಾಂಕ್ ಖಾತೆ
 DocType: Quality Meeting Table,Quality Meeting Table,ಗುಣಮಟ್ಟ ಸಭೆ ಪಟ್ಟಿ
@@ -2661,6 +2687,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ಆಹಾರ, ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,ಕೋರ್ಸ್ ವೇಳಾಪಟ್ಟಿ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ್ ತೆರಿಗೆ ವಿವರ
+DocType: Shift Type,Attendance will be marked automatically only after this date.,ಈ ದಿನಾಂಕದ ನಂತರ ಮಾತ್ರ ಹಾಜರಾತಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಗುರುತಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,UIN ಹೊಂದಿರುವವರಿಗೆ ಪೂರೈಕೆ
 apps/erpnext/erpnext/hooks.py,Request for Quotations,ಉಲ್ಲೇಖಗಳಿಗಾಗಿ ವಿನಂತಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,ಕೆಲವು ಕರೆನ್ಸಿಯನ್ನು ಬಳಸಿಕೊಂಡು ನಮೂದುಗಳನ್ನು ಮಾಡಿದ ನಂತರ ಕರೆನ್ಸಿಯನ್ನು ಬದಲಾಯಿಸಲಾಗುವುದಿಲ್ಲ
@@ -2927,7 +2954,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,ಇದು ಈ ಸರಬರಾಜುದಾರರ ವಿರುದ್ಧ ವ್ಯವಹಾರಗಳನ್ನು ಆಧರಿಸಿದೆ. ವಿವರಗಳಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,ಒಪ್ಪಂದಕ್ಕೆ ಪ್ರಾರಂಭ ಮತ್ತು ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ.
 DocType: Delivery Note Item,Against Sales Invoice,ಮಾರಾಟದ ಸರಕುಗಳ ವಿರುದ್ಧ
 DocType: Loyalty Point Entry,Purchase Amount,ಖರೀದಿ ಮೊತ್ತ
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದಂತೆ ಲಾಸ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗುವುದಿಲ್ಲ.
@@ -2951,7 +2977,7 @@
 DocType: Lead,Organization Name,ಸಂಸ್ಥೆ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,ಕ್ಷೇತ್ರದಿಂದ ಮಾನ್ಯವಾದ ಮತ್ತು ಮಾನ್ಯ ವರೆಗೆ ಕಡ್ಡಾಯವಾಗಿ ಕಡ್ಡಾಯವಾಗಿದೆ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},ಸಾಲು # {0}: ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ {1} {2}
-DocType: Employee,Leave Details,ವಿವರಗಳನ್ನು ಬಿಡಿ
+DocType: Employee Checkin,Shift Start,ಶಿಫ್ಟ್ ಪ್ರಾರಂಭ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವಹಿವಾಟುಗಳು ಫ್ರೀಜ್ ಆಗಿದೆ
 DocType: Driver,Issuing Date,ವಿತರಿಸುವ ದಿನಾಂಕ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,ಕೋರಿಕೆ
@@ -2996,9 +3022,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ಕ್ಯಾಶ್ ಫ್ಲೋ ಮ್ಯಾಪಿಂಗ್ ಟೆಂಪ್ಲೇಟು ವಿವರಗಳು
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,ನೇಮಕಾತಿ ಮತ್ತು ತರಬೇತಿ
 DocType: Drug Prescription,Interval UOM,ಮಧ್ಯಂತರ UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,ಸ್ವಯಂ ಹಾಜರಾತಿಗಾಗಿ ಗ್ರೇಸ್ ಅವಧಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ಕರೆನ್ಸಿ ಮತ್ತು ಕರೆನ್ಸಿಗೆ ಒಂದೇ ಆಗಿರಬಾರದು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,ಫಾರ್ಮಾಸ್ಯುಟಿಕಲ್ಸ್
 DocType: Employee,HR-EMP-,ಮಾನವ ಸಂಪನ್ಮೂಲ- EMP-
+DocType: Service Level,Support Hours,ಬೆಂಬಲ ಸಮಯಗಳು
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} ಅನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಅಥವಾ ಮುಚ್ಚಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ಸಾಲು {0}: ಗ್ರಾಹಕರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಕ್ರೆಡಿಟ್ ಆಗಿರಬೇಕು
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),ಗ್ರೂಪ್ ಬೈ ಚೀಟಿ (ಕನ್ಸಾಲಿಡೇಟೆಡ್)
@@ -3108,6 +3136,7 @@
 DocType: Territory,Territory Manager,ಪ್ರದೇಶ ನಿರ್ವಾಹಕ
 DocType: Lab Test,Sample ID,ಮಾದರಿ ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,ನೌಕರರ ಚೆಕ್-ಇನ್‌ಗಳ ಪ್ರಕಾರ ಹಾಜರಾತಿಯನ್ನು ಗುರುತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,ಆಸ್ತಿ {0} ಅನ್ನು ಸಲ್ಲಿಸಬೇಕು
 ,Absent Student Report,ಆಬ್ಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ವರದಿ
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,ಒಟ್ಟು ಲಾಭದಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ
@@ -3115,7 +3144,9 @@
 DocType: Travel Request Costing,Funded Amount,ಹಣದ ಮೊತ್ತ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ಅನ್ನು ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ ಆದ್ದರಿಂದ ಕ್ರಿಯೆಯನ್ನು ಪೂರ್ಣಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Subscription,Trial Period End Date,ಪ್ರಯೋಗ ಅವಧಿ ಅಂತ್ಯ ದಿನಾಂಕ
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,ಒಂದೇ ಶಿಫ್ಟ್ ಸಮಯದಲ್ಲಿ ನಮೂದುಗಳನ್ನು IN ಮತ್ತು OUT
 DocType: BOM Update Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,ಐಟಂ 5
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,ತಾತ್ಕಾಲಿಕ ತೆರೆಯುವಿಕೆ
@@ -3218,6 +3249,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ಸಾಲು {0}: BOM # {1} ನ ಕರೆನ್ಸಿ ಆಯ್ಕೆಮಾಡಿದ ಕರೆನ್ಸಿಗೆ ಸಮಾನವಾಗಿರುತ್ತದೆ {2}
 DocType: Pricing Rule,Product,ಉತ್ಪನ್ನ
 apps/erpnext/erpnext/controllers/item_variant.py,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ಗುಣಲಕ್ಷಣ {1} ಗೆ ಮೌಲ್ಯ {0} ಐಟಂಗಾಗಿ ಮಾನ್ಯ ಐಟಂ ಲಕ್ಷಣ ಮೌಲ್ಯಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ {2}
+apps/erpnext/erpnext/utilities/bot.py,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),[{2}] (# ಫಾರ್ಮ್ / ಗೋದಾಮು / {2}) ನಲ್ಲಿ ಕಂಡುಬರುವ [{1}] (# ಫಾರ್ಮ್ / ಐಟಂ / {1}) {0} ಘಟಕಗಳು
 DocType: Vital Signs,Weight (In Kilogram),ತೂಕ (ಕಿಲೋಗ್ರಾಂನಲ್ಲಿ)
 DocType: Department,Leave Approver,ಅನುಮೋದನೆಯನ್ನು ಬಿಡಿ
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್
@@ -3229,6 +3261,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,ಸಂಭಾವ್ಯ ಪೂರೈಕೆದಾರ
 ,Issued Items Against Work Order,ಕೆಲಸದ ಆದೇಶಕ್ಕೆ ವಿರುದ್ಧವಾಗಿ ನೀಡಿರುವ ಐಟಂಗಳು
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ಸರಕುಪಟ್ಟಿ ರಚಿಸಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 DocType: Student,Joining Date,ಸೇರುವ ದಿನಾಂಕ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,ಸೈಟ್ಗೆ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ
 DocType: Purchase Invoice,Against Expense Account,ಖರ್ಚು ಖಾತೆಗೆ ವಿರುದ್ಧವಾಗಿ
@@ -3268,6 +3301,7 @@
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಶುಲ್ಕಗಳು
 ,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಮಾರಾಟ
 DocType: Authorization Rule,Approving User  (above authorized value),ಅನುಮೋದಿಸುವ ಬಳಕೆದಾರ (ಅಧಿಕೃತ ಮೌಲ್ಯದ ಮೇಲೆ)
+DocType: Service Level Agreement,Entity,ಅಸ್ತಿತ್ವ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} {2} ರಿಂದ {3} ಕ್ಕೆ ವರ್ಗಾಯಿಸಲಾದ ಮೊತ್ತ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಪ್ರಾಜೆಕ್ಟ್ಗೆ ಸೇರಿಲ್ಲ {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,ಪಕ್ಷದ ಹೆಸರು
@@ -3370,7 +3404,6 @@
 DocType: Asset,Asset Owner,ಆಸ್ತಿ ಮಾಲೀಕ
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},ಸಾಲು {1} ನಲ್ಲಿ ಸ್ಟಾಕ್ ಐಟಂ {0} ಗಾಗಿ ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯವಾಗಿದೆ.
 DocType: Stock Entry,Total Additional Costs,ಒಟ್ಟು ಹೆಚ್ಚುವರಿ ವೆಚ್ಚಗಳು
-DocType: Marketplace Settings,Last Sync On,ಕೊನೆಯ ಸಿಂಕ್ ಆನ್
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,ತೆರಿಗೆಗಳು ಮತ್ತು ಚಾರ್ಜಸ್ ಟೇಬಲ್ನಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಸಾಲನ್ನು ಹೊಂದಿಸಿ
 DocType: Asset Maintenance Team,Maintenance Team Name,ನಿರ್ವಹಣೆ ತಂಡದ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,ವೆಚ್ಚ ಕೇಂದ್ರಗಳ ಚಾರ್ಟ್
@@ -3386,12 +3419,12 @@
 DocType: Job Card,WIP Warehouse,ಡಬ್ಲ್ಯೂಐಪಿ ವೇರ್ಹೌಸ್
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ಎಸಿಸಿ- PRQ- .YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ಉದ್ಯೋಗಿ {0} ಗಾಗಿ ಬಳಕೆದಾರ ID ಅನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","ಲಭ್ಯವಿರುವ qty {0} ಆಗಿದೆ, ನಿಮಗೆ {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,ಬಳಕೆದಾರ {0} ರಚಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Item Naming By,ಐಟಂ ಹೆಸರಿಸುವಿಕೆ
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,ಆದೇಶಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ಇದು ರೂಟ್ ಗ್ರಾಹಕರ ಗುಂಪಾಗಿದೆ ಮತ್ತು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,ವಸ್ತು ವಿನಂತಿ {0} ಅನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ ಅಥವಾ ನಿಲ್ಲಿಸಲಾಗಿದೆ
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,ನೌಕರರ ಚೆಕ್‌ಇನ್‌ನಲ್ಲಿ ಲಾಗ್ ಪ್ರಕಾರವನ್ನು ಕಟ್ಟುನಿಟ್ಟಾಗಿ ಆಧರಿಸಿದೆ
 DocType: Purchase Order Item Supplied,Supplied Qty,ಸರಬರಾಜು ಮಾಡಿದ ಕ್ಯೂಟಿ
 DocType: Cash Flow Mapper,Cash Flow Mapper,ಕ್ಯಾಶ್ ಫ್ಲೋ ಮ್ಯಾಪರ್
 DocType: Soil Texture,Sand,ಮರಳು
@@ -3450,6 +3483,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,ಐಟಂ ಗ್ರೂಪ್ ಟೇಬಲ್ನಲ್ಲಿ ನಕಲಿ ಐಟಂ ಗುಂಪು ಕಂಡುಬರುತ್ತದೆ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,ವಾರ್ಷಿಕ ವೇತನ
 DocType: Supplier Scorecard,Weighting Function,ತೂಕ ನಷ್ಟ ಕ್ರಿಯೆ
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,ಮಾನದಂಡ ಸೂತ್ರವನ್ನು ಮೌಲ್ಯಮಾಪನ ಮಾಡುವಲ್ಲಿ ದೋಷ
 ,Lab Test Report,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ವರದಿ
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆಗಳೊಂದಿಗೆ
@@ -3475,9 +3509,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,ಗ್ರಾಹಕನಿಗೆ ಬಹು ಲಾಯಲ್ಟಿ ಕಾರ್ಯಕ್ರಮ ಕಂಡುಬಂದಿದೆ. ದಯವಿಟ್ಟು ಹಸ್ತಚಾಲಿತವಾಗಿ ಆಯ್ಕೆಮಾಡಿ.
 DocType: Patient,Medication,ಔಷಧಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,ಲಾಯಲ್ಟಿ ಪ್ರೋಗ್ರಾಂ ಆಯ್ಕೆಮಾಡಿ
+DocType: Employee Checkin,Attendance Marked,ಹಾಜರಾತಿ ಗುರುತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,ಕಚ್ಚಾ ವಸ್ತುಗಳು
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಬಿಲ್ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},ಹೋಟೆಲ್ ಕೊಠಡಿ ದರವನ್ನು ದಯವಿಟ್ಟು {@} ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,ಡೀಫಾಲ್ಟ್ ಆಗಿ ಕೇವಲ ಒಂದು ಆದ್ಯತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},ದಯವಿಟ್ಟು ಕೌಟುಂಬಿಕತೆಗಾಗಿ ಖಾತೆಯನ್ನು (ಲೆಡ್ಜರ್) ಗುರುತಿಸಿ / ರಚಿಸಿ - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,ಲಿಂಕ್ಡ್ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಯಂತೆ ಒಟ್ಟು ಕ್ರೆಡಿಟ್ / ಡೆಬಿಟ್ ಮೊತ್ತವು ಇರಬೇಕು
 DocType: Purchase Invoice Item,Is Fixed Asset,ಸ್ಥಿರ ಆಸ್ತಿ ಇದೆ
@@ -3498,6 +3534,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,ನೇಮಕಾತಿ ದೃಢೀಕರಣ
 DocType: Shopping Cart Settings,Orders,ಆದೇಶಗಳು
 DocType: HR Settings,Retirement Age,ನಿವೃತ್ತಿ ವಯಸ್ಸು
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,ಯೋಜಿತ Qty
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ದೇಶಕ್ಕಾಗಿ {0} ಅಳಿಸುವಿಕೆಗೆ ಅನುಮತಿ ಇಲ್ಲ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},ಸಾಲು # {0}: ಸ್ವತ್ತು {1} ಈಗಾಗಲೇ {2} ಆಗಿದೆ
@@ -3581,11 +3618,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,ಅಕೌಂಟೆಂಟ್
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},ಪಿಓಎಸ್ ಕ್ಲೋಸಿಂಗ್ ವೋಚರ್ ಅಲ್ಡೆರೆ ದಿನಾಂಕಕ್ಕೆ {0} ಮತ್ತು {2} ನಡುವೆ {0}
 apps/erpnext/erpnext/config/help.py,Navigating,ನ್ಯಾವಿಗೇಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,ಯಾವುದೇ ಬಾಕಿ ಇನ್‌ವಾಯ್ಸ್‌ಗಳಿಗೆ ವಿನಿಮಯ ದರ ಮರುಮೌಲ್ಯಮಾಪನ ಅಗತ್ಯವಿಲ್ಲ
 DocType: Authorization Rule,Customer / Item Name,ಗ್ರಾಹಕ / ಐಟಂ ಹೆಸರು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ಸಂಖ್ಯೆಗೆ ವೇರ್ಹೌಸ್ ಇರಬಾರದು. ವೇರ್ಹೌಸ್ ಅನ್ನು ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಅಥವಾ ಖರೀದಿ ರಶೀದಿ ಹೊಂದಿಸಬೇಕು
 DocType: Issue,Via Customer Portal,ಗ್ರಾಹಕರ ಪೋರ್ಟಲ್ ಮೂಲಕ
 DocType: Work Order Operation,Planned Start Time,ಯೋಜಿತ ಪ್ರಾರಂಭ ಸಮಯ
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2}
+DocType: Service Level Priority,Service Level Priority,ಸೇವಾ ಮಟ್ಟದ ಆದ್ಯತೆ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಗೊತ್ತುಪಡಿಸಿದ ಡಿಪ್ರೆಶೇಷನ್ಸ್ ಸಂಖ್ಯೆ ಒಟ್ಟು ಇಳಿಕೆಯ ಮೊತ್ತಕ್ಕಿಂತ ಹೆಚ್ಚಿರಬಾರದು
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,ಲೆಡ್ಜರ್ ಹಂಚಿಕೊಳ್ಳಿ
 DocType: Journal Entry,Accounts Payable,ಪಾವತಿಸಬಹುದಾದ ಖಾತೆಗಳು
@@ -3696,7 +3735,6 @@
 DocType: Delivery Note,Delivery To,ಇವರಿಗೆ ತಲುಪಿಸಲ್ಪಡುವಂಥದ್ದು
 DocType: Bank Statement Transaction Settings Item,Bank Data,ಬ್ಯಾಂಕ್ ಡೇಟಾ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,ವರೆಗೆ ನಿಗದಿಪಡಿಸಲಾಗಿದೆ
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್ ಮತ್ತು ಕೆಲಸದ ಅವಧಿಗಳನ್ನು ಟೈಮ್ಸ್ಶೀಟ್ನಲ್ಲಿಯೇ ನಿರ್ವಹಿಸಿ
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,ಲೀಡ್ ಮೂಲದಿಂದ ಟ್ರ್ಯಾಕ್ ಲೀಡ್ಸ್.
 DocType: Clinical Procedure,Nursing User,ನರ್ಸಿಂಗ್ ಬಳಕೆದಾರ
 DocType: Support Settings,Response Key List,ಪ್ರತಿಕ್ರಿಯೆ ಕೀ ಪಟ್ಟಿ
@@ -3930,6 +3968,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} ಗಾಗಿ ಮಾಹಿತಿಯನ್ನು ಹಿಂಪಡೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ ಕಂಪನಿಯ ಕರೆನ್ಸಿಯ ಅಥವಾ ಪಾರ್ಟಿ ಖಾತೆ ಕರೆನ್ಸಿಗೆ ಸಮನಾಗಿರಬೇಕು
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,ದಯವಿಟ್ಟು ಈ ಮಾರಾಟಗಾರರ ನೌಕರನ ಐಡಿ ಅನ್ನು ನಮೂದಿಸಿ
+DocType: Shift Type,Early Exit Consequence after,ಆರಂಭಿಕ ನಿರ್ಗಮನ ಪರಿಣಾಮ
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿ ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ತೆರೆಯುವುದನ್ನು ರಚಿಸಿ
 DocType: Disease,Treatment Period,ಚಿಕಿತ್ಸೆಯ ಅವಧಿ
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ಇಮೇಲ್ ಅನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
@@ -3947,7 +3986,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,ವಿದ್ಯಾರ್ಥಿಯ ಹೆಸರು:
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,ಮಾರಾಟ ಸರಕುಪಟ್ಟಿ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,ಪ್ರತಿಕ್ರಿಯೆ ಸಮಯ ರೆಸಲ್ಯೂಶನ್ ಸಮಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ಕೋರ್ಸ್ ಆಧಾರಿತ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಾಗಿ, ಪ್ರೋಗ್ರಾಮ್ ದಾಖಲಾತಿಯಲ್ಲಿ ದಾಖಲಾದ ಕೋರ್ಸ್ಗಳ ಮೂಲಕ ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿಗೂ ಕೋರ್ಸ್ ಅನ್ನು ಮೌಲ್ಯೀಕರಿಸಲಾಗುತ್ತದೆ."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,ಒಳ-ರಾಜ್ಯ ಸರಬರಾಜು
 DocType: Employee,Create User Permission,ಬಳಕೆದಾರರ ಅನುಮತಿಯನ್ನು ರಚಿಸಿ
@@ -3986,6 +4024,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,ಮಾರಾಟ ಅಥವಾ ಖರೀದಿಗಾಗಿ ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಒಪ್ಪಂದದ ನಿಯಮಗಳು.
 DocType: Sales Invoice,Customer PO Details,ಗ್ರಾಹಕರ PO ವಿವರಗಳು
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ರೋಗಿಯು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,ಡೀಫಾಲ್ಟ್ ಆದ್ಯತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,ಆ ಐಟಂಗೆ ಶುಲ್ಕಗಳು ಅನ್ವಯವಾಗದಿದ್ದರೆ ಐಟಂ ಅನ್ನು ತೆಗೆದುಹಾಕಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಗ್ರಾಹಕರ ಗುಂಪು ಒಂದೇ ಹೆಸರಿನೊಂದಿಗೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಿಸಿ ಅಥವಾ ಗ್ರಾಹಕರ ಗುಂಪನ್ನು ಮರುಹೆಸರಿಸಿ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4032,6 +4071,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},ಕೆಲಸದ ಆದೇಶವು {0}
 DocType: Inpatient Record,Admission Schedule Date,ಪ್ರವೇಶ ವೇಳಾಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,ಆಸ್ತಿ ಮೌಲ್ಯ ಹೊಂದಾಣಿಕೆ
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,ಈ ಶಿಫ್ಟ್‌ಗೆ ನಿಯೋಜಿಸಲಾದ ಉದ್ಯೋಗಿಗಳಿಗೆ &#39;ಉದ್ಯೋಗಿ ಚೆಕ್ಇನ್&#39; ಆಧರಿಸಿ ಹಾಜರಾತಿಯನ್ನು ಗುರುತಿಸಿ.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,ನೋಂದಾಯಿಸದ ವ್ಯಕ್ತಿಗಳಿಗೆ ಸರಬರಾಜು ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,ಎಲ್ಲಾ ಕೆಲಸ
 DocType: Appointment Type,Appointment Type,ನೇಮಕಾತಿ ಪ್ರಕಾರ
@@ -4144,7 +4184,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ನ ಸಮಗ್ರ ತೂಕ. ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತು ತೂಕ. (ಮುದ್ರಣಕ್ಕಾಗಿ)
 DocType: Plant Analysis,Laboratory Testing Datetime,ಪ್ರಯೋಗಾಲಯ ಪರೀಕ್ಷೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,ಹಂತದ ಮೂಲಕ ಮಾರಾಟದ ಪೈಪ್ಲೈನ್
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸಾಮರ್ಥ್ಯ
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,ಬ್ಯಾಂಕ್ ಸ್ಟೇಟ್ಮೆಂಟ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಎಂಟ್ರಿ
 DocType: Purchase Order,Get Items from Open Material Requests,ಮುಕ್ತ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳಿಂದ ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
@@ -4226,7 +4265,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,ಏಜಿಂಗ್ ವೇರ್ಹೌಸ್ ಬುದ್ಧಿವಂತವನ್ನು ತೋರಿಸಿ
 DocType: Sales Invoice,Write Off Outstanding Amount,ಅತ್ಯುತ್ತಮ ಮೊತ್ತವನ್ನು ಬರೆಯಿರಿ
 DocType: Payroll Entry,Employee Details,ಉದ್ಯೋಗಿ ವಿವರಗಳು
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,ಪ್ರಾರಂಭದ ಸಮಯವು {0} ಗಾಗಿ ಅಂತ್ಯ ಸಮಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರುವುದಿಲ್ಲ.
 DocType: Pricing Rule,Discount Amount,ರಿಯಾಯಿತಿ ಮೊತ್ತ
 DocType: Healthcare Service Unit Type,Item Details,ಐಟಂ ವಿವರಗಳು
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},ಅವಧಿಗೆ {0} ನ ನಕಲಿ ತೆರಿಗೆ ಘೋಷಣೆ {1}
@@ -4279,7 +4317,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,ನಿವ್ವಳ ವೇತನ ಋಣಾತ್ಮಕವಾಗಿರಬಾರದು
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,ಸಂವಹನಗಳ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},ಸಾಲು {0} # ಐಟಂ {1} ಅನ್ನು ಖರೀದಿಸುವ ಆದೇಶದ ವಿರುದ್ಧ {2} ವರ್ಗಾಯಿಸಲಾಗುವುದಿಲ್ಲ {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,ಶಿಫ್ಟ್
+DocType: Attendance,Shift,ಶಿಫ್ಟ್
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,ಖಾತೆಗಳು ಮತ್ತು ಪಕ್ಷಗಳ ಪ್ರಕ್ರಿಯೆ ಚಾರ್ಟ್
 DocType: Stock Settings,Convert Item Description to Clean HTML,HTML ಅನ್ನು ಸ್ವಚ್ಛಗೊಳಿಸಲು ಐಟಂ ವಿವರಣೆಯನ್ನು ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರ ಗುಂಪುಗಳು
@@ -4349,6 +4387,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,ಪೋಷಕ ಸೇವಾ ಘಟಕ
 DocType: Sales Invoice,Include Payment (POS),ಪಾವತಿಯನ್ನು ಸೇರಿಸಿ (ಪಿಓಎಸ್)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,ಖಾಸಗಿ ಷೇರುಗಳ
+DocType: Shift Type,First Check-in and Last Check-out,ಮೊದಲ ಚೆಕ್-ಇನ್ ಮತ್ತು ಕೊನೆಯ ಚೆಕ್- .ಟ್
 DocType: Landed Cost Item,Receipt Document,ರಿಸೀಪ್ಟ್ ಡಾಕ್ಯುಮೆಂಟ್
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಅವಧಿ
 DocType: Employee Grade,Default Salary Structure,ಡೀಫಾಲ್ಟ್ ಸ್ಯಾಲರಿ ಸ್ಟ್ರಕ್ಚರ್
@@ -4431,6 +4470,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,ಖರೀದಿ ಆದೇಶವನ್ನು ರಚಿಸಿ
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,ಆರ್ಥಿಕ ವರ್ಷದ ಬಜೆಟ್ ಅನ್ನು ವಿವರಿಸಿ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,ಖಾತೆಗಳ ಟೇಬಲ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
+DocType: Employee Checkin,Entry Grace Period Consequence,ಪ್ರವೇಶ ಗ್ರೇಸ್ ಅವಧಿ ಪರಿಣಾಮ
 ,Payment Period Based On Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕದಂದು ಪಾವತಿ ಅವಧಿಯನ್ನು ಆಧರಿಸಿ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},ಐಟಂ {0} ಗಾಗಿ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸ್ಥಾಪನೆಯ ದಿನಾಂಕವು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,ವಸ್ತು ವಿನಂತಿಗೆ ಲಿಂಕ್
@@ -4451,6 +4491,7 @@
 DocType: Vehicle Log,Fuel Qty,ಇಂಧನ ಕ್ಯೂಟಿ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,ಗಾರ್ಡಿಯನ್ 1 ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Invoice Discounting,Disbursed,ವಿತರಿಸಲಾಗಿದೆ
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,ಶಿಫ್ಟ್ ಮುಗಿದ ನಂತರ ಚೆಕ್- out ಟ್ ಅನ್ನು ಹಾಜರಾತಿಗಾಗಿ ಪರಿಗಣಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,ಪಾವತಿಸಬಹುದಾದ ಖಾತೆಗಳಲ್ಲಿನ ನೆಟ್ ಚೇಂಜ್
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,ಲಭ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,ಅರೆಕಾಲಿಕ
@@ -4464,7 +4505,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,ಪ್ರಿಂಟ್ನಲ್ಲಿ ತೋರಿಸಿ PDC
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify ಸರಬರಾಜುದಾರ
 DocType: POS Profile User,POS Profile User,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಬಳಕೆದಾರ
-DocType: Student,Middle Name,ಮಧ್ಯದ ಹೆಸರು
 DocType: Sales Person,Sales Person Name,ಮಾರಾಟದ ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Packing Slip,Gross Weight,ಒಟ್ಟು ತೂಕ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
@@ -4473,7 +4513,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,ಮಾನವ ಸಂಪನ್ಮೂಲ-. YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,ಸೇವೆ ಮಟ್ಟದ ಒಪ್ಪಂದ
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,ದಯವಿಟ್ಟು ನೌಕರರು ಮತ್ತು ದಿನಾಂಕವನ್ನು ಮೊದಲು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,ಐಟಂ ಮೌಲ್ಯಾಂಕನ ದರವನ್ನು ಭೂಮಿ ವೆಚ್ಚದ ಚೀಟಿ ಮೊತ್ತವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು
 DocType: Timesheet,Employee Detail,ಉದ್ಯೋಗಿ ವಿವರ
 DocType: Tally Migration,Vouchers,ವೋಚರ್
@@ -4508,7 +4547,7 @@
 DocType: Additional Salary,Date on which this component is applied,ಈ ಘಟಕವನ್ನು ಅನ್ವಯಿಸುವ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,ಪೋಲಿಯೊ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಲಭ್ಯವಿರುವ ಷೇರುದಾರರ ಪಟ್ಟಿ
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,ಸೆಟಪ್ ಗೇಟ್ವೇ ಖಾತೆಗಳು.
-DocType: Service Level,Response Time Period,ಪ್ರತಿಕ್ರಿಯೆ ಸಮಯ ಅವಧಿ
+DocType: Service Level Priority,Response Time Period,ಪ್ರತಿಕ್ರಿಯೆ ಸಮಯ ಅವಧಿ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Course Activity,Activity Date,ಚಟುವಟಿಕೆ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,ಹೊಸ ಗ್ರಾಹಕರನ್ನು ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಸೇರಿಸಿ
@@ -4533,6 +4572,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,ಹಣಕಾಸು ವರ್ಷ
 DocType: Sales Invoice Item,Deferred Revenue,ಮುಂದೂಡಲ್ಪಟ್ಟ ಆದಾಯ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,ಕನಿಷ್ಠ ಒಂದು ಸೆಲ್ಲಿಂಗ್ ಅಥವಾ ಬೈಯಿಂಗ್ ಆಯ್ಕೆ ಮಾಡಬೇಕು
+DocType: Shift Type,Working Hours Threshold for Half Day,ಅರ್ಧ ದಿನಕ್ಕೆ ಕೆಲಸದ ಸಮಯ ಮಿತಿ
 ,Item-wise Purchase History,ಐಟಂ-ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},ಸಾಲು {0} ನಲ್ಲಿ ಐಟಂಗೆ ಸ್ಟಾಪ್ ಸ್ಟಾಪ್ ದಿನಾಂಕವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Production Plan,Include Subcontracted Items,ಉಪಗುತ್ತಿಗೆಗೊಂಡ ವಸ್ತುಗಳನ್ನು ಸೇರಿಸಿ
@@ -4565,6 +4605,7 @@
 DocType: BOM,Allow Same Item Multiple Times,ಒಂದೇ ಐಟಂ ಬಹು ಸಮಯಗಳನ್ನು ಅನುಮತಿಸಿ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOM ರಚಿಸಿ
 DocType: Healthcare Practitioner,Charges,ಶುಲ್ಕಗಳು
+DocType: Employee,Attendance and Leave Details,ಹಾಜರಾತಿ ಮತ್ತು ವಿವರಗಳನ್ನು ಬಿಡಿ
 DocType: Student,Personal Details,ವೈಯಕ್ತಿಕ ವಿವರಗಳು
 DocType: Sales Order,Billing and Delivery Status,ಬಿಲ್ಲಿಂಗ್ ಮತ್ತು ಡೆಲಿವರಿ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,ಸಾಲು {0}: ಪೂರೈಕೆದಾರರಿಗೆ {0} ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ಇಮೇಲ್ ಕಳುಹಿಸಲು ಅಗತ್ಯವಿದೆ
@@ -4616,7 +4657,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},ಮೌಲ್ಯ ಬೆಟ್ವೀನ್ {0} ಮತ್ತು {1}
 DocType: Purchase Order,Order Confirmation Date,ಆರ್ಡರ್ ದೃಢೀಕರಣ ದಿನಾಂಕ
 DocType: Delivery Trip,Calculate Estimated Arrival Times,ಅಂದಾಜು ಆಗಮನದ ಸಮಯವನ್ನು ಲೆಕ್ಕಾಚಾರ ಮಾಡಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಉದ್ಯೋಗಿ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ಗ್ರಾಹಕ
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS - .YYYY.-
 DocType: Subscription,Subscription Start Date,ಚಂದಾದಾರಿಕೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ
@@ -4639,7 +4679,7 @@
 DocType: Journal Entry Account,Journal Entry Account,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಖಾತೆ
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,ಭಿನ್ನ
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,ವೇದಿಕೆ ಚಟುವಟಿಕೆ
-DocType: Service Level,Resolution Time Period,ರೆಸಲ್ಯೂಶನ್ ಸಮಯದ ಅವಧಿ
+DocType: Service Level Priority,Resolution Time Period,ರೆಸಲ್ಯೂಶನ್ ಸಮಯದ ಅವಧಿ
 DocType: Request for Quotation,Supplier Detail,ಪೂರೈಕೆದಾರ ವಿವರ
 DocType: Project Task,View Task,ಟಾಸ್ಕ್ ವೀಕ್ಷಿಸಿ
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
@@ -4706,6 +4746,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ / ಡೆಲಿವರಿ ನೋಟ್ / ಪರ್ಸೇಸ್ ರಿಸೀಟ್ಟ್ ಮೂಲಕ ಮಾತ್ರ ವೇರ್ಹೌಸ್ ಬದಲಾಯಿಸಬಹುದು
 DocType: Support Settings,Close Issue After Days,ದಿನಗಳ ನಂತರ ಸಂಚಿಕೆ ಮುಚ್ಚಿ
 DocType: Payment Schedule,Payment Schedule,ಪಾವತಿ ವೇಳಾಪಟ್ಟಿ
+DocType: Shift Type,Enable Entry Grace Period,ಪ್ರವೇಶ ಗ್ರೇಸ್ ಅವಧಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Patient Relation,Spouse,ಸಂಗಾತಿಯ
 DocType: Purchase Invoice,Reason For Putting On Hold,ತಡೆಹಿಡಿಯುವುದು ಕಾರಣ
 DocType: Item Attribute,Increment,ಹೆಚ್ಚಳ
@@ -4843,6 +4884,7 @@
 DocType: Vehicle Log,Invoice Ref,ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},ಸರಕುಪಟ್ಟಿಗಾಗಿ ಸಿ-ಫಾರ್ಮ್ ಅನ್ವಯಿಸುವುದಿಲ್ಲ: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,ಸರಕುಪಟ್ಟಿ ರಚಿಸಲಾಗಿದೆ
+DocType: Shift Type,Early Exit Grace Period,ಆರಂಭಿಕ ನಿರ್ಗಮನ ಗ್ರೇಸ್ ಅವಧಿ
 DocType: Patient Encounter,Review Details,ವಿವರಗಳನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,ಸಾಲು {0}: ಗಂಟೆ ಮೌಲ್ಯವು ಶೂನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬೇಕು.
 DocType: Account,Account Number,ಖಾತೆ ಸಂಖ್ಯೆ
@@ -4854,7 +4896,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","ಕಂಪನಿಯು SpA, SApA ಅಥವಾ SRL ಆಗಿದ್ದರೆ ಅನ್ವಯಿಸುತ್ತದೆ"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,ನಡುವೆ ಅತಿಕ್ರಮಿಸುವ ಪರಿಸ್ಥಿತಿಗಳು ಕಂಡುಬರುತ್ತವೆ:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,ಪಾವತಿಸಲಾಗಿದೆ ಮತ್ತು ತಲುಪಿಸಲಾಗಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸಂಕೇತವು ಕಡ್ಡಾಯವಾಗಿದೆ ಏಕೆಂದರೆ ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯಲ್ಲ
 DocType: GST HSN Code,HSN Code,ಎಚ್ಎಸ್ಎನ್ ಕೋಡ್
 DocType: GSTR 3B Report,September,ಸೆಪ್ಟೆಂಬರ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,ಆಡಳಿತಾತ್ಮಕ ವೆಚ್ಚಗಳು
@@ -4900,6 +4941,7 @@
 DocType: Opportunity,Sales Stage,ಮಾರಾಟದ ಹಂತ
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ನೀವು ಮಾರಾಟದ ಆದೇಶವನ್ನು ಉಳಿಸಿದ ನಂತರ ವರ್ಡ್ಗಳಲ್ಲಿ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Item Reorder,Re-order Level,ಪುನಃ ಆದೇಶದ ಮಟ್ಟ
+DocType: Shift Type,Enable Auto Attendance,ಸ್ವಯಂ ಹಾಜರಾತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,ಆದ್ಯತೆ
 ,Department Analytics,ಇಲಾಖೆ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: Crop,Scientific Name,ವೈಜ್ಞಾನಿಕ ಹೆಸರು
@@ -4912,6 +4954,7 @@
 DocType: Quiz Activity,Quiz Activity,ಕ್ವಿಜ್ ಚಟುವಟಿಕೆ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} ಮಾನ್ಯ ವೇತನದಾರರ ಅವಧಿಯಲ್ಲ
 DocType: Timesheet,Billed,ಬಿಲ್ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/config/support.py,Issue Type.,ಸಂಚಿಕೆ ಪ್ರಕಾರ.
 DocType: Restaurant Order Entry,Last Sales Invoice,ಕೊನೆಯ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Payment Terms Template,Payment Terms,ಪಾವತಿ ನಿಯಮಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ Qty: ಪ್ರಮಾಣ ಮಾರಾಟ ಆದೇಶ, ಆದರೆ ವಿತರಿಸಲಾಯಿತು."
@@ -5007,6 +5050,7 @@
 DocType: Account,Asset,ಆಸ್ತಿ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} ಹೆಲ್ತ್ಕೇರ್ ಪ್ರಾಕ್ಟೀಷನರ್ ವೇಳಾಪಟ್ಟಿ ಹೊಂದಿಲ್ಲ. ಇದನ್ನು ಹೆಲ್ತ್ಕೇರ್ ಪ್ರಾಕ್ಟೀಷನರ್ ಮಾಸ್ಟರ್ನಲ್ಲಿ ಸೇರಿಸಿ
 DocType: Vehicle,Chassis No,ಚಾಸಿಸ್ ಇಲ್ಲ
+DocType: Employee,Default Shift,ಡೀಫಾಲ್ಟ್ ಶಿಫ್ಟ್
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,ಕಂಪನಿ ಸಂಕ್ಷೇಪಣ
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,ಮರಗಳ ವಸ್ತುಗಳ ಮರದ
 DocType: Article,LMS User,ಎಲ್ಎಂಎಸ್ ಬಳಕೆದಾರ
@@ -5055,6 +5099,7 @@
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟದ ವ್ಯಕ್ತಿ
 DocType: Student Group Creation Tool,Get Courses,ಕೋರ್ಸ್ಗಳನ್ನು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ಸಾಲು # {0}: ಐಟಂ ಸ್ಥಿರವಾದ ಆಸ್ತಿಯಾಗಿರುವುದರಿಂದ Qty 1 ಆಗಿರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಕ್ಯೂಟಿಗಾಗಿ ಪ್ರತ್ಯೇಕ ಸಾಲನ್ನು ಬಳಸಿ.
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),ಆಬ್ಸೆಂಟ್ ಅನ್ನು ಗುರುತಿಸಿರುವ ಕೆಲಸದ ಸಮಯಕ್ಕಿಂತ ಕಡಿಮೆ. (ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಶೂನ್ಯ)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ವಹಿವಾಟಿನಲ್ಲಿ ಮಾತ್ರ ಎಲೆ ನೋಡ್ಗಳನ್ನು ಅನುಮತಿಸಲಾಗುತ್ತದೆ
 DocType: Grant Application,Organization,ಸಂಸ್ಥೆ
 DocType: Fee Category,Fee Category,ಶುಲ್ಕ ವರ್ಗ
@@ -5067,6 +5112,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,ದಯವಿಟ್ಟು ಈ ತರಬೇತಿ ಕಾರ್ಯಕ್ರಮಕ್ಕಾಗಿ ನಿಮ್ಮ ಸ್ಥಿತಿಯನ್ನು ನವೀಕರಿಸಿ
 DocType: Volunteer,Morning,ಮಾರ್ನಿಂಗ್
 DocType: Quotation Item,Quotation Item,ಉದ್ಧರಣ ಐಟಂ
+apps/erpnext/erpnext/config/support.py,Issue Priority.,ಸಂಚಿಕೆ ಆದ್ಯತೆ.
 DocType: Journal Entry,Credit Card Entry,ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","ಸಮಯ ಸ್ಲಾಟ್ ಅನ್ನು ಬಿಟ್ಟುಬಿಡಲಾಗಿದೆ, {1} ಗೆ {1} ಸ್ಲಾಟ್ ಎಲಾಸಿಟಿಂಗ್ ಸ್ಲಾಟ್ {2} ಗೆ {3}"
 DocType: Journal Entry Account,If Income or Expense,ಆದಾಯ ಅಥವಾ ಖರ್ಚು ವೇಳೆ
@@ -5117,11 +5163,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,ಡೇಟಾ ಆಮದು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","ಆಟೋ ಆಪ್ಟ್ ಇನ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿದರೆ, ಗ್ರಾಹಕರಿಗೆ ಸಂಬಂಧಪಟ್ಟ ಲಾಯಲ್ಟಿ ಪ್ರೋಗ್ರಾಂ (ಉಳಿಸಲು)"
 DocType: Account,Expense Account,ಖರ್ಚು ಖಾತೆ
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,ಶಿಫ್ಟ್ ಪ್ರಾರಂಭದ ಸಮಯದ ಮೊದಲು ನೌಕರರ ಚೆಕ್-ಇನ್ ಅನ್ನು ಹಾಜರಾತಿಗಾಗಿ ಪರಿಗಣಿಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ಗಾರ್ಡಿಯನ್ 1 ರೊಂದಿಗಿನ ಸಂಬಂಧ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,ಸರಕುಪಟ್ಟಿ ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0} ನಲ್ಲಿ ನಿವೃತ್ತರಾಗಿರುವ ನೌಕರನು &#39;ಎಡ&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},ಪಾವತಿಸಿ {0} {1}
+DocType: Company,Sales Settings,ಮಾರಾಟ ಸೆಟ್ಟಿಂಗ್‌ಗಳು
 DocType: Sales Order Item,Produced Quantity,ನಿರ್ಮಾಣದ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,ಉದ್ಧರಣಕ್ಕಾಗಿ ವಿನಂತಿಯನ್ನು ಕೆಳಗಿನ ಲಿಂಕ್ ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡುವುದರ ಮೂಲಕ ಪ್ರವೇಶಿಸಬಹುದು
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆಯ ಹೆಸರು
@@ -5200,6 +5248,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,ಮಾರಾಟ ಮತ್ತು ಖರೀದಿಯ ಡೀಫಾಲ್ಟ್ ತೆರಿಗೆ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ಬಿಡಿ ಕೌಟುಂಬಿಕತೆ {0} ಸಾಗಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,ಡೆಬಿಟ್ ಖಾತೆಗೆ ಸ್ವೀಕೃತವಾದ ಖಾತೆಯಾಗಿರಬೇಕು
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,ಒಪ್ಪಂದದ ಅಂತಿಮ ದಿನಾಂಕವು ಇಂದಿಗಿಂತ ಕಡಿಮೆಯಿರಬಾರದು.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},ದಯವಿಟ್ಟು ಖಾತೆಯಲ್ಲಿನ ಖಾತೆಯಲ್ಲಿ {0} ಅಥವಾ ಡೀಫಾಲ್ಟ್ ಇನ್ವೆಂಟರಿ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,ಪೂರ್ವನಿಯೋಜಿತವಾಗಿಡು
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ಈ ಪ್ಯಾಕೇಜ್ನ ನಿವ್ವಳ ತೂಕ. (ಐಟಂಗಳನ್ನು ನಿವ್ವಳ ತೂಕದ ಮೊತ್ತವಾಗಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲೆಕ್ಕಾಚಾರ)
@@ -5226,8 +5275,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,ಅವಧಿ ಮೀರಿದ ಬ್ಯಾಚ್ಗಳು
 DocType: Shipping Rule,Shipping Rule Type,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಟೈಪ್
 DocType: Job Offer,Accepted,ಅಂಗೀಕರಿಸಲಾಗಿದೆ
-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> \ ಅನ್ನು ಅಳಿಸಿ"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,ನೀವು ಈಗಾಗಲೇ ಮೌಲ್ಯಮಾಪನ ಮಾನದಂಡಕ್ಕಾಗಿ ಮೌಲ್ಯಮಾಪನ ಮಾಡಿದ್ದೀರಿ {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,ಬ್ಯಾಚ್ ಸಂಖ್ಯೆಗಳು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),ವಯಸ್ಸು (ದಿನಗಳು)
@@ -5254,6 +5301,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,ನಿಮ್ಮ ಡೊಮೇನ್ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 DocType: Agriculture Task,Task Name,ಕಾರ್ಯನಾಮ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,ವರ್ಕ್ ಆರ್ಡರ್ಗಾಗಿ ಈಗಾಗಲೇ ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ
+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 ಅನ್ನು ಅಳಿಸಿ"
 ,Amount to Deliver,ತಲುಪಿಸಲು ಮೊತ್ತ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,ಕಂಪನಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ನೀಡಲಾದ ಐಟಂಗಳಿಗೆ ಲಿಂಕ್ ಮಾಡಲು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಬಾಕಿ ಉಳಿದಿಲ್ಲ.
@@ -5303,6 +5352,7 @@
 DocType: Lab Prescription,Test Code,ಪರೀಕ್ಷಾ ಕೋಡ್
 DocType: Purchase Taxes and Charges,On Previous Row Total,ಹಿಂದಿನ ರೋ ಒಟ್ಟು
 DocType: Student,Student Email Address,ವಿದ್ಯಾರ್ಥಿ ಇಮೇಲ್ ವಿಳಾಸ
+,Delayed Item Report,ವಿಳಂಬವಾದ ಐಟಂ ವರದಿ
 DocType: Academic Term,Education,ಶಿಕ್ಷಣ
 DocType: Supplier Quotation,Supplier Address,ಪೂರೈಕೆದಾರ ವಿಳಾಸ
 DocType: Salary Detail,Do not include in total,ಒಟ್ಟು ಸೇರಿಸಬೇಡಿ
@@ -5310,7 +5360,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Purchase Receipt Item,Rejected Quantity,ನಿರಾಕರಿಸಿದ ಪ್ರಮಾಣ
 DocType: Cashier Closing,To TIme,ಟೀಮ್ ಮಾಡಲು
-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: Daily Work Summary Group User,Daily Work Summary Group User,ಡೈಲಿ ವರ್ಕ್ ಸಾರಾಂಶ ಗುಂಪು ಬಳಕೆದಾರ
 DocType: Fiscal Year Company,Fiscal Year Company,ಹಣಕಾಸಿನ ವರ್ಷದ ಕಂಪನಿ
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,ಪರ್ಯಾಯ ಐಟಂ ಐಟಂ ಕೋಡ್ನಂತೆ ಇರಬಾರದು
@@ -5362,6 +5411,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,ಡೆಲಿವರಿ ನಿಲ್ದಾಣಗಳ ನಡುವೆ ವಿಳಂಬ
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[ದಿನಗಳು] ಗಿಂತ ಹಳೆಯದಾದ ಸ್ಟಾಕ್ಗಳನ್ನು ಫ್ರೀಜ್ ಮಾಡಿ
 DocType: Promotional Scheme,Promotional Scheme Product Discount,ಪ್ರಚಾರದ ಯೋಜನೆ ಉತ್ಪನ್ನ ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,ಸಂಚಿಕೆ ಆದ್ಯತೆ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Account,Asset Received But Not Billed,ಪಡೆದ ಆಸ್ತಿ ಆದರೆ ಬಿಲ್ ಮಾಡಿಲ್ಲ
 DocType: POS Closing Voucher,Total Collected Amount,ಒಟ್ಟು ಸಂಗ್ರಹಿಸಿದ ಮೊತ್ತ
 DocType: Course,Default Grading Scale,ಡೀಫಾಲ್ಟ್ ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್
@@ -5403,6 +5453,7 @@
 DocType: Contract,Fulfilment Terms,ಪೂರೈಸುವ ನಿಯಮಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ಗುಂಪಿಗೆ ಗುಂಪು ಇಲ್ಲ
 DocType: Student Guardian,Mother,ತಾಯಿ
+DocType: Issue,Service Level Agreement Fulfilled,ಸೇವಾ ಮಟ್ಟದ ಒಪ್ಪಂದವನ್ನು ಪೂರೈಸಲಾಗಿದೆ
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,ಹಕ್ಕು ನಿರಾಕರಿಸದ ನೌಕರರ ಲಾಭಕ್ಕಾಗಿ ತೆರಿಗೆ ಕಡಿತಗೊಳಿಸಿ
 DocType: Travel Request,Travel Funding,ಪ್ರವಾಸ ಫಂಡಿಂಗ್
 DocType: Shipping Rule,Fixed,ಪರಿಹರಿಸಲಾಗಿದೆ
@@ -5432,10 +5483,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ಯಾವುದೇ ಐಟಂಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Item Attribute,From Range,ರೇಂಜ್ನಿಂದ
 DocType: Clinical Procedure,Consumables,ಗ್ರಾಹಕರು
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;ಉದ್ಯೋಗಿ_ಕ್ಷೇತ್ರ_ಮೌಲ್ಯ&#39; ಮತ್ತು &#39;ಟೈಮ್‌ಸ್ಟ್ಯಾಂಪ್&#39; ಅಗತ್ಯವಿದೆ.
 DocType: Purchase Taxes and Charges,Reference Row #,ಉಲ್ಲೇಖ ಸಾಲು #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},ಕಂಪೆನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ಸವಕಳಿ ಖರ್ಚಿನ ಕೇಂದ್ರವನ್ನು&#39; ಹೊಂದಿಸಿ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,ಸಾಲು # {0}: ಟ್ರಾಸ್ಯಾಕ್ಷನ್ ಪೂರ್ಣಗೊಳಿಸಲು ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಅಗತ್ಯವಿದೆ
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,ಅಮೆಜಾನ್ MWS ನಿಂದ ನಿಮ್ಮ ಮಾರಾಟದ ಆರ್ಡರ್ ಡೇಟಾವನ್ನು ಎಳೆಯಲು ಈ ಬಟನ್ ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),ಅರ್ಧ ದಿನವನ್ನು ಗುರುತಿಸಿರುವ ಕೆಲಸದ ಸಮಯಕ್ಕಿಂತ ಕಡಿಮೆ. (ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಶೂನ್ಯ)
 ,Assessment Plan Status,ಅಸೆಸ್ಮೆಂಟ್ ಯೋಜನೆ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,ದಯವಿಟ್ಟು ಮೊದಲು {0} ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ನೌಕರರ ದಾಖಲೆ ರಚಿಸಲು ಇದನ್ನು ಸಲ್ಲಿಸಿ
@@ -5506,6 +5559,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,ತೆರೆಯಿರಿ ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,ಟಾಗಲ್ ಶೋಧಕಗಳು
 DocType: Production Plan,Material Request Detail,ವಸ್ತು ವಿನಂತಿ ವಿವರ
+DocType: Shift Type,Process Attendance After,ಪ್ರಕ್ರಿಯೆಯ ಹಾಜರಾತಿ ನಂತರ
 DocType: Material Request Item,Quantity and Warehouse,ಪ್ರಮಾಣ ಮತ್ತು ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,ಪ್ರೋಗ್ರಾಂಗಳಿಗೆ ಹೋಗಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},ಸಾಲು # {0}: ಉಲ್ಲೇಖಗಳಲ್ಲಿನ ನಕಲಿ ಪ್ರವೇಶ {1} {2}
@@ -5563,6 +5617,7 @@
 DocType: Pricing Rule,Party Information,ಪಕ್ಷದ ಮಾಹಿತಿ
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),ಸಾಲಗಾರರು ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,ಇಲ್ಲಿಯವರೆಗೆ ಉದ್ಯೋಗಿಗಳ ನಿವಾರಣೆ ದಿನಾಂಕಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಲಾಗುವುದಿಲ್ಲ
+DocType: Shift Type,Enable Exit Grace Period,ನಿರ್ಗಮನ ಗ್ರೇಸ್ ಅವಧಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Expense Claim,Employees Email Id,ನೌಕರರು ಇಮೇಲ್ ಐಡಿ
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Shopify ರಿಂದ ERPNext ಬೆಲೆ ಪಟ್ಟಿಗೆ ಬೆಲೆ ನವೀಕರಿಸಿ
 DocType: Healthcare Settings,Default Medical Code Standard,ಡೀಫಾಲ್ಟ್ ವೈದ್ಯಕೀಯ ಕೋಡ್ ಸ್ಟ್ಯಾಂಡರ್ಡ್
@@ -5593,7 +5648,6 @@
 DocType: Budget,Applicable on Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
 DocType: Support Settings,Search APIs,ಹುಡುಕಾಟ API ಗಳು
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,ಮಾರಾಟದ ಆದೇಶಕ್ಕಾಗಿ ಉತ್ಪಾದನೆ ಶೇಕಡಾವಾರು
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,ವಿಶೇಷಣಗಳು
 DocType: Purchase Invoice,Supplied Items,ಸರಬರಾಜು ಐಟಂಗಳು
 DocType: Leave Control Panel,Select Employees,ಉದ್ಯೋಗಿಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},ಸಾಲದಲ್ಲಿ ಬಡ್ಡಿ ಆದಾಯದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}
@@ -5619,7 +5673,7 @@
 ,Supplier-Wise Sales Analytics,ಪೂರೈಕೆದಾರ-ವೈಸ್ ಸೇಲ್ಸ್ ಅನಾಲಿಟಿಕ್ಸ್
 DocType: GSTR 3B Report,February,ಫೆಬ್ರುವರಿ
 DocType: Appraisal,For Employee,ಉದ್ಯೋಗಿಗೆ
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,ನಿಜವಾದ ವಿತರಣೆ ದಿನಾಂಕ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,ನಿಜವಾದ ವಿತರಣೆ ದಿನಾಂಕ
 DocType: Sales Partner,Sales Partner Name,ಮಾರಾಟದ ಸಂಗಾತಿ ಹೆಸರು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,ಸವಕಳಿ ಸಾಲು {0}: ಸವಕಳಿ ಆರಂಭ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕದಂತೆ ನಮೂದಿಸಲಾಗಿದೆ
 DocType: GST HSN Code,Regional,ಪ್ರಾದೇಶಿಕ
@@ -5658,6 +5712,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,ಪೂರೈಕೆದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್
 DocType: Travel Itinerary,Travel To,ಪ್ರಯಾಣಕ್ಕೆ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,ಹಾಜರಾತಿ ಗುರುತಿಸಿ
+DocType: Shift Type,Determine Check-in and Check-out,ಚೆಕ್-ಇನ್ ಮತ್ತು ಚೆಕ್- .ಟ್ ಅನ್ನು ನಿರ್ಧರಿಸಿ
 DocType: POS Closing Voucher,Difference,ವ್ಯತ್ಯಾಸ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,ಸಣ್ಣ
 DocType: Work Order Item,Work Order Item,ಆರ್ಡರ್ ಐಟಂ ಕೆಲಸ
@@ -5691,6 +5746,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ಡ್ರಗ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ಮುಚ್ಚಲಾಗಿದೆ
 DocType: Patient,Medical History,ವೈದ್ಯಕೀಯ ಇತಿಹಾಸ
+DocType: Expense Claim,Expense Taxes and Charges,ಖರ್ಚು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ಇನ್ವಾಯ್ಸ್ ದಿನಾಂಕದ ನಂತರದ ದಿನಗಳ ಸಂಖ್ಯೆ ಚಂದಾದಾರಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಕ್ಕೂ ಮುಂಚಿತವಾಗಿ ಅಥವಾ ಚಂದಾದಾರಿಕೆಯನ್ನು ಪಾವತಿಸದೇ ಇರುವಂತೆ ಮುಗಿದಿದೆ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ಅನುಸ್ಥಾಪನಾ ಸೂಚನೆ {0} ಅನ್ನು ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Patient Relation,Family,ಕುಟುಂಬ
@@ -5723,7 +5779,6 @@
 DocType: Dosage Strength,Strength,ಬಲ
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} {1} ಘಟಕಗಳು ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು {2} ನಲ್ಲಿ ಅಗತ್ಯವಿದೆ.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,ಸಬ್ ಕಾಂಟ್ರಾಕ್ಟ್ ಆಧಾರದ ಮೇಲೆ ಕಚ್ಚಾ ವಸ್ತುಗಳು
-DocType: Bank Guarantee,Customer,ಗ್ರಾಹಕರು
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಫೀಲ್ಡ್ ಅಕಾಡೆಮಿಕ್ ಟರ್ಮ್ ಪ್ರೋಗ್ರಾಮ್ ಎನ್ರೋಲ್ಮೆಂಟ್ ಟೂಲ್ನಲ್ಲಿ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ಬ್ಯಾಚ್ ಆಧಾರಿತ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಾಗಿ, ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಪ್ರೋಗ್ರಾಂ ದಾಖಲಾತಿಯಿಂದ ಪ್ರತಿ ವಿದ್ಯಾರ್ಥಿಗೆ ಮೌಲ್ಯೀಕರಿಸಲಾಗುತ್ತದೆ."
 DocType: Course,Topics,ವಿಷಯಗಳು
@@ -5880,6 +5935,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),ಮುಚ್ಚುವುದು (ಒಟ್ಟು + ತೆರೆಯುವಿಕೆ)
 DocType: Supplier Scorecard Criteria,Criteria Formula,ಮಾನದಂಡ ಫಾರ್ಮುಲಾ
 apps/erpnext/erpnext/config/support.py,Support Analytics,ಬೆಂಬಲ ಅನಾಲಿಟಿಕ್ಸ್
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ಹಾಜರಾತಿ ಸಾಧನ ID (ಬಯೋಮೆಟ್ರಿಕ್ / ಆರ್ಎಫ್ ಟ್ಯಾಗ್ ಐಡಿ)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,ವಿಮರ್ಶೆ ಮತ್ತು ಕ್ರಿಯೆ
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ಖಾತೆಯನ್ನು ಫ್ರೀಜ್ ಮಾಡಿದರೆ, ನಿರ್ಬಂಧಿತ ಬಳಕೆದಾರರಿಗೆ ನಮೂದುಗಳನ್ನು ಅನುಮತಿಸಲಾಗುತ್ತದೆ."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,ಸವಕಳಿ ನಂತರ ಪ್ರಮಾಣ
@@ -5901,6 +5957,7 @@
 DocType: Salary Slip,Loan Repayment,ಸಾಲ ಮರಪಾವತಿ
 DocType: Employee Education,Major/Optional Subjects,ಪ್ರಮುಖ / ಐಚ್ಛಿಕ ವಿಷಯಗಳು
 DocType: Soil Texture,Silt,ಸಿಲ್ಟ್
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,ಪೂರೈಕೆದಾರ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: Bank Guarantee,Bank Guarantee Type,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ ಟೈಪ್
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಯಾವುದೇ ವ್ಯವಹಾರದಲ್ಲಿ &#39;ವೃತ್ತದ ಒಟ್ಟು&#39; ಕ್ಷೇತ್ರವು ಗೋಚರಿಸುವುದಿಲ್ಲ"
 DocType: Pricing Rule,Min Amt,ಮಿನ್ ಆಮ್ಟ್
@@ -5937,6 +5994,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ಇನ್ವಾಯ್ಸ್ ಸೃಷ್ಟಿ ಟೂಲ್ ಐಟಂ ತೆರೆಯಲಾಗುತ್ತಿದೆ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,ಪಿಓಎಸ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಸೇರಿಸಿ
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},ನೀಡಿರುವ ಉದ್ಯೋಗಿ ಕ್ಷೇತ್ರ ಮೌಲ್ಯಕ್ಕೆ ಯಾವುದೇ ಉದ್ಯೋಗಿ ಕಂಡುಬಂದಿಲ್ಲ. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),ಸ್ವೀಕರಿಸಿದ ಮೊತ್ತ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage ತುಂಬಿದೆ, ಉಳಿಸಲಿಲ್ಲ"
 DocType: Chapter Member,Chapter Member,ಅಧ್ಯಾಯ ಸದಸ್ಯ
@@ -5969,6 +6027,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಲಾಗಿಲ್ಲ.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},ಒಂದೇ {1} ಜೊತೆ ಸಾಲು {0} ನಕಲು
 DocType: Employee,Salary Details,ವೇತನ ವಿವರಗಳು
+DocType: Employee Checkin,Exit Grace Period Consequence,ಗ್ರೇಸ್ ಅವಧಿಯ ಪರಿಣಾಮವಾಗಿ ನಿರ್ಗಮಿಸಿ
 DocType: Bank Statement Transaction Invoice Item,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Special Test Items,Particulars,ವಿವರಗಳು
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,ಐಟಂ ಅಥವಾ ವೇರ್ಹೌಸ್ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಅನ್ನು ಹೊಂದಿಸಿ
@@ -6069,6 +6128,7 @@
 DocType: Serial No,Out of AMC,ಎಎಮ್ಸಿಯ ಔಟ್
 DocType: Job Opening,"Job profile, qualifications required etc.","ಜಾಬ್ ಪ್ರೊಫೈಲ್, ವಿದ್ಯಾರ್ಹತೆಗಳು ಇತ್ಯಾದಿ."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,ರಾಜ್ಯಕ್ಕೆ ಸಾಗಿಸು
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸಲ್ಲಿಸಲು ನೀವು ಬಯಸುವಿರಾ
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರ
 DocType: Compensatory Leave Request,Work End Date,ಕೆಲಸದ ಕೊನೆಯ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ಗಾಗಿ ವಿನಂತಿ
@@ -6253,6 +6313,7 @@
 DocType: Sales Order Item,Gross Profit,ಒಟ್ಟು ಲಾಭ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಸೀರಿಯಲ್ ಇಲ್ಲ
 DocType: Asset,Insurer,ವಿಮೆಗಾರ
+DocType: Employee Checkin,OUT,ಹೊರಗಿದೆ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,ಮೊತ್ತವನ್ನು ಖರೀದಿಸಿ
 DocType: Asset Maintenance Task,Certificate Required,ಪ್ರಮಾಣಪತ್ರ ಅಗತ್ಯವಿದೆ
 DocType: Retention Bonus,Retention Bonus,ಧಾರಣ ಬೋನಸ್
@@ -6453,7 +6514,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,ಸ್ಥಿರ ಆಸ್ತಿ
 DocType: Purchase Order,Ref SQ,SQ ಉಲ್ಲೇಖಿಸಿ
 DocType: Salary Structure,Total Earning,ಒಟ್ಟು ಸಂಪಾದನೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕರ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Share Balance,From No,ಇಲ್ಲ
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ಪಾವತಿ ಸಾಮರಸ್ಯ ಸರಕುಪಟ್ಟಿ
 DocType: Purchase Invoice,Taxes and Charges Added,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಸೇರಿಸಲಾಗಿದೆ
@@ -6561,6 +6621,7 @@
 DocType: POS Profile,Ignore Pricing Rule,ಬೆಲೆ ನಿಯಮವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,ಆಹಾರ
 DocType: Lost Reason Detail,Lost Reason Detail,ಲಾಸ್ಟ್ ರೀಸನ್ ವಿವರ
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},ಕೆಳಗಿನ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ರಚಿಸಲಾಗಿದೆ: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,ಗ್ರಾಹಕ ಪ್ರತಿಕ್ರಿಯೆ
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಂಸಿ ವಿವರಗಳು
 DocType: Issue,Opening Time,ತೆರೆಯುವ ಸಮಯ
@@ -6610,6 +6671,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,ಕಂಪೆನಿ ಹೆಸರು ಒಂದೇ ಅಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,ಪ್ರಚಾರದ ದಿನಾಂಕದ ಮೊದಲು ನೌಕರರ ಪ್ರಚಾರವನ್ನು ಸಲ್ಲಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} ಕ್ಕಿಂತ ಹಳೆಯದಾದ ಸ್ಟಾಕ್ ವಹಿವಾಟುಗಳನ್ನು ನವೀಕರಿಸಲು ಅನುಮತಿಸಲಾಗಿಲ್ಲ
+DocType: Employee Checkin,Employee Checkin,ಉದ್ಯೋಗಿ ಚೆಕ್ಇನ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕವು ಐಟಂಗೆ ಅಂತಿಮ ದಿನಾಂಕಕ್ಕಿಂತ ಕಡಿಮೆ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ಗ್ರಾಹಕರ ಉಲ್ಲೇಖಗಳನ್ನು ರಚಿಸಿ
 DocType: Buying Settings,Buying Settings,ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಖರೀದಿಸುವುದು
@@ -6631,6 +6693,7 @@
 DocType: Patient,Patient Demographics,ರೋಗಿಯ ಜನಸಂಖ್ಯಾಶಾಸ್ತ್ರ
 DocType: Share Transfer,To Folio No,ಪೋಲಿಯೋ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆಗಳಿಂದ ನಗದು ಹರಿವು
+DocType: Employee Checkin,Log Type,ಲಾಗ್ ಪ್ರಕಾರ
 DocType: Stock Settings,Allow Negative Stock,ಋಣಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನ್ನು ಅನುಮತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,ಯಾವುದೇ ಅಂಶಗಳು ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯದಲ್ಲಿ ಯಾವುದೇ ಬದಲಾವಣೆಯನ್ನು ಹೊಂದಿಲ್ಲ.
 DocType: Asset,Purchase Date,ಖರೀದಿಸಿದ ದಿನಾಂಕ
@@ -6675,6 +6738,7 @@
 DocType: Vital Signs,Very Hyper,ಬಹಳ ಹೈಪರ್
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,ನಿಮ್ಮ ವ್ಯವಹಾರದ ಸ್ವರೂಪವನ್ನು ಆಯ್ಕೆಮಾಡಿ.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,ದಯವಿಟ್ಟು ತಿಂಗಳು ಮತ್ತು ವರ್ಷವನ್ನು ಆಯ್ಕೆಮಾಡಿ
+DocType: Service Level,Default Priority,ಡೀಫಾಲ್ಟ್ ಆದ್ಯತೆ
 DocType: Student Log,Student Log,ವಿದ್ಯಾರ್ಥಿ ಲಾಗ್
 DocType: Shopping Cart Settings,Enable Checkout,ಚೆಕ್ಔಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/config/settings.py,Human Resources,ಮಾನವ ಸಂಪನ್ಮೂಲಗಳು
@@ -6703,7 +6767,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ERPNext ನೊಂದಿಗೆ Shopify ಅನ್ನು ಸಂಪರ್ಕಿಸಿ
 DocType: Homepage Section Card,Subtitle,ಉಪಶೀರ್ಷಿಕೆ
 DocType: Soil Texture,Loam,ಲೋಮ್
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಕೌಟುಂಬಿಕತೆ
 DocType: BOM,Scrap Material Cost(Company Currency),ಸ್ಕ್ರ್ಯಾಪ್ ವಸ್ತು ವೆಚ್ಚ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,ಡೆಲಿವರಿ ನೋಟ್ {0} ಅನ್ನು ಸಲ್ಲಿಸಬಾರದು
 DocType: Task,Actual Start Date (via Time Sheet),ನಿಜವಾದ ಪ್ರಾರಂಭ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
@@ -6759,6 +6822,7 @@
 DocType: Drug Prescription,Dosage,ಡೋಸೇಜ್
 DocType: Cheque Print Template,Starting position from top edge,ಉನ್ನತ ಅಂಚಿನಿಂದ ಸ್ಥಾನ ಪ್ರಾರಂಭಿಸಿ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),ನೇಮಕಾತಿ ಅವಧಿ (ನಿಮಿಷಗಳು)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},ಈ ಉದ್ಯೋಗಿಗೆ ಈಗಾಗಲೇ ಅದೇ ಟೈಮ್‌ಸ್ಟ್ಯಾಂಪ್‌ನೊಂದಿಗೆ ಲಾಗ್ ಇದೆ. {0}
 DocType: Accounting Dimension,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 DocType: Email Digest,Purchase Orders to Receive,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಿ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಗಳನ್ನು ಈ ಕೆಳಗಿನವುಗಳಿಗೆ ಎಬ್ಬಿಸಲಾಗುವುದಿಲ್ಲ:
@@ -6774,7 +6838,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,ಸಬ್ ಕಾಂಟ್ರಾಕ್ಟ್ಗಾಗಿ ಮೆಟೀರಿಯಲ್ ಟ್ರಾನ್ಸ್ಫರ್ಡ್
 DocType: Job Card,Timing Detail,ಸಮಯ ವಿವರ
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{1} ರಲ್ಲಿ {0} ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ
 DocType: Job Offer Term,Job Offer Term,ಜಾಬ್ ಆಫರ್ ಟರ್ಮ್
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕ
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
@@ -6825,7 +6888,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,ಐಟಂ {0} ಸೀರಿಯಲ್ ನೊಸ್ಗಾಗಿ ಸೆಟಪ್ ಆಗಿಲ್ಲ. ಐಟಂ ಮಾಸ್ಟರ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,ರಾಜ್ಯದಿಂದ
 DocType: Leave Type,Maximum Continuous Days Applicable,ಗರಿಷ್ಠ ನಿರಂತರ ದಿನಗಳು ಅನ್ವಯಿಸುತ್ತವೆ
-apps/erpnext/erpnext/config/support.py,Support Team.,ಬೆಂಬಲ ತಂಡ.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,ದಯವಿಟ್ಟು ಮೊದಲು ಕಂಪನಿಯ ಹೆಸರನ್ನು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,ಆಮದು ಯಶಸ್ವಿಯಾಗಿದೆ
 DocType: Guardian,Alternate Number,ಪರ್ಯಾಯ ಸಂಖ್ಯೆ
@@ -6917,6 +6979,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,ಸಾಲು # {0}: ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Student Admission,Eligibility and Details,ಅರ್ಹತೆ ಮತ್ತು ವಿವರಗಳು
 DocType: Staffing Plan,Staffing Plan Detail,ಸಿಬ್ಬಂದಿ ಯೋಜನೆ ವಿವರ
+DocType: Shift Type,Late Entry Grace Period,ಲೇಟ್ ಎಂಟ್ರಿ ಗ್ರೇಸ್ ಅವಧಿ
 DocType: Email Digest,Annual Income,ವಾರ್ಷಿಕ ಆದಾಯ
 DocType: Journal Entry,Subscription Section,ಚಂದಾದಾರಿಕೆ ವಿಭಾಗ
 DocType: Salary Slip,Payment Days,ಪಾವತಿ ದಿನಗಳು
@@ -6967,6 +7030,7 @@
 DocType: Journal Entry Account,Account Balance,ಖಾತೆ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Asset Maintenance Log,Periodicity,ಆವರ್ತಕ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,ವೈದ್ಯಕೀಯ ವರದಿ
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,ಶಿಫ್ಟ್‌ನಲ್ಲಿ ಬೀಳುವ ಚೆಕ್‌-ಇನ್‌ಗಳಿಗೆ ಲಾಗ್ ಪ್ರಕಾರದ ಅಗತ್ಯವಿದೆ: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,ಮರಣದಂಡನೆ
 DocType: Item,Valuation Method,ಮೌಲ್ಯಾಂಕನ ವಿಧಾನ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {0} {0}
@@ -7051,6 +7115,7 @@
 DocType: Loan Type,Loan Name,ಸಾಲ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,ಪಾವತಿಯ ಡೀಫಾಲ್ಟ್ ಮೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ
 DocType: Quality Goal,Revision,ಪರಿಷ್ಕರಣೆ
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,ಚೆಕ್- out ಟ್ ಅನ್ನು ಆರಂಭಿಕ (ನಿಮಿಷಗಳಲ್ಲಿ) ಎಂದು ಪರಿಗಣಿಸಿದಾಗ ಶಿಫ್ಟ್ ಅಂತ್ಯದ ಸಮಯ.
 DocType: Healthcare Service Unit,Service Unit Type,ಸೇವಾ ಘಟಕ ಪ್ರಕಾರ
 DocType: Purchase Invoice,Return Against Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ ಹಿಂತಿರುಗಿ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,ಸೀಕ್ರೆಟ್ ರಚಿಸಿ
@@ -7206,12 +7271,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ಉಳಿಸುವ ಮೊದಲು ಸರಣಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಬಳಕೆದಾರನನ್ನು ಒತ್ತಾಯಿಸಲು ನೀವು ಬಯಸಿದರೆ ಇದನ್ನು ಪರಿಶೀಲಿಸಿ. ನೀವು ಇದನ್ನು ಪರಿಶೀಲಿಸಿದರೆ ಪೂರ್ವನಿಯೋಜಿತವಾಗಿರುವುದಿಲ್ಲ.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಹೊಂದಿರುವ ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಹೊಂದಿಸಲು ಮತ್ತು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪತ್ರ ನಮೂದುಗಳನ್ನು ರಚಿಸಲು / ಮಾರ್ಪಡಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 DocType: Expense Claim,Total Claimed Amount,ಒಟ್ಟು ಹಕ್ಕು ಮೊತ್ತ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ {1} ಗಾಗಿ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಅನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,ಅಪ್ ಸುತ್ತುವುದನ್ನು
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,ನಿಮ್ಮ ಸದಸ್ಯತ್ವ 30 ದಿನಗಳಲ್ಲಿ ಅವಧಿ ಮೀರಿದರೆ ಮಾತ್ರ ನವೀಕರಿಸಬಹುದು
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},ಮೌಲ್ಯವು {0} ಮತ್ತು {1} ನಡುವೆ ಇರಬೇಕು
 DocType: Quality Feedback,Parameters,ನಿಯತಾಂಕಗಳು
+DocType: Shift Type,Auto Attendance Settings,ಸ್ವಯಂ ಹಾಜರಾತಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು
 ,Sales Partner Transaction Summary,ಮಾರಾಟದ ಸಂಗಾತಿ ವ್ಯವಹಾರದ ಸಾರಾಂಶ
 DocType: Asset Maintenance,Maintenance Manager Name,ನಿರ್ವಹಣೆ ವ್ಯವಸ್ಥಾಪಕರ ಹೆಸರು
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,ಐಟಂ ವಿವರಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಲು ಇದು ಅಗತ್ಯವಿದೆ.
@@ -7250,6 +7317,7 @@
 DocType: Designation Skill,Skill,ನೈಪುಣ್ಯ
 DocType: Budget Account,Budget Account,ಬಜೆಟ್ ಖಾತೆ
 DocType: Employee Transfer,Create New Employee Id,ಹೊಸ ಉದ್ಯೋಗಿ ಐಡಿ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} is required for 'Profit and Loss' account {1}.,&#39;ಲಾಭ ಮತ್ತು ನಷ್ಟ&#39; ಖಾತೆಗೆ {0} ಅಗತ್ಯವಿದೆ {1}.
 apps/erpnext/erpnext/config/accounting.py,Goods and Services Tax (GST India),ಸರಕು ಮತ್ತು ಸೇವಾ ತೆರಿಗೆ (ಜಿಎಸ್ಟಿ ಭಾರತ)
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Creating Salary Slips...,ಸಂಬಳ ಸ್ಲಿಪ್ಸ್ ರಚಿಸಲಾಗುತ್ತಿದೆ ...
 DocType: Employee Skill,Employee Skill,ಉದ್ಯೋಗಿ ಕೌಶಲ್ಯ
@@ -7304,7 +7372,6 @@
 DocType: Company,Round Off Cost Center,ರೌಂಡ್ ಆಫ್ ಕಾಸ್ಟ್ ಸೆಂಟರ್
 DocType: Supplier Scorecard Criteria,Criteria Weight,ಮಾನದಂಡ ತೂಕ
 DocType: Asset,Depreciation Schedules,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿ
-DocType: Expense Claim Detail,Claim Amount,ಹಕ್ಕು ಮೊತ್ತ
 DocType: Subscription,Discounts,ರಿಯಾಯಿತಿಗಳು
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
 DocType: Subscription,Cancelation Date,ರದ್ದು ದಿನಾಂಕ
@@ -7332,7 +7399,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳನ್ನು ತೋರಿಸು
 DocType: Employee Onboarding,Employee Onboarding,ಉದ್ಯೋಗಿ ಆನ್ಬೋರ್ಡಿಂಗ್
 DocType: POS Closing Voucher,Period End Date,ಅವಧಿ ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,ಮೂಲದಿಂದ ಮಾರಾಟದ ಅವಕಾಶಗಳು
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ಪಟ್ಟಿಯಲ್ಲಿರುವ ಮೊದಲ ಬಿಡಿ ಅನುಮೋದಕವು ಡೀಫಾಲ್ಟ್ ಲೀವ್ ಅಪ್ರೋವರ್ ಆಗಿ ಹೊಂದಿಸಲ್ಪಡುತ್ತದೆ.
 DocType: POS Settings,POS Settings,ಪಿಓಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,ಎಲ್ಲಾ ಖಾತೆಗಳು
@@ -7353,7 +7419,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ಸಾಲು # {0}: ದರವು {1} ಆಗಿರಬೇಕು: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,ಹೆಚ್ಎಲ್ಸಿ-ಸಿಪಿಆರ್ - .YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,ಆರೋಗ್ಯ ಸೇವೆ ವಸ್ತುಗಳು
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,ಯಾವುದೇ ದಾಖಲೆಗಳು ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,ಏಜಿಂಗ್ ರೇಂಜ್ 3
 DocType: Vital Signs,Blood Pressure,ರಕ್ತದೊತ್ತಡ
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,ಟಾರ್ಗೆಟ್ ಆನ್
@@ -7400,6 +7465,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,ಬ್ಯಾಚ್ಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,ರಕ್ಷಣಾ
 DocType: Item,Has Batch No,ಹ್ಯಾಚ್ ಬ್ಯಾಚ್ ಇಲ್ಲ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,ವಿಳಂಬವಾದ ದಿನಗಳು
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿಯ ಹೆಸರು
 DocType: Item Variant,Item Variant,ಐಟಂ ರೂಪಾಂತರ
 DocType: Training Event Employee,Invited,ಆಹ್ವಾನಿಸಲಾಗಿದೆ
@@ -7421,7 +7487,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","ಪ್ರಾರಂಭ ಮತ್ತು ಅಂತ್ಯದ ದಿನಾಂಕಗಳು ಮಾನ್ಯವಾದ ವೇತನದಾರರ ಅವಧಿಯಲ್ಲ, {0} ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುವುದಿಲ್ಲ."
 DocType: POS Profile,Only show Customer of these Customer Groups,ಈ ಗ್ರಾಹಕರ ಗುಂಪಿನ ಗ್ರಾಹಕನನ್ನು ಮಾತ್ರ ತೋರಿಸು
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-DocType: Service Level,Resolution Time,ರೆಸಲ್ಯೂಶನ್ ಸಮಯ
+DocType: Service Level Priority,Resolution Time,ರೆಸಲ್ಯೂಶನ್ ಸಮಯ
 DocType: Grading Scale Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
 DocType: Homepage Section,Cards,ಕಾರ್ಡ್ಗಳು
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ಗುಣಮಟ್ಟ ಸಭೆ ನಿಮಿಷಗಳು
@@ -7494,7 +7560,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,ಪಕ್ಷಗಳು ಮತ್ತು ವಿಳಾಸಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳುವಿಕೆ
 DocType: Item,List this Item in multiple groups on the website.,ಈ ಐಟಂ ಅನ್ನು ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಪಟ್ಟಿ ಮಾಡಿ.
 DocType: Request for Quotation,Message for Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ಸಂದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,{1} ಐಟಂಗೆ ಸ್ಟಾಕ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಗಿ {0} ಬದಲಾಗುವುದಿಲ್ಲ.
 DocType: Healthcare Practitioner,Phone (R),ಫೋನ್ (ಆರ್)
 DocType: Maintenance Team Member,Team Member,ತಂಡದ ಸದಸ್ಯ
 DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 34019d1..cc70fcd 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,약속 {0} 및 판매 송장 {1}이 취소되었습니다.
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,귀하의 이메일 주소 ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,기본 도서 항목 포함
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,기본 도서 항목 포함
 DocType: Activity Cost,Activity Type,활동 유형
 DocType: Purchase Invoice,Get Advances Paid,급여 지불
 DocType: Company,Gain/Loss Account on Asset Disposal,자산 처분 이익 / 손실 계정
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,지불 항목
 DocType: Employee Education,Class / Percentage,클래스 / 백분율
 ,Electronic Invoice Register,전자 인보이스 등록
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,결과가 실행 된 후의 발생 수입니다.
 DocType: Sales Invoice,Is Return (Credit Note),돌아온다 (신용 정보)
+DocType: Price List,Price Not UOM Dependent,UOM에 의존하지 않는 가격
 DocType: Lab Test Sample,Lab Test Sample,실험실 테스트 샘플
 DocType: Shopify Settings,status html,상태 HTML
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","예 : 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,순 유료
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,총 청구 금액
 DocType: Clinical Procedure,Consumables Invoice Separately,소모품 송장 별도
+DocType: Shift Type,Working Hours Threshold for Absent,결근 시간
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},그룹 계정 {0}에 예산을 할당 할 수 없습니다.
 DocType: Purchase Receipt Item,Rate and Amount,요금 및 금액
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,환자 설정
 DocType: Asset,Insurance End Date,보험 종료일
 DocType: Bank Account,Branch Code,지점 코드
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,응답 할 시간
 apps/erpnext/erpnext/public/js/conf.js,User Forum,사용자 포럼
 DocType: Landed Cost Item,Landed Cost Item,상륙 비용 항목
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,판매자와 구매자는 같을 수 없습니다.
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,이전
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),항목 검색 (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} 결과 제출
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,시작일은 이전보다 클 수 없습니다.
 DocType: Supplier,Supplier of Goods or Services.,물품 또는 서비스 공급자.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,새 계정의 이름입니다. 참고 : 고객 및 공급 업체 계정을 만들지 마십시오.
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,학생 그룹 또는 과정 일정은 필수
@@ -882,7 +885,6 @@
 DocType: Skill,Skill Name,기술 이름
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,성적서 인쇄
 DocType: Soil Texture,Ternary Plot,삼원 계획
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,티켓 지원
 DocType: Asset Category Account,Fixed Asset Account,고정 자산 계정
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,최근
@@ -895,6 +897,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,대차 대조표 필수
 DocType: Payment Entry,Total Allocated Amount,총 할당 금액
 DocType: Sales Invoice,Get Advances Received,선불 받기
+DocType: Shift Type,Last Sync of Checkin,마지막 체크인 동기화
 DocType: Student,B-,비-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,값에 포함 된 품목 세금 금액
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -903,7 +906,9 @@
 DocType: Student,Blood Group,혈액형
 apps/erpnext/erpnext/config/healthcare.py,Masters,석사
 DocType: Crop,Crop Spacing UOM,자르기 간격 UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,체크인이 늦은 것으로 간주되는 시프트 시작 시간 이후의 시간 (분).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,탐색
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,미결제 인보이스가 없습니다.
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{3}의 자회사에 대해 이미 계획된 {2}의 {0} 공석 및 {1} 예산. \ 모회사 인 {3}에 대한 인력 계획 {6}에 따라 {4} 개의 공석 만 계획 할 수 있으며 예산은 {5}입니다.
 DocType: Promotional Scheme,Product Discount Slabs,제품 할인 석판
@@ -1005,6 +1010,7 @@
 DocType: Item,Moving Average,이동 평균
 DocType: Employee Attendance Tool,Unmarked Attendance,표시되지 않은 출석
 DocType: Homepage Section,Number of Columns,열 개수
+DocType: Issue Priority,Issue Priority,이슈 우선 순위
 DocType: Holiday List,Add Weekly Holidays,주중 휴일 추가
 DocType: Shopify Log,Shopify Log,Shopify 로그
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,급여 전표 작성
@@ -1013,6 +1019,7 @@
 DocType: Warranty Claim,Issue Date,발행일
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,항목 {0}에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,왼쪽 직원에 대해 보유 보너스를 생성 할 수 없음
+DocType: Employee Checkin,Location / Device ID,위치 / 기기 ID
 DocType: Purchase Order,To Receive,받다
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,오프라인 모드입니다. 네트워크를 가질 때까지 다시로드 할 수 없습니다.
 DocType: Course Activity,Enrollment,등록
@@ -1021,7 +1028,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},최대 값 : {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,이메일 송장 정보 누락
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,중요한 요청이 생성되지 않았습니다.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Loan,Total Amount Paid,총 지불 금액
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,이 모든 항목은 이미 인보이스 발행되었습니다.
 DocType: Training Event,Trainer Name,강사 이름
@@ -1132,6 +1138,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Lead {0}의 리드 이름을 언급하십시오.
 DocType: Employee,You can enter any date manually,수동으로 날짜를 입력 할 수 있습니다.
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,주식 조정 항목
+DocType: Shift Type,Early Exit Consequence,조기 퇴거 결과
 DocType: Item Group,General Settings,일반 설정
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,만기일은 전기 / 공급 업체 인보이스 날짜 이전 일 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,제출하기 전에 수혜자의 이름을 입력하십시오.
@@ -1170,6 +1177,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,지불 확인서
 ,Available Stock for Packing Items,포장 항목에 사용할 수있는 재고
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},C-Form {1}에서이 송장 {0}을 (를) 제거하십시오.
+DocType: Shift Type,Every Valid Check-in and Check-out,모든 유효한 체크인 및 체크 아웃
 DocType: Support Search Source,Query Route String,경로 문자열 쿼리
 DocType: Customer Feedback Template,Customer Feedback Template,고객 피드백 템플릿
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,리드 또는 고객의 의견.
@@ -1204,6 +1212,7 @@
 DocType: Authorization Control,Authorization Control,권한 부여 제어
 ,Daily Work Summary Replies,일별 작업 요약 회신
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},프로젝트에서 공동 작업하도록 초대되었습니다 : {0}
+DocType: Issue,Response By Variance,분산 별 응답
 DocType: Item,Sales Details,판매 세부 정보
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,편지 템플리트
 DocType: Salary Detail,Tax on additional salary,추가 급여에 대한 세금
@@ -1327,6 +1336,7 @@
 DocType: Project,Task Progress,작업 진행률
 DocType: Journal Entry,Opening Entry,Opening Entry
 DocType: Bank Guarantee,Charges Incurred,발생 된 요금
+DocType: Shift Type,Working Hours Calculation Based On,근무 시간 계산에 근거
 DocType: Work Order,Material Transferred for Manufacturing,제조용으로 이전 된 자재
 DocType: Products Settings,Hide Variants,변형 숨기기
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,용량 계획 및 시간 추적 비활성화
@@ -1356,6 +1366,7 @@
 DocType: Guardian,Interests,이해
 DocType: Purchase Receipt Item Supplied,Consumed Qty,소비 된 수량
 DocType: Education Settings,Education Manager,교육 관리자
+DocType: Employee Checkin,Shift Actual Start,실제 시작 이동
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,워크 스테이션 근무 시간 이외의 시간 계획 로그.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},충성도 점수 : {0}
 DocType: Healthcare Settings,Registration Message,등록 메시지
@@ -1380,9 +1391,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,모든 결제 시간에 대해 이미 생성 된 인보이스
 DocType: Sales Partner,Contact Desc,연락처 정보
 DocType: Purchase Invoice,Pricing Rules,가격 결정 규칙
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}",항목 {0}에 대한 기존 트랜잭션이 있으므로 {1}의 값을 변경할 수 없습니다.
 DocType: Hub Tracked Item,Image List,이미지 목록
 DocType: Item Variant Settings,Allow Rename Attribute Value,특성 값 이름 바꾸기 허용
-DocType: Price List,Price Not UOM Dependant,UOM에 의존하지 않는 가격
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),시간 (분)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,기본
 DocType: Loan,Interest Income Account,이자 소득 계정
@@ -1392,6 +1403,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POS 프로파일 선택
 DocType: Support Settings,Get Latest Query,최신 질의 얻기
 DocType: Employee Incentive,Employee Incentive,직원 인센티브
+DocType: Service Level,Priorities,우선 순위
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,홈페이지에 카드 또는 맞춤 섹션 추가
 DocType: Homepage,Hero Section Based On,히어로 섹션 기반
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
@@ -1452,7 +1464,7 @@
 DocType: Blanket Order Item,Ordered Quantity,주문 수량
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 거절 된 창고는 거부 된 아이템 {1}에 대해 의무적입니다.
 ,Received Items To Be Billed,수령 한 수령 품목
-DocType: Salary Slip Timesheet,Working Hours,근무 시간
+DocType: Attendance,Working Hours,근무 시간
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,지불 모드
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,구매 오더 항목을 정시에받지 못함
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,기간 (일)
@@ -1572,7 +1584,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,공급자에 관한 법령 정보 및 기타 일반 정보
 DocType: Item Default,Default Selling Cost Center,기본 판매 코스트 센터
 DocType: Sales Partner,Address & Contacts,주소 및 연락처
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,셋업&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: Subscriber,Subscriber,구독자
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# 양식 / 항목 / {0}) 재고가 없습니다
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,먼저 전기 일을 선택하십시오.
@@ -1583,7 +1594,7 @@
 DocType: Detected Disease,Tasks Created,생성 된 작업
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,이 항목 또는 해당 템플릿에 대해 기본 BOM ({0})이 활성화되어 있어야합니다.
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,수수료율
-DocType: Service Level,Response Time,응답 시간
+DocType: Service Level Priority,Response Time,응답 시간
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce 설정
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,수량은 양수 여야합니다.
 DocType: Contract,CRM,CRM
@@ -1600,7 +1611,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,트랜잭션 데이터 매핑
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,리드는 개인의 이름이나 조직의 이름이 필요합니다.
 DocType: Student,Guardians,수호자
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,브랜드 선택 ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,중간 수입
 DocType: Shipping Rule,Calculate Based On,계산 기준
@@ -1637,6 +1647,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},학생 {1}에 대한 출석 기록 {0}이 (가) 있습니다.
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,거래 일자
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,구독 취소
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,서비스 수준 계약 {0}을 (를) 설정할 수 없습니다.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,순 급여 금액
 DocType: Account,Liability,책임
 DocType: Employee,Bank A/C No.,은행 A / C 번호
@@ -1702,7 +1713,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,원자재 품목 코드
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,구매 송장 {0}이 이미 제출되었습니다.
 DocType: Fees,Student Email,학생 이메일
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM 재귀 : {0}은 (는) {2}의 부모 또는 자식이 될 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,의료 서비스에서 아이템을 얻으십시오.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,재고 항목 {0}이 (가) 제출되지 않았습니다.
 DocType: Item Attribute Value,Item Attribute Value,항목 속성 값
@@ -1727,7 +1737,6 @@
 DocType: Production Plan,Select Items to Manufacture,제조 품목 선택
 DocType: Leave Application,Leave Approver Name,승인자 이름 남기기
 DocType: Shareholder,Shareholder,주주
-DocType: Issue,Agreement Status,계약 상태
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,거래 판매를위한 기본 설정.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,유급 학생 지원자에게 의무적 인 학생 입학을 선택하십시오.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM 선택
@@ -1989,6 +1998,7 @@
 DocType: Account,Income Account,소득 계정
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,모든 창고
 DocType: Contract,Signee Details,서명자 세부 정보
+DocType: Shift Type,Allow check-out after shift end time (in minutes),근무 시간 종료 후 체크 아웃 허용 (분)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,획득
 DocType: Item Group,Check this if you want to show in website,웹 사이트에 표시하려면이 항목을 선택하십시오.
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,회계 연도 {0}을 (를) 찾을 수 없습니다.
@@ -2055,6 +2065,7 @@
 DocType: Activity Cost,Billing Rate,청구 비율
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},경고 : 재고 항목 {2}에 대해 다른 {0} # {1}이 (가) 있습니다.
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,경로를 추정하고 최적화하려면 Google지도 설정을 사용하십시오.
+DocType: Purchase Invoice Item,Page Break,페이지 나누기
 DocType: Supplier Scorecard Criteria,Max Score,최대 점수
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,상환 시작일은 지급일 이전 일 수 없습니다.
 DocType: Support Search Source,Support Search Source,지원 검색 소스
@@ -2123,6 +2134,7 @@
 DocType: Employee Transfer,Employee Transfer,직원 이동
 ,Sales Funnel,영업 유입 경로
 DocType: Agriculture Analysis Criteria,Water Analysis,수질 분석
+DocType: Shift Type,Begin check-in before shift start time (in minutes),근무 시작 시간 (분) 전에 체크인 시작
 DocType: Accounts Settings,Accounts Frozen Upto,계정 최대 냉동
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,편집 할 내용이 없습니다.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",워크 스테이션 {1}에서 사용 가능한 작업 시간보다 {0} 작업이 길면 작업을 여러 작업으로 나누십시오.
@@ -2136,7 +2148,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},판매 주문 {0}은 {1}입니다.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),지불 지연 (일)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,감가 상각 세부 정보 입력
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,고객 PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,예상 배달 날짜는 판매 주문 날짜 이후 여야합니다.
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,항목 수량은 0 일 수 없습니다.
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,잘못된 속성
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},항목 {0}에 대한 BOM을 선택하십시오.
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,송장 유형
@@ -2146,6 +2160,7 @@
 DocType: Volunteer,Afternoon,대낮
 DocType: Vital Signs,Nutrition Values,영양가
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),발열 (38.5 ° C / 101.3 ° F 또는 38 ° C / 100.4 ° F의 지속 온도)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네이밍 시스템을 설정하십시오.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,역전 된 ITC
 DocType: Project,Collect Progress,진행 상황 수집
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,에너지
@@ -2196,6 +2211,7 @@
 ,Ordered Items To Be Billed,주문 항목
 DocType: Taxable Salary Slab,To Amount,금액까지
 DocType: Purchase Invoice,Is Return (Debit Note),반품 여부 (직불 카드)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/config/desktop.py,Getting Started,시작하기
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,병합
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,회계 연도가 저장되면 회계 연도 시작일과 회계 연도 종료일을 변경할 수 없습니다.
@@ -2214,8 +2230,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},유지 관리 시작일은 일련 번호 {0}의 인도 일일 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,행 {0} : 환율은 필수 항목입니다.
 DocType: Purchase Invoice,Select Supplier Address,공급 업체 주소 선택
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}",사용 가능한 수량은 {0}입니다. {1}이 (가) 필요합니다.
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,API 소비자 비밀번호를 입력하십시오.
 DocType: Program Enrollment Fee,Program Enrollment Fee,프로그램 등록비
+DocType: Employee Checkin,Shift Actual End,실제 최종 이동
 DocType: Serial No,Warranty Expiry Date,보증 유효 기간
 DocType: Hotel Room Pricing,Hotel Room Pricing,호텔 객실 가격
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","외적으로 과세 대상 물품 (0 등급 이외, 면제 및 면제"
@@ -2275,6 +2293,7 @@
 DocType: Quality Inspection Reading,Reading 5,독서 5
 DocType: Shopping Cart Settings,Display Settings,화면 설정
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,예약 감가 상각 수를 설정하십시오.
+DocType: Shift Type,Consequence after,결과 후
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,어떤 도움이 필요 하신가요?
 DocType: Journal Entry,Printing Settings,인쇄 설정
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,은행업
@@ -2284,6 +2303,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,대금 청구 주소는 배송 주소와 동일합니다.
 DocType: Account,Cash,현금
 DocType: Employee,Leave Policy,정책 퇴장
+DocType: Shift Type,Consequence,결과
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,학생 주소
 DocType: GST Account,CESS Account,CESS 계정
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1} : 비용 센터는 &#39;손익&#39;계정 {2}에 필요합니다. 회사에 대한 기본 코스트 센터를 설정하십시오.
@@ -2348,6 +2368,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,기 결산권
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 이름
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,비용 계정을 입력하십시오.
+DocType: Issue,Resolution By Variance,분산 별 해상도
 DocType: Employee,Resignation Letter Date,사직서 날짜
 DocType: Soil Texture,Sandy Clay,샌디 클레이
 DocType: Upload Attendance,Attendance To Date,현재까지의 출석
@@ -2360,6 +2381,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,지금보기
 DocType: Item Price,Valid Upto,유효 Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},참조 Doctype은 {0} 중 하나 여야합니다.
+DocType: Employee Checkin,Skip Auto Attendance,자동 출석 건너 뛰기
 DocType: Payment Request,Transaction Currency,거래 통화
 DocType: Loan,Repayment Schedule,상환 일정
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,샘플 보유 재고 항목 생성
@@ -2431,6 +2453,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS 클로징 바우처 세
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,초기화 된 동작
 DocType: POS Profile,Applicable for Users,사용자에게 적용 가능
+,Delayed Order Report,지연된 주문 보고서
 DocType: Training Event,Exam,시험
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,총계정 원장 항목 수가 잘못되었습니다. 거래에서 잘못된 계좌를 선택했을 수 있습니다.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,판매 파이프 라인
@@ -2445,10 +2468,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,선택한 모든 항목을 결합한 조건이 적용됩니다.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,구성
 DocType: Hotel Room,Capacity,생산 능력
+DocType: Employee Checkin,Shift End,시프트 종료
 DocType: Installation Note Item,Installed Qty,설치된 수량
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,{1} 항목의 일괄 처리 {0}이 (가) 비활성화되었습니다.
 DocType: Hotel Room Reservation,Hotel Reservation User,호텔 예약 사용자
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,평일은 두 번 반복되었습니다.
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,엔티티 유형 {0} 및 엔티티 {1}을 (를) 사용하는 서비스 수준 계약이 이미 존재합니다.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},항목 그룹이 항목 {0}에 대해 언급되지 않았습니다.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},이름 오류 : {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,POS 프로필에 지역이 필요합니다.
@@ -2496,6 +2520,7 @@
 DocType: Depreciation Schedule,Schedule Date,일정 날짜
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 사항
 DocType: Job Applicant,Job Opening,일자리 창출
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,마지막으로 성공한 직원 수표 동기화 성공. 모든 로그가 모든 위치에서 동기화되었다고 확신하는 경우에만 재설정하십시오. 확실하지 않은 경우 수정하지 마십시오.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,실제 비용
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),주문 {1}에 대한 총 진척도 ({0})는 총계 ({2})보다 클 수 없습니다.
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,아이템 변형이 업데이트되었습니다.
@@ -2540,6 +2565,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Invocies 받기
 DocType: Tally Migration,Is Day Book Data Imported,데이 북 데이터 가져 오기 여부
 ,Sales Partners Commission,판매 파트너위원회
+DocType: Shift Type,Enable Different Consequence for Early Exit,조기 퇴출시 다른 결과 활성화
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,적법한
 DocType: Loan Application,Required by Date,날짜 별 필요
 DocType: Quiz Result,Quiz Result,퀴즈 결과
@@ -2599,7 +2625,6 @@
 DocType: Pricing Rule,Pricing Rule,가격 결정 규칙
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},휴무 기간 {0}에 대해 선택 가능한 공휴일 목록이 설정되지 않았습니다.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,직원 역할을 설정하려면 직원 레코드의 사용자 ID 필드를 설정하십시오.
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,해결할 시간
 DocType: Training Event,Training Event,교육 행사
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""",성인의 정상적인 휴식 혈압은 수축기의 경우 약 120 mmHg이고 이완기의 경우 80 mmHg이며 &quot;120/80 mmHg&quot;
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,제한값이 0이면 시스템은 모든 항목을 가져옵니다.
@@ -2643,6 +2668,7 @@
 DocType: Student Applicant,Approved,승인 됨
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},From Date는 회계 연도 내에 있어야합니다. 시작 날짜 가정 = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,구매 설정에서 공급 업체 그룹을 설정하십시오.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{}은 (는) 잘못된 출석 상태입니다.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,임시 개회 계좌
 DocType: Purchase Invoice,Cash/Bank Account,현금 / 은행 계좌
 DocType: Quality Meeting Table,Quality Meeting Table,품질 회의 테이블
@@ -2678,6 +2704,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","식품, 음료 및 담배"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,수업 일정
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,품목 현명한 세금 세부 사항
+DocType: Shift Type,Attendance will be marked automatically only after this date.,출석은이 날짜 이후에만 자동으로 표시됩니다.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,UIN 홀더에 공급 된 물품
 apps/erpnext/erpnext/hooks.py,Request for Quotations,견적 요청
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,다른 통화를 사용하여 입력 한 후에 통화를 변경할 수 없습니다.
@@ -2726,7 +2753,6 @@
 DocType: Item,Is Item from Hub,허브로부터의 아이템인가
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,품질 절차.
 DocType: Share Balance,No of Shares,주식수
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0} : 항목 게시 시간 ({2} {3})에 창고 {1}의 {4}에 대해 수량을 사용할 수 없습니다
 DocType: Quality Action,Preventive,예방법
 DocType: Support Settings,Forum URL,포럼 URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,직원 및 출석
@@ -2948,7 +2974,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,기본 세금 및 수수료
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,이것은이 공급자에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오.
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,계약의 시작일과 종료일을 입력하십시오.
 DocType: Delivery Note Item,Against Sales Invoice,판매 송장 대비
 DocType: Loyalty Point Entry,Purchase Amount,구매 금액
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,판매 주문서가 분실 됨으로 설정할 수 없습니다.
@@ -2972,7 +2997,7 @@
 DocType: Lead,Organization Name,조직 이름
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,유효 기간 및 유효 기간은 누적 된 항목에 대해 필수 항목입니다.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},행 # {0} : 배치 번호는 {1}과 같아야합니다 {2}
-DocType: Employee,Leave Details,세부 정보 남기기
+DocType: Employee Checkin,Shift Start,시프트 시작
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0} 이전의 주식 거래가 고정되었습니다.
 DocType: Driver,Issuing Date,발행 날짜
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,요청자
@@ -3017,9 +3042,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,현금 흐름 매핑 템플릿 세부 정보
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,채용 및 교육
 DocType: Drug Prescription,Interval UOM,간격 UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,자동 출석을위한 유예 기간 설정
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,통화 및 원화는 동일 할 수 없습니다.
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,제약
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,지원 시간
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1}이 (가) 취소되거나 닫힙니다.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 대출은 크레딧이어야합니다.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),바우처 그룹 (연결)
@@ -3129,6 +3156,7 @@
 DocType: Territory,Territory Manager,지역 관리자
 DocType: Lab Test,Sample ID,샘플 ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,장바구니가 비어 있습니다.
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,직원 체크 인당 출석이 표시되었습니다.
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,애셋 {0}을 제출해야합니다.
 ,Absent Student Report,부재 학생 보고서
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,매출 총 이익에 포함
@@ -3136,7 +3164,9 @@
 DocType: Travel Request Costing,Funded Amount,자금 금액
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1}이 (가) 제출되지 않았으므로 작업을 완료 할 수 없습니다.
 DocType: Subscription,Trial Period End Date,평가판 종료일
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,동일한 시프트 동안 IN 및 OUT으로 항목 교번
 DocType: BOM Update Tool,The new BOM after replacement,교체 후 새로운 BOM
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,항목 5
 DocType: Employee,Passport Number,여권 번호
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,임시 개업
@@ -3252,6 +3282,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,가능한 공급 업체
 ,Issued Items Against Work Order,작업 지시서와 관련하여 발급 된 품목
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,송장 생성 {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 DocType: Student,Joining Date,가입 날짜
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,요청 사이트
 DocType: Purchase Invoice,Against Expense Account,경비 계정 대비
@@ -3291,6 +3322,7 @@
 DocType: Landed Cost Item,Applicable Charges,해당 요금
 ,Point of Sale,판매 시점
 DocType: Authorization Rule,Approving User  (above authorized value),사용자 승인 (승인 된 값 이상)
+DocType: Service Level Agreement,Entity,실재
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{2}에서 {3}으로 이전 된 금액 {0} {1}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},고객 {0}은 (는) 프로젝트 {1}에 속해 있지 않습니다.
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,파티 이름에서
@@ -3337,6 +3369,7 @@
 DocType: Soil Texture,Sand Composition (%),모래 조성 (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP- .YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,데이 북 데이터 가져 오기
+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}으로 설정하십시오.
 DocType: Asset,Asset Owner Company,자산 소유자 회사
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,경비 청구서를 예약하려면 코스트 센터가 필요합니다.
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},Item {1}에 대한 {0} 유효한 일련 번호
@@ -3397,7 +3430,6 @@
 DocType: Asset,Asset Owner,애셋 소유자
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},창고는 {1} 행의 재고 품목 {0}에 대해 필수입니다.
 DocType: Stock Entry,Total Additional Costs,총 추가 비용
-DocType: Marketplace Settings,Last Sync On,마지막 동기화
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,세금 및 비용 표에 행을 하나 이상 설정하십시오.
 DocType: Asset Maintenance Team,Maintenance Team Name,유지 보수 팀 이름
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,코스트 센터 차트
@@ -3413,12 +3445,12 @@
 DocType: Job Card,WIP Warehouse,WIP 창고
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ- .YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},직원 {0}에 대해 사용자 ID가 설정되지 않았습니다.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}",사용 가능한 수량은 {0}입니다. {1}이 (가) 필요합니다.
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,사용자가 {0}이 (가) 생성되었습니다.
 DocType: Stock Settings,Item Naming By,항목 이름 지정 기준
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,주문 됨
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,이것은 루트 고객 그룹이며 편집 할 수 없습니다.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,자재 요청 {0}이 취소 또는 중지되었습니다.
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,엄격하게 직원 유형의 로그 유형을 기준으로합니다.
 DocType: Purchase Order Item Supplied,Supplied Qty,공급 된 수량
 DocType: Cash Flow Mapper,Cash Flow Mapper,캐시 플로 매퍼
 DocType: Soil Texture,Sand,모래
@@ -3477,6 +3509,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,항목 그룹 테이블에서 중복 된 항목 그룹을 찾았습니다.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,연봉
 DocType: Supplier Scorecard,Weighting Function,가중치 함수
+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})가 없습니다.
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,기준 수식을 평가하는 중 오류가 발생했습니다.
 ,Lab Test Report,실험실 테스트 보고서
 DocType: BOM,With Operations,운영과 함께
@@ -3490,6 +3523,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,분개에 대해 상환하지 않음
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1}은 (는) 비활성 학생입니다.
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,재고 항목 만들기
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM 재귀 : {0}은 (는) {1}의 부모 또는 자식이 될 수 없습니다.
 DocType: Employee Onboarding,Activities,활동
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,최소한 하나의 창고가 필수입니다.
 ,Customer Credit Balance,고객 신용 잔액
@@ -3502,9 +3536,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,고객을 위해 여러 로열티 프로그램이 있습니다. 수동으로 선택하십시오.
 DocType: Patient,Medication,약물 치료
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,로열티 프로그램 선택
+DocType: Employee Checkin,Attendance Marked,출석 표식
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,원자재
 DocType: Sales Order,Fully Billed,완전히 청구 됨
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{}에 호텔 객실 요금을 설정하십시오.
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Priority as Default를 하나만 선택하십시오.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},유형 - {0}에 대한 계정 (원장)을 식별 / 생성하십시오.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,총 크레딧 / 데빗 금액은 연결된 분개와 동일해야합니다.
 DocType: Purchase Invoice Item,Is Fixed Asset,고정 자산
@@ -3525,6 +3561,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,예약 확인
 DocType: Shopping Cart Settings,Orders,명령
 DocType: HR Settings,Retirement Age,퇴직 연령
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,예상 수량
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},{0} 국가에서는 삭제할 수 없습니다.
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},행 # {0} : 자산 {1}이 (가) 이미 {2}
@@ -3608,11 +3645,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,회계사
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS Closing Voucher 날짜가 {1}에서 {2} 사이의 {0}
 apps/erpnext/erpnext/config/help.py,Navigating,네비게이션
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,미결제 인보이스에는 환율 재평가가 필요 없습니다.
 DocType: Authorization Rule,Customer / Item Name,고객 / 품목 이름
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 일련 번호에는 창고가 없습니다. 창고는 재고 입력 또는 구매 영수증에 의해 설정되어야합니다.
 DocType: Issue,Via Customer Portal,고객 포털을 통해
 DocType: Work Order Operation,Planned Start Time,계획된 시작 시간
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1}은 (는) {2}입니다.
+DocType: Service Level Priority,Service Level Priority,서비스 수준 우선 순위
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,감가 상각 된 수는 감가 상각의 총 수보다 클 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,공유 원장
 DocType: Journal Entry,Accounts Payable,채무
@@ -3723,7 +3762,6 @@
 DocType: Delivery Note,Delivery To,에 배달하다
 DocType: Bank Statement Transaction Settings Item,Bank Data,은행 데이터
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,예정된 개까지
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,작업 표에서 동일한 청구 시간 및 근무 시간 유지
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,리드 소스 별 리드 추적
 DocType: Clinical Procedure,Nursing User,간호 사용자
 DocType: Support Settings,Response Key List,응답 키 목록
@@ -3891,6 +3929,7 @@
 DocType: Work Order Operation,Actual Start Time,실제 시작 시간
 DocType: Antibiotic,Laboratory User,실험실 사용자
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,온라인 경매
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,우선 순위 {0}이 반복되었습니다.
 DocType: Fee Schedule,Fee Creation Status,수수료 생성 상태
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,소프트웨어
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,지불을위한 판매 주문
@@ -3957,6 +3996,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0}에 대한 정보를 검색 할 수 없습니다.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,결제 통화는 기본 회사 통화 또는 당좌 계좌 통화와 동일해야합니다.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오.
+DocType: Shift Type,Early Exit Consequence after,조기 퇴거 후 결과
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,개시 판매 및 구매 송장 생성
 DocType: Disease,Treatment Period,치료 기간
 apps/erpnext/erpnext/config/settings.py,Setting up Email,이메일 설정하기
@@ -3974,7 +4014,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,학생 이름:
 DocType: SMS Log,Sent On,보낸 날짜
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,판매 송장
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,응답 시간은 해결 시간보다 클 수 없습니다.
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","과정 기반 학생 그룹의 경우, 프로그램 등록 과정에 등록 된 과정의 모든 학생에 대해 과정이 검증됩니다."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,주내 공급품
 DocType: Employee,Create User Permission,사용자 권한 생성
@@ -4013,6 +4052,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,판매 또는 구매에 대한 표준 계약 조건.
 DocType: Sales Invoice,Customer PO Details,고객 PO 세부 사항
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,환자를 찾을 수 없음
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,기본 우선 순위를 선택하십시오.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,해당 항목에 청구가 적용되지 않는 경우 항목 삭제
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,이름이 같은 고객 그룹이 존재합니다. 고객 이름을 변경하거나 고객 그룹의 이름을 변경하십시오.
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4052,6 +4092,7 @@
 DocType: Support Settings,Support Portal,지원 포털
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,작업 <b>{0}의</b> 종료일은 <b>{1}</b> 예상 시작일 <b>{2}</b> 보다 낮을 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},직원 {0}이 (가) {1}에 출발합니다.
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},"이 서비스 수준 계약은 고객 {0}에만 해당되며,"
 DocType: Employee,Held On,에 개최
 DocType: Healthcare Practitioner,Practitioner Schedules,개업 의사 일정
 DocType: Project Template Task,Begin On (Days),시작일 (일)
@@ -4059,6 +4100,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},작업 지시가 {0}되었습니다.
 DocType: Inpatient Record,Admission Schedule Date,입학 예정일
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,자산 가치 조정
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,이 교대 근무자에게 &#39;직원 수표&#39;를 기준으로 출석을 표시하십시오.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,미등록 된 사람들에게 공급 된 물품
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,모든 일
 DocType: Appointment Type,Appointment Type,예약 유형
@@ -4172,7 +4214,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),포장의 총중량. 보통 순 중량 + 포장재 무게. (인쇄용)
 DocType: Plant Analysis,Laboratory Testing Datetime,실험실 테스트 날짜 시간
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,{0} 항목은 일괄 처리 할 수 없습니다.
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,단계별 판매 파이프 라인
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,학생 그룹의 힘
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,은행 거래 명세서
 DocType: Purchase Order,Get Items from Open Material Requests,미적재 요청에서 항목 가져 오기
@@ -4254,7 +4295,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,웨어 하우스 고령화 표시
 DocType: Sales Invoice,Write Off Outstanding Amount,미 지불 금액 상각
 DocType: Payroll Entry,Employee Details,직원 세부 정보
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,시작 시간은 {0}의 종료 시간보다 클 수 없습니다.
 DocType: Pricing Rule,Discount Amount,할인 량
 DocType: Healthcare Service Unit Type,Item Details,상품 상세
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},기간 {1}에 대한 중복 세금 선언 {0}
@@ -4307,7 +4347,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,순 임금은 음수가 될 수 없습니다.
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,상호 작용 수 없음
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},행 {0} # 구매 주문 {3}에 대해 {1} 품목을 {2} 이상으로 이전 할 수 없습니다.
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,시프트
+DocType: Attendance,Shift,시프트
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,계정과 당사자의 처리 차트
 DocType: Stock Settings,Convert Item Description to Clean HTML,항목 설명을 HTML로 변환
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,모든 공급 업체 그룹
@@ -4378,6 +4418,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,학부모 서비스 부서
 DocType: Sales Invoice,Include Payment (POS),지불 포함 (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,사모
+DocType: Shift Type,First Check-in and Last Check-out,첫 번째 체크인 및 마지막 체크 아웃
 DocType: Landed Cost Item,Receipt Document,영수증 문서
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,공급 업체 성과 기록표 기간
 DocType: Employee Grade,Default Salary Structure,기본 연봉 구조
@@ -4460,6 +4501,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,구매 주문 만들기
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,회계 연도의 예산을 정의하십시오.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,계정 표는 비워 둘 수 없습니다.
+DocType: Employee Checkin,Entry Grace Period Consequence,엔트리 유예 기간 결과
 ,Payment Period Based On Invoice Date,송장 일 기준 지급 기간
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},{0} 품목의 설치 날짜가 배송일보다 이전 일 수 없습니다.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,자재 요청 링크
@@ -4468,6 +4510,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} :이 창고 {1}에 대한 Reorder 항목이 이미 있습니다.
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,문서 날짜
 DocType: Monthly Distribution,Distribution Name,배포 이름
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,평일 ({0})이 반복되었습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,비 그룹화 그룹
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,진행중인 업데이트. 시간이 좀 걸릴 수 있습니다.
 DocType: Item,"Example: ABCD.#####
@@ -4480,6 +4523,7 @@
 DocType: Vehicle Log,Fuel Qty,연료 수량
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 모바일 아니요
 DocType: Invoice Discounting,Disbursed,지불
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,체크 아웃이 출석으로 간주되는 이동 종료 후 시간.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,채무 순액 변경
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,사용 불가
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,파트 타임
@@ -4493,7 +4537,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,프린트에서 PDC 표시
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify 공급 업체
 DocType: POS Profile User,POS Profile User,POS 프로필 사용자
-DocType: Student,Middle Name,중간 이름
 DocType: Sales Person,Sales Person Name,영업 담당자 이름
 DocType: Packing Slip,Gross Weight,총 중량
 DocType: Journal Entry,Bill No,빌 번호
@@ -4502,7 +4545,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG- .YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,서비스 수준 계약
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,직원과 날짜를 먼저 선택하십시오.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,항목 평가율은 착지 비용 쿠폰 금액을 고려하여 다시 계산됩니다.
 DocType: Timesheet,Employee Detail,직원 세부 정보
 DocType: Tally Migration,Vouchers,바우처
@@ -4537,7 +4579,7 @@
 DocType: Additional Salary,Date on which this component is applied,이 구성 요소가 적용되는 날짜
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Folio 번호가있는 사용 가능한 주주 목록
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,게이트웨이 계정 설정.
-DocType: Service Level,Response Time Period,응답 시간
+DocType: Service Level Priority,Response Time Period,응답 시간
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금 및 요금
 DocType: Course Activity,Activity Date,활동 날짜
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,신규 고객 선택 또는 추가
@@ -4562,6 +4604,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,회계 연도
 DocType: Sales Invoice Item,Deferred Revenue,지연된 수익
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,적어도 판매 또는 구매 중 하나를 선택해야합니다.
+DocType: Shift Type,Working Hours Threshold for Half Day,반나절 근무 시간 기준
 ,Item-wise Purchase History,아이템 별 구매 내역
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},{0} 행의 항목에 대한 서비스 중지 날짜를 변경할 수 없습니다.
 DocType: Production Plan,Include Subcontracted Items,외주 품목 포함
@@ -4594,6 +4637,7 @@
 DocType: BOM,Allow Same Item Multiple Times,동일한 항목을 여러 번 허용
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOM 생성
 DocType: Healthcare Practitioner,Charges,요금
+DocType: Employee,Attendance and Leave Details,출석 및 휴가 세부 정보
 DocType: Student,Personal Details,개인 세부 정보
 DocType: Sales Order,Billing and Delivery Status,청구서 발송 및 배송 상태
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,행 {0} : 공급 업체 {0}의 경우 전자 메일을 보내려면 전자 메일 주소가 필요합니다.
@@ -4644,7 +4688,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},{0}에서 {1} 사이의 값을 입력하십시오.
 DocType: Purchase Order,Order Confirmation Date,주문 확인 날짜
 DocType: Delivery Trip,Calculate Estimated Arrival Times,예상 도착 시간 계산
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네이밍 시스템을 설정하십시오.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,소모품
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS- .YYYY.-
 DocType: Subscription,Subscription Start Date,구독 시작 날짜
@@ -4667,7 +4710,7 @@
 DocType: Journal Entry Account,Journal Entry Account,분개 계정
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,다른
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,포럼 활동
-DocType: Service Level,Resolution Time Period,해결 기간
+DocType: Service Level Priority,Resolution Time Period,해결 기간
 DocType: Request for Quotation,Supplier Detail,공급 업체 세부 정보
 DocType: Project Task,View Task,작업보기
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
@@ -4734,6 +4777,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,창고는 재고 / 납품서 / 구매 영수증을 통해서만 변경할 수 있습니다.
 DocType: Support Settings,Close Issue After Days,일 이후 마감 된 문제
 DocType: Payment Schedule,Payment Schedule,지불 일정
+DocType: Shift Type,Enable Entry Grace Period,입력 유예 기간 활성화
 DocType: Patient Relation,Spouse,배우자
 DocType: Purchase Invoice,Reason For Putting On Hold,보류중인 이유
 DocType: Item Attribute,Increment,증가
@@ -4873,6 +4917,7 @@
 DocType: Vehicle Log,Invoice Ref,송장 참조
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C- 양식은 송장에 적용 할 수 없습니다 : {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,생성 된 송장
+DocType: Shift Type,Early Exit Grace Period,조기 퇴거 유예 기간
 DocType: Patient Encounter,Review Details,세부 정보 검토
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,행 {0} : 시간 값은 0보다 커야합니다.
 DocType: Account,Account Number,계좌 번호
@@ -4884,7 +4929,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","회사가 SpA, SApA 또는 SRL 인 경우 적용 가능"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,다음 중 겹치는 조건이 있음 :
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,유료 및 미제출
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,품목 번호가 자동으로 매겨지지 않기 때문에 품목 코드는 필수 항목입니다.
 DocType: GST HSN Code,HSN Code,HSN 코드
 DocType: GSTR 3B Report,September,구월
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,행정 비용
@@ -4920,6 +4964,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,CWIP 계정
 DocType: SMS Log,Sender Name,발신자 이름
 DocType: Pricing Rule,Supplier Group,공급 업체 그룹
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",\ Support Day {0}의 시작 시간과 종료 시간을 인덱스 {1}에 설정하십시오.
 DocType: Employee,Date of Issue,발행일
 ,Requested Items To Be Transferred,요청 항목 전송 됨
 DocType: Employee,Contract End Date,계약 종료일
@@ -4930,6 +4976,7 @@
 DocType: Opportunity,Sales Stage,판매 단계
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Sales Order를 저장하면 단어가 표시됩니다.
 DocType: Item Reorder,Re-order Level,레벨 재정렬
+DocType: Shift Type,Enable Auto Attendance,자동 출석 사용
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,우선권
 ,Department Analytics,부서 분석
 DocType: Crop,Scientific Name,과학적인 이름
@@ -4942,6 +4989,7 @@
 DocType: Quiz Activity,Quiz Activity,퀴즈 활동
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0}은 (는) 유효한 급여 기간에 없습니다.
 DocType: Timesheet,Billed,과금 된
+apps/erpnext/erpnext/config/support.py,Issue Type.,문제 유형.
 DocType: Restaurant Order Entry,Last Sales Invoice,마지막 판매 송장
 DocType: Payment Terms Template,Payment Terms,지불 조건
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.",예약 된 수량 : 판매 주문되었지만 배달되지 않은 수량.
@@ -5037,6 +5085,7 @@
 DocType: Account,Asset,유산
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0}에는 건강 관리사 일정이 없습니다. Healthcare Practitioner 마스터에 추가하십시오.
 DocType: Vehicle,Chassis No,섀시 번호
+DocType: Employee,Default Shift,기본 Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,회사 약어
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,BOM 트리
 DocType: Article,LMS User,LMS 사용자
@@ -5085,6 +5134,7 @@
 DocType: Sales Person,Parent Sales Person,학부모 판매원
 DocType: Student Group Creation Tool,Get Courses,코스 얻기
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 # {0} : 항목은 고정 자산이므로 수량은 1이어야합니다. 여러 개의 수량에 대해 별도의 행을 사용하십시오.
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),결근이 표시된 근무 시간. (사용하지 않으려면 0으로 설정)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,트랜잭션에서 리프 노드 만 허용됩니다.
 DocType: Grant Application,Organization,조직
 DocType: Fee Category,Fee Category,수수료 카테고리
@@ -5097,6 +5147,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,이 교육 이벤트의 상태를 업데이트하십시오.
 DocType: Volunteer,Morning,아침
 DocType: Quotation Item,Quotation Item,견적 항목
+apps/erpnext/erpnext/config/support.py,Issue Priority.,이슈 우선 순위.
 DocType: Journal Entry,Credit Card Entry,신용 카드 기입
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}",시간 슬롯을 건너 뛰고 슬롯 {0}을 (를) {1} (으)로 이동하여 기존 슬롯 {2}을 (를) {3}
 DocType: Journal Entry Account,If Income or Expense,소득 또는 지출
@@ -5147,11 +5198,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,데이터 가져 오기 및 설정
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)",자동 선택 기능을 선택하면 고객이 관련 로열티 프로그램과 자동으로 연결됩니다 (저장시).
 DocType: Account,Expense Account,지출 계좌
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,직원 수표가 출석으로 간주되는 근무 시작 시간 전의 시간.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Guardian1과의 관계
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,송장 생성
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},지불 요청이 이미 있습니다. {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0}에서 구제받는 직원은 &#39;왼쪽&#39;으로 설정해야합니다.
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},{0} {1} 지불
+DocType: Company,Sales Settings,판매 설정
 DocType: Sales Order Item,Produced Quantity,생산 수량
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,견적 요청은 다음 링크를 클릭하여 액세스 할 수 있습니다
 DocType: Monthly Distribution,Name of the Monthly Distribution,월간 배포의 이름
@@ -5230,6 +5283,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,판매 및 구매에 대한 기본 세금 템플릿이 생성됩니다.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,탈퇴 유형 {0}은 (는) 이월 될 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,직불 계정은 미수금 계정이어야합니다.
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,계약 종료일은 오늘보다 짧을 수 없습니다.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Company {1}의 창고 {0} 또는 기본 재고 계정에 계정을 설정하십시오.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,기본값으로 설정
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),이 패키지의 순 중량. (항목의 순중량의 합계로 자동 계산됨)
@@ -5256,8 +5310,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,만료 된 배치
 DocType: Shipping Rule,Shipping Rule Type,선적 규칙 유형
 DocType: Job Offer,Accepted,수락 된
-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> \을 (를) 삭제하십시오."
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,귀하는 이미 평가 기준 {}을 평가했습니다.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,배치 번호 선택
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),연령 (일)
@@ -5284,6 +5336,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,도메인 선택
 DocType: Agriculture Task,Task Name,작업 이름
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,작업 공정을 위해 이미 생성 된 재고 항목
+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> \을 (를) 삭제하십시오."
 ,Amount to Deliver,배달 금액
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,회사가 {0} 존재하지 않습니다.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,주어진 아이템에 대한 링크 요청이 보류 중입니다.
@@ -5333,6 +5387,7 @@
 DocType: Lab Prescription,Test Code,테스트 코드
 DocType: Purchase Taxes and Charges,On Previous Row Total,이전 행 합계
 DocType: Student,Student Email Address,학생 이메일 주소
+,Delayed Item Report,지연된 품목 신고
 DocType: Academic Term,Education,교육
 DocType: Supplier Quotation,Supplier Address,공급 업체 주소
 DocType: Salary Detail,Do not include in total,전체에 포함시키지 마십시오.
@@ -5340,7 +5395,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0} : {1}이 (가) 존재하지 않습니다.
 DocType: Purchase Receipt Item,Rejected Quantity,거부 된 수량
 DocType: Cashier Closing,To TIme,TIme하려면
-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: Daily Work Summary Group User,Daily Work Summary Group User,일별 작업 요약 그룹 사용자
 DocType: Fiscal Year Company,Fiscal Year Company,회계 연도 회사
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,대체 품목은 품목 코드와 같으면 안됩니다.
@@ -5392,6 +5446,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,배달 중단 사이의 지연
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days]보다 오래된 주식 고정
 DocType: Promotional Scheme,Promotional Scheme Product Discount,프로모션 제도 제품 할인
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,문제 우선 순위 이미 있음
 DocType: Account,Asset Received But Not Billed,자산은 수령되었지만 청구되지 않음
 DocType: POS Closing Voucher,Total Collected Amount,수집 된 총 금액
 DocType: Course,Default Grading Scale,기본 채점 척도
@@ -5434,6 +5489,7 @@
 DocType: Contract,Fulfilment Terms,이행 조건
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,그룹이 아닌 그룹
 DocType: Student Guardian,Mother,어머니
+DocType: Issue,Service Level Agreement Fulfilled,서비스 수준 계약 완료
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,청구되지 않은 종업원 급여에 대한 세금 공제
 DocType: Travel Request,Travel Funding,여행 기금
 DocType: Shipping Rule,Fixed,결정된
@@ -5463,10 +5519,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,제품을 찾지 못했습니다.
 DocType: Item Attribute,From Range,범위에서
 DocType: Clinical Procedure,Consumables,소모품
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39;및 &#39;timestamp&#39;가 필요합니다.
 DocType: Purchase Taxes and Charges,Reference Row #,참조 행 #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},{0} 회사의 &#39;자산 감가 상각비 센터&#39;를 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,행 # {0} : 거래 완료를 위해 지불 문서가 필요합니다.
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Amazon MWS에서 판매 주문 데이터를 가져 오려면이 단추를 클릭하십시오.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),반나절이 표시된 근무 시간. (사용하지 않으려면 0으로 설정)
 ,Assessment Plan Status,평가 계획 상태
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,먼저 {0}을 (를) 선택하십시오.
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Employee 레코드를 생성하려면 이것을 제출하십시오.
@@ -5537,6 +5595,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,세트 열기
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,토글 필터
 DocType: Production Plan,Material Request Detail,자재 요청 세부 사항
+DocType: Shift Type,Process Attendance After,프로세스 출석 이후
 DocType: Material Request Item,Quantity and Warehouse,수량 및 창고
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,프로그램으로 이동
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},행 # {0} : 참조 {1}에 중복 항목이 있습니다. {2}
@@ -5594,6 +5653,7 @@
 DocType: Pricing Rule,Party Information,파티 정보
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),채무자 ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,현재까지 직원의 해고 날짜보다 클 수 없습니다.
+DocType: Shift Type,Enable Exit Grace Period,유예 기간 종료 사용
 DocType: Expense Claim,Employees Email Id,직원 전자 메일 ID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Shopify에서 ERPNext 가격 목록으로 가격 업데이트
 DocType: Healthcare Settings,Default Medical Code Standard,기본 의료법 표준
@@ -5624,7 +5684,6 @@
 DocType: Budget,Applicable on Material Request,자재 요청에 적용 가능
 DocType: Support Settings,Search APIs,검색 API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,판매 주문의 과잉 생산 백분율
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,명세서
 DocType: Purchase Invoice,Supplied Items,기본 제공 품목
 DocType: Leave Control Panel,Select Employees,직원 선택
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},대출 {0}에서이자 소득 계좌를 선택하십시오.
@@ -5650,7 +5709,7 @@
 ,Supplier-Wise Sales Analytics,공급 업체 - 현명한 판매 분석
 DocType: GSTR 3B Report,February,이월
 DocType: Appraisal,For Employee,직원 용
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,실제 배송 날짜
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,실제 배송 날짜
 DocType: Sales Partner,Sales Partner Name,판매 파트너 이름
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,감가 상각 행 {0} : 감가 상각 시작일이 과거 날짜로 입력됩니다.
 DocType: GST HSN Code,Regional,지역
@@ -5689,6 +5748,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,공급 업체 성과표
 DocType: Travel Itinerary,Travel To,여행지
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,출석 표식
+DocType: Shift Type,Determine Check-in and Check-out,체크인 및 체크 아웃 결정
 DocType: POS Closing Voucher,Difference,차
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,작은
 DocType: Work Order Item,Work Order Item,작업 주문 항목
@@ -5722,6 +5782,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,약
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1}이 (가) 닫힙니다.
 DocType: Patient,Medical History,의료 기록
+DocType: Expense Claim,Expense Taxes and Charges,경비 및 세금
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,가입을 취소하거나 가입을 미결제로 표시하기까지 인보이스 일자가 경과 한 날 수
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,설치 노트 {0}이 (가) 이미 제출되었습니다.
 DocType: Patient Relation,Family,가족
@@ -5753,7 +5814,6 @@
 apps/erpnext/erpnext/config/accounting.py,Tax Withholding rates to be applied on transactions.,거래에 적용되는 세금 원천 징수.
 DocType: Dosage Strength,Strength,힘
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,하청의 원자재 Backflush
-DocType: Bank Guarantee,Customer,고객
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",이 옵션을 사용하면 프로그램 등록 도구에서 Academic Term 필드가 필수 항목이됩니다.
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","배치 기반 학생 그룹의 경우, 학생 배치는 프로그램 등록에서 모든 학생에 대해 유효성이 검사됩니다."
 DocType: Course,Topics,토픽
@@ -5833,6 +5893,7 @@
 DocType: Chapter,Chapter Members,지부 회원들
 DocType: Warranty Claim,Service Address,서비스 주소
 DocType: Journal Entry,Remark,말
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0} : 항목 게시 시간 ({2} {3})에 창고 {1}의 {4}에 수량을 사용할 수 없습니다
 DocType: Patient Encounter,Encounter Time,만남의 시간
 DocType: Serial No,Invoice Details,인보이스 세부 정보
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups",그룹에서 추가 계정을 만들 수 있지만 비 그룹스에 대해 항목을 만들 수 있습니다.
@@ -5913,6 +5974,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),결산 (개회 + 총)
 DocType: Supplier Scorecard Criteria,Criteria Formula,기준 수식
 apps/erpnext/erpnext/config/support.py,Support Analytics,지원 분석
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),출석 장치 ID (생체 / RF 태그 ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,검토 및 조치
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",계정이 고정되어 있으면 제한된 사용자에게 항목을 허용합니다.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,감가 상각 후 금액
@@ -5934,6 +5996,7 @@
 DocType: Salary Slip,Loan Repayment,대출 상환
 DocType: Employee Education,Major/Optional Subjects,전공 선택 과목
 DocType: Soil Texture,Silt,미사
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,공급 업체 주소 및 연락처
 DocType: Bank Guarantee,Bank Guarantee Type,은행 보증 유형
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",사용 중지 된 경우 &#39;Rounded Total&#39;입력란은 거래에서 표시되지 않습니다.
 DocType: Pricing Rule,Min Amt,민 암트
@@ -5972,6 +6035,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,개설 송장 생성 도구 항목
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,POS 트랜잭션 포함
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},주어진 직원 필드 값에 대해 직원이 없습니다. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),수령 금액 (회사 통화)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save",LocalStorage가 꽉 찼습니다. 저장하지 않았습니다.
 DocType: Chapter Member,Chapter Member,지부장
@@ -6004,6 +6068,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,학생 그룹이 생성되지 않았습니다.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},동일한 {1} 행이있는 {0} 행이 중복되었습니다.
 DocType: Employee,Salary Details,급여 세부 정보
+DocType: Employee Checkin,Exit Grace Period Consequence,유예 기간 종료 퇴장
 DocType: Bank Statement Transaction Invoice Item,Invoice,송장
 DocType: Special Test Items,Particulars,상세
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Item 또는 Warehouse를 기준으로 필터를 설정하십시오.
@@ -6104,6 +6169,7 @@
 DocType: Serial No,Out of AMC,AMC 외
 DocType: Job Opening,"Job profile, qualifications required etc.","직업 프로필, 자격 요건 등"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,배송지 국가
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,자료 요청을 제출 하시겠습니까
 DocType: Opportunity Item,Basic Rate,기본 요율
 DocType: Compensatory Leave Request,Work End Date,작업 종료 날짜
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,원료 요청
@@ -6288,6 +6354,7 @@
 DocType: Sales Order Item,Gross Profit,매출 총 이익
 DocType: Quality Inspection,Item Serial No,항목 일련 번호
 DocType: Asset,Insurer,보험 회사
+DocType: Employee Checkin,OUT,아웃
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,구매 금액
 DocType: Asset Maintenance Task,Certificate Required,인증서 필요
 DocType: Retention Bonus,Retention Bonus,회원 유지 보너스
@@ -6403,6 +6470,8 @@
 DocType: Invoice Discounting,Sanctioned,제재
 DocType: Course Enrollment,Course Enrollment,코스 등록
 DocType: Item,Supplier Items,공급 업체 품목
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",시작 시간은 {0}의 종료 시간 \보다 크거나 같을 수 없습니다.
 DocType: Sales Order,Not Applicable,해당 사항 없음
 DocType: Support Search Source,Response Options,응답 옵션
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0}은 0과 100 사이의 값이어야합니다.
@@ -6489,7 +6558,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,고정 자산
 DocType: Purchase Order,Ref SQ,심판 SQ
 DocType: Salary Structure,Total Earning,총 적립
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Share Balance,From No,~부터
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,지불 화해 청구서
 DocType: Purchase Invoice,Taxes and Charges Added,추가 된 세금 및 요금
@@ -6597,6 +6665,7 @@
 DocType: POS Profile,Ignore Pricing Rule,가격 규칙 무시
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,식품
 DocType: Lost Reason Detail,Lost Reason Detail,잃어버린 이유 세부 정보
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},다음 일련 번호가 생성되었습니다. <br> {0}
 DocType: Maintenance Visit,Customer Feedback,고객 피드백
 DocType: Serial No,Warranty / AMC Details,보증 / AMC 세부 정보
 DocType: Issue,Opening Time,개장 시간
@@ -6646,6 +6715,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,회사 이름이 같지 않음
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,승진 날짜 전에 직원 승진을 제출할 수 없습니다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0}보다 오래된 주식 거래를 업데이트 할 수 없습니다.
+DocType: Employee Checkin,Employee Checkin,직원 수표
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},{0} 항목의 시작 날짜가 종료 날짜보다 작아야합니다.
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,고객 견적 생성
 DocType: Buying Settings,Buying Settings,구매 설정
@@ -6667,6 +6737,7 @@
 DocType: Patient,Patient Demographics,환자 인구 통계
 DocType: Share Transfer,To Folio No,Folio No로
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,운영 현금 흐름
+DocType: Employee Checkin,Log Type,로그 유형
 DocType: Stock Settings,Allow Negative Stock,음수 허용
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,항목 중 수량이나 값이 변경되지 않았습니다.
 DocType: Asset,Purchase Date,구입 날짜
@@ -6711,6 +6782,7 @@
 DocType: Vital Signs,Very Hyper,매우 하이퍼
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,귀하의 비즈니스 특성을 선택하십시오.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,월과 연도를 선택하십시오.
+DocType: Service Level,Default Priority,기본 우선 순위
 DocType: Student Log,Student Log,학생 기록
 DocType: Shopping Cart Settings,Enable Checkout,체크 아웃 사용
 apps/erpnext/erpnext/config/settings.py,Human Resources,인적 자원
@@ -6739,7 +6811,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Shopify를 ERPNext와 연결하십시오.
 DocType: Homepage Section Card,Subtitle,부제
 DocType: Soil Texture,Loam,옥토
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: BOM,Scrap Material Cost(Company Currency),스크랩 자재 원가 (회사 통화)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,납품서 {0}을 제출할 수 없습니다.
 DocType: Task,Actual Start Date (via Time Sheet),실제 시작일 (시간표를 통해)
@@ -6795,6 +6866,7 @@
 DocType: Drug Prescription,Dosage,복용량
 DocType: Cheque Print Template,Starting position from top edge,상단 가장자리에서 시작 위치
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),예약 기간 (분)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},이 직원은 이미 동일한 타임 스탬프가있는 로그를 가지고 있습니다. {0}
 DocType: Accounting Dimension,Disable,사용 안함
 DocType: Email Digest,Purchase Orders to Receive,구매 주문
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,프로덕션 오더는 다음을 위해 제기 할 수 없습니다.
@@ -6810,7 +6882,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,외주로 이전 된 자재
 DocType: Job Card,Timing Detail,타이밍 세부 정보
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,필수 항목
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{1} 중 {0} 가져 오는 중
 DocType: Job Offer Term,Job Offer Term,고용 제안 기간
 DocType: SMS Center,All Contact,모든 연락처
 DocType: Project Task,Project Task,프로젝트 작업
@@ -6860,7 +6931,6 @@
 DocType: Student Log,Academic,학생
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,주에서
 DocType: Leave Type,Maximum Continuous Days Applicable,최대 연속 일수
-apps/erpnext/erpnext/config/support.py,Support Team.,지원팀.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,먼저 회사 이름을 입력하십시오.
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,가져 오기 성공
 DocType: Guardian,Alternate Number,대체 번호
@@ -6952,6 +7022,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,행 # {0} : 항목이 추가되었습니다.
 DocType: Student Admission,Eligibility and Details,자격 및 세부 정보
 DocType: Staffing Plan,Staffing Plan Detail,인력 계획 세부 사항
+DocType: Shift Type,Late Entry Grace Period,후기 유예 기간
 DocType: Email Digest,Annual Income,연간 소득
 DocType: Journal Entry,Subscription Section,구독 섹션
 DocType: Salary Slip,Payment Days,지불 일수
@@ -7002,6 +7073,7 @@
 DocType: Journal Entry Account,Account Balance,계정 잔액
 DocType: Asset Maintenance Log,Periodicity,주기성
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,의료 기록
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,로그 유형은 근무 교대에있는 체크인에 필요합니다 : {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,실행
 DocType: Item,Valuation Method,평가 방법
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},판매 송장 {1}에 대한 {0}
@@ -7086,6 +7158,7 @@
 DocType: Loan Type,Loan Name,대출 명
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,기본 결제 방법 설정
 DocType: Quality Goal,Revision,개정
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,체크 아웃이 이른 것으로 간주되는 교대 종료 시간 전의 시간 (분).
 DocType: Healthcare Service Unit,Service Unit Type,서비스 단위 유형
 DocType: Purchase Invoice,Return Against Purchase Invoice,구매 송장에 대한 반품
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,비밀 생성
@@ -7241,12 +7314,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,화장품
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,사용자가 저장하기 전에 시리즈를 선택하게하려면이 옵션을 선택하십시오. 이것을 체크하면 기본값이 없습니다.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할을 가진 사용자는 고정 된 계정을 설정하고 고정 된 계정에 대해 계정 항목을 작성 / 수정할 수 있습니다
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Expense Claim,Total Claimed Amount,총 청구 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},{1} 작업에 대한 다음 {0} 일 내에 타임 슬롯을 찾을 수 없습니다.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,마무리
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,회원 자격이 30 일 이내에 만료되는 경우에만 갱신 할 수 있습니다.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},값은 {0} ~ {1} 사이 여야합니다.
 DocType: Quality Feedback,Parameters,매개 변수
+DocType: Shift Type,Auto Attendance Settings,자동 출석 설정
 ,Sales Partner Transaction Summary,영업 파트너 거래 요약
 DocType: Asset Maintenance,Maintenance Manager Name,유지 보수 관리자 이름
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Item Details를 가져 오는 데 필요합니다.
@@ -7338,10 +7413,10 @@
 DocType: Pricing Rule,Validate Applied Rule,적용된 규칙 검증
 DocType: Job Card Item,Job Card Item,직업 카드 항목
 DocType: Homepage,Company Tagline for website homepage,회사 웹 사이트 홈페이지에 대한 태그 라인
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,우선 순위 {0}에 대한 응답 시간 및 해상도를 인덱스 {1}에 설정하십시오.
 DocType: Company,Round Off Cost Center,원가 절감 센터
 DocType: Supplier Scorecard Criteria,Criteria Weight,기준 무게
 DocType: Asset,Depreciation Schedules,감가 상각 계획
-DocType: Expense Claim Detail,Claim Amount,청구 금액
 DocType: Subscription,Discounts,할인
 DocType: Shipping Rule,Shipping Rule Conditions,출하 규칙 조건
 DocType: Subscription,Cancelation Date,취소 일
@@ -7369,7 +7444,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,0 값 표시
 DocType: Employee Onboarding,Employee Onboarding,직원 온 보딩
 DocType: POS Closing Voucher,Period End Date,기간 종료 날짜
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,출처 별 영업 기회
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,목록의 첫 번째 휴가 승인자는 기본 휴가 승인자로 설정됩니다.
 DocType: POS Settings,POS Settings,POS 설정
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,모든 계정
@@ -7390,7 +7464,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,행 # {0} : 비율은 {1}과 같아야합니다 : {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR- .YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,의료 서비스 품목
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,기록이 없습니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,노화 범위 3
 DocType: Vital Signs,Blood Pressure,혈압
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,목표 설정
@@ -7437,6 +7510,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,배치
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,방어
 DocType: Item,Has Batch No,일괄 처리 없음
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,지연된 일
 DocType: Lead,Person Name,사람 이름
 DocType: Item Variant,Item Variant,품목 변형
 DocType: Training Event Employee,Invited,초대 됨
@@ -7458,7 +7532,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.",유효한 급여 기간이 아닌 시작 및 종료 날짜는 {0}을 계산할 수 없습니다.
 DocType: POS Profile,Only show Customer of these Customer Groups,이 고객 그룹의 고객에게만 표시하십시오.
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,인보이스 저장 항목 선택
-DocType: Service Level,Resolution Time,해결 시간
+DocType: Service Level Priority,Resolution Time,해결 시간
 DocType: Grading Scale Interval,Grade Description,학년 설명
 DocType: Homepage Section,Cards,카드
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,품질 회의 회의록
@@ -7485,6 +7559,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,총계정 원장 별 은행 잔고 증명서 잔액
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),의료 (베타)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,판매 오더 및 납품서를 생성하는 기본 창고
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,인덱스 {1}에서 {0}의 응답 시간은 해결 시간보다 클 수 없습니다.
 DocType: Opportunity,Customer / Lead Name,고객 / 리드 이름
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,청구되지 않은 금액
@@ -7531,7 +7606,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,파티 및 주소 가져 오기
 DocType: Item,List this Item in multiple groups on the website.,이 항목을 웹 사이트의 여러 그룹으로 나열하십시오.
 DocType: Request for Quotation,Message for Supplier,공급자 메시지
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,{1} 품목의 재고 트랜잭션이 존재하므로 {0}을 (를) 변경할 수 없습니다.
 DocType: Healthcare Practitioner,Phone (R),전화 (R)
 DocType: Maintenance Team Member,Team Member,팀 구성원
 DocType: Asset Category Account,Asset Category Account,자산 카테고리 계정
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index a55d3ba..04ad408 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Destnîşankirin {0} û Şîfreya Bexdayê {1} betal kirin
 DocType: Purchase Receipt,Vehicle Number,Hejmara Vehicle
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Navnîşa nameya we ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Navnîşan Default Book Entries
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Navnîşan Default Book Entries
 DocType: Activity Cost,Activity Type,Tîpa Çalakiyê
 DocType: Purchase Invoice,Get Advances Paid,Tezmînata Pêşîn
 DocType: Company,Gain/Loss Account on Asset Disposal,Gain / Loss Hesabê li ser Destûra Bêguman
@@ -222,7 +222,9 @@
 DocType: Bank Reconciliation,Payment Entries,Entment Entries
 DocType: Employee Education,Class / Percentage,Çar / Perî
 ,Electronic Invoice Register,Şîfreya Bijare ya Elektronîkî
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Hejmara pêvajoya piştî ku encama encam hate darizandin.
 DocType: Sales Invoice,Is Return (Credit Note),Vegerîn (Têbînî Kredî)
+DocType: Price List,Price Not UOM Dependent,Bersaziya UOM Dependent
 DocType: Lab Test Sample,Lab Test Sample,Sample Lab Lab
 DocType: Shopify Settings,status html,HTML
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Ji bo nimûne 2012, 2012-13"
@@ -322,6 +324,7 @@
 DocType: Salary Slip,Net Pay,Net Pay
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Total Invoiced Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,Daxuyanîna Daxuyaniyê cûda
+DocType: Shift Type,Working Hours Threshold for Absent,Ji bo Neserkirina Karên Xebatê
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Bexdayê li dijî Koma Hesabê {0}
 DocType: Purchase Receipt Item,Rate and Amount,Nirxandin û mesrefê
@@ -376,7 +379,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Setup Patient
 DocType: Asset,Insurance End Date,Dîroka Sîgorta Dawiyê
 DocType: Bank Account,Branch Code,Koda Branchê
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Time To Respond
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Forumê bikarhêner
 DocType: Landed Cost Item,Landed Cost Item,Niştecîhên Landed Cost
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Ji bazirganî û kirrûpir nabe
@@ -592,6 +594,7 @@
 DocType: Lead,Lead Owner,Owner Leader
 DocType: Share Transfer,Transfer,Derbaskirin
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Vîdeo Bigere (Ctrl + i)
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Dîroka ji hêja Dîroka mezintirîn mezintirîn
 DocType: Supplier,Supplier of Goods or Services.,Amûrên Xweser an Xizmet
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Navnîşa nû ya nû. Têbînî: Ji kerema xwe ji bo karsaz û karmendên hesab naxwazin
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Koma Girtîgehê yan Schedulea kursî pêwîst e
@@ -872,7 +875,6 @@
 DocType: Skill,Skill Name,Navê Pêdivî ye
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Card Card Print
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-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 veşartî ji bo {0} bi Sîstema Setup&gt; Sîstemên * Naming Series
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Kolanên piştevanîya
 DocType: Asset Category Account,Fixed Asset Account,Hesabê Girtîgeha Girtî
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Dawîtirîn
@@ -885,6 +887,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Ji bo Balance Sheet for Mandatory
 DocType: Payment Entry,Total Allocated Amount,Giştî Hatina Tevahiya Tevahiya
 DocType: Sales Invoice,Get Advances Received,Piştgiriya Pêşniyar bibin
+DocType: Shift Type,Last Sync of Checkin,Syncê ya Dawîn
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Amûre Bacê Li Di Nirxê
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -893,7 +896,9 @@
 DocType: Student,Blood Group,Koma Blood
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Piştî dema veguherîna destpêkê dema ku kontrol-ê di derengî de (deqîqe) tête tête kirin.
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Lêkolîn
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,No invoices no found
 DocType: Promotional Scheme,Product Discount Slabs,Product Discount Slabs
 DocType: Hotel Room Package,Amenities,Amenities
 DocType: Lab Test Groups,Add Test,Test Add
@@ -992,6 +997,7 @@
 DocType: Item,Moving Average,Rêjeya Moving
 DocType: Employee Attendance Tool,Unmarked Attendance,Tevlêbûna Navdarkirî
 DocType: Homepage Section,Number of Columns,Hejmara Columnan
+DocType: Issue Priority,Issue Priority,Pêşniyara meseleyê
 DocType: Holiday List,Add Weekly Holidays,Holidays weekly
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Vebijêrîna Salaryê
@@ -999,6 +1005,7 @@
 DocType: Job Offer Term,Value / Description,Nirx / Dîrok
 DocType: Warranty Claim,Issue Date,Dîroka Dîroka
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Bo karûbarên çepgir ên çepê nekarin nikare berevanîya berevanîya berxwedanê
+DocType: Employee Checkin,Location / Device ID,Nasname / Nasnameya Dokumentê
 DocType: Purchase Order,To Receive,Hildan
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Tu di moda negirêdayî de. Hûn ê nikarin heta ku hûn nexşeya we re barkirin.
 DocType: Course Activity,Enrollment,Nivîsînî
@@ -1007,7 +1014,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Max: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Agahdariya E-Invoicing Missing
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Naveroka maddî tune
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 DocType: Loan,Total Amount Paid,Tiştek Tiştek Paid
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Hemî van tiştan berê berê veguhestin
 DocType: Training Event,Trainer Name,Navnavê
@@ -1117,6 +1123,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Posting timestamp must be after {0},Post-timestamp divê piştî {0}
 DocType: Employee,You can enter any date manually,Hûn dikarin her demek bi dest bi xwe re binivîse
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Respiliation Item
+DocType: Shift Type,Early Exit Consequence,Pevçûnek Zûtirîn
 DocType: Item Group,General Settings,Sîstema Giştî
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Beriya Dîroka Beriya Beriya Şandina Postê / Desteya Mirovan Berê
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Navê navê Xweseriya Berî berî radest bikin.
@@ -1154,6 +1161,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Daxuyaniya Weqfa
 ,Available Stock for Packing Items,Stock Stock for Packing Items Available
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe vexwendina vî awayî {0} ji C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Her Check-in and Check-Out
 DocType: Support Search Source,Query Route String,Query Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Şablon
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Quotes to Leads or Customers.
@@ -1187,6 +1195,7 @@
 DocType: Authorization Control,Authorization Control,Control Control
 ,Daily Work Summary Replies,Bersivên Bersivê Rojane
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Hûn ji bo projeyê hevkariyê vexwendin: {0}
+DocType: Issue,Response By Variance,Pirsgirêka Variance
 DocType: Item,Sales Details,Agahiya Firotanê
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Nîşaneyên çapkirinê yên çapemeniyê.
 DocType: Salary Detail,Tax on additional salary,Bacê li ser heqê bêtir
@@ -1308,6 +1317,7 @@
 DocType: Project,Task Progress,Pêşveçûnê Task
 DocType: Journal Entry,Opening Entry,Endamê vekirî
 DocType: Bank Guarantee,Charges Incurred,Tezmînat
+DocType: Shift Type,Working Hours Calculation Based On,Guherandinên Bingehî Li Qeydkirina Karên Kar
 DocType: Work Order,Material Transferred for Manufacturing,Material Transferred for Manufacturing
 DocType: Products Settings,Hide Variants,Variant veşêre
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Karanîna Karanîna Derbasbûnê û Demjimêrdana Qanûna Disable
@@ -1336,6 +1346,7 @@
 DocType: Guardian,Interests,Interests
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qut kirin
 DocType: Education Settings,Education Manager,Rêvebirê Perwerdehiyê
+DocType: Employee Checkin,Shift Actual Start,Destpêka Destpêk Çift
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plana demjimêr derveyî derveyî Karên Karkeran a karûbarê.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Point of loyalty: {0}
 DocType: Healthcare Settings,Registration Message,Peyama Serkeftinê
@@ -1360,9 +1371,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Daxistina ji bo hemû demjimêrên hemî biseket hate afirandin
 DocType: Sales Partner,Contact Desc,Desc Desc
 DocType: Purchase Invoice,Pricing Rules,Qanûna Nirxandinê
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Çawa ku li dijî derheqê heyî de hebe {0}, hûn nikarin nirxê {1}"
 DocType: Hub Tracked Item,Image List,Lîsteya wêneya wêneyê
 DocType: Item Variant Settings,Allow Rename Attribute Value,Destûrê bide Hilbijartina Attribute Value
-DocType: Price List,Price Not UOM Dependant,Bersaziya UOM Dependent
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Wext
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Bingehîn
 DocType: Loan,Interest Income Account,Account Income Interest
@@ -1372,6 +1383,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POS Profîl hilbijêre
 DocType: Support Settings,Get Latest Query,Query Latest
 DocType: Employee Incentive,Employee Incentive,Karkerê Kişandin
+DocType: Service Level,Priorities,Pêşdibistan
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Karta kart û taybetmendiyê li ser malperê zêde bikin
 DocType: Homepage,Hero Section Based On,Li ser Bingeha Hero Hero
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Biha Kirîna Giştî (Bi rêya Purchase Invoice)
@@ -1432,7 +1444,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Hejmarê Birêvekirî
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Rejected li dijî şîfreyê {1}
 ,Received Items To Be Billed,Hîndarkirina Bêguman Bikin
-DocType: Salary Slip Timesheet,Working Hours,Karên Kar
+DocType: Attendance,Working Hours,Karên Kar
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Mode Peyrê
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Li ser wextê nexşirandin Biryara kirînê
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Dema Demjimêr
@@ -1552,7 +1564,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Agahdariya zagonî û agahdariyên gelemperî derbarê derveyî we
 DocType: Item Default,Default Selling Cost Center,Navenda Bazirganî ya Navendî Default
 DocType: Sales Partner,Address & Contacts,Navnîşan û Têkilî
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina hejmarek ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 DocType: Subscriber,Subscriber,Hemû
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (Forma / Forma / {0}) ji ber firotanê ye
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Ji kerema xwe pêşîn Dîroka Dîroka Pêşîn hilbijêre
@@ -1563,7 +1574,7 @@
 DocType: Detected Disease,Tasks Created,Tasks afirandin
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ji bo vê item an jî pelê wê çalak be
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Komîsyona%
-DocType: Service Level,Response Time,Response Time
+DocType: Service Level Priority,Response Time,Response Time
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Hejmar divê erênî ye
 DocType: Contract,CRM,CRM
@@ -1580,7 +1591,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Daxuyaniya Data Mapping
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Leşkerek an navê an kes an navê navê rêxistinê heye
 DocType: Student,Guardians,Cerdevan
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe vexwendina Sîstema Navneteweyî ya Perwerdehiya Mamosteyê&gt; Sîstema Perwerdehiyê
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Hilbijêre Brand ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Hatina Navîn
 DocType: Shipping Rule,Calculate Based On,Li ser bingeha Bingehîn
@@ -1617,6 +1627,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Tevlêbûna xwendinê {0} li dijî xwendekaran {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Dîroka Transaction
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Daxistina Cancel
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Peymana Rêjeya Saziyê {0} saz nekin.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Amînê ya Net Salary
 DocType: Account,Liability,Bar
 DocType: Employee,Bank A/C No.,Banka A / C
@@ -1681,7 +1692,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Koda Kodê Raw Material
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Alîkariya veguhestinê {0} ve hatî şandin
 DocType: Fees,Student Email,Xwendekarek Email
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM revandin: {0} dê nikarin bav û bavê {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Xizmetên ji Xizmetên Tenduristiyê Bistînin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Endamê Stock Entry {0} nehatiye şandin
 DocType: Item Attribute Value,Item Attribute Value,Item Attribute Value
@@ -1706,7 +1716,6 @@
 DocType: Production Plan,Select Items to Manufacture,Hilbijêre Ji bo hilberînê hilbijêre
 DocType: Leave Application,Leave Approver Name,Navekî Derbasbûnê Name
 DocType: Shareholder,Shareholder,Pardar
-DocType: Issue,Agreement Status,Peymanê Status
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Guhertoya standard ji bo kiryarên veguherînê.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Ji kerema xwe bigihîjin Xwendekarê Xwendekaran hilbijêre ku ji bo daxwaznameya xwendekarê drav anîn e
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM hilbijêrin
@@ -1968,6 +1977,7 @@
 DocType: Account,Income Account,Hesabê dahatiyê
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Hemû xaniyan
 DocType: Contract,Signee Details,Agahdariyên Signix
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Piştre piştî kontrola dawiya demê de
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Pawlos
 DocType: Item Group,Check this if you want to show in website,Ger hûn bixwazin malpera xwe nîşanî bikin
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Salê Fiscal Year {0} nehat dîtin
@@ -2033,6 +2043,7 @@
 DocType: Asset Finance Book,Depreciation Start Date,Tezmînata Destpêk Dîrok
 DocType: Activity Cost,Billing Rate,Rêjeya Billing
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Ji kerema xwe veguhastina Google Maps Settings bikirîne û rêyên pêşniyar kirin
+DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Supplier Scorecard Criteria,Max Score,Max Score
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Daxwaza Destpêk Dibe Berî Berî Dabeşandina Dabeşkirinê be.
 DocType: Support Search Source,Support Search Source,Çavkaniya Çavkaniyê Lêgerîna
@@ -2101,6 +2112,7 @@
 DocType: Employee Transfer,Employee Transfer,Transfera karmendê
 ,Sales Funnel,Firotanê Sales
 DocType: Agriculture Analysis Criteria,Water Analysis,Analysis
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Ji destpêkê veguhestina destpêkê veguherîna kontrola destpêkê (di çend deqîqan)
 DocType: Accounts Settings,Accounts Frozen Upto,Hesabên jorkirî li jor
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Ti tiştek tune ye.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasyon {0} dirêjtirîn demjimêrên xebatê yên li karkeriyê {1} bêtir, operasyonê di çalakiyê de gelek operasyonan bike"
@@ -2114,7 +2126,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Order Order {0} ye {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Pawlos di dayîn de
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Agahdariya nirxandinê binivîse
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,PO Pêwirîn
 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 Dibistanê
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Kêmeya nirx nikare zero
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Att Attt
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Ji kerema xwe BOM ê li dijî hilbijêre {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tîpa Şaxa
@@ -2124,6 +2138,7 @@
 DocType: Volunteer,Afternoon,Piştînîvroj
 DocType: Vital Signs,Nutrition Values,Nirxên nerazîbûnê
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Pevçûnek tûşî (temaşe&gt; 38.5 ° C / 101.3 ° F an tempê * 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Reversed
 DocType: Project,Collect Progress,Pêşveçûnê hilbijêre
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Înercî
@@ -2174,6 +2189,7 @@
 ,Ordered Items To Be Billed,Niştecîhên Biryara Bêguman Bikin
 DocType: Taxable Salary Slab,To Amount,Ji bo Weqfa
 DocType: Purchase Invoice,Is Return (Debit Note),Vegerîn (Debit Note)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Getting Started
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Bihevkelyan
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Dema ku Fînala Salê hat rizgarkirin Dîroka Destpêk Dest û Dîroka Neteweyî ya Guherîn nabe.
@@ -2191,8 +2207,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Dîroka destpêkê ya destpêkê nikare beriya danûstandinê ji bo Serial No {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Row {0}: Rêjeya pevçûnê pêwîst e
 DocType: Purchase Invoice,Select Supplier Address,Navnîşana Navnîşan hilbijêre
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Hejmara hêja heye {0}, hûn hewce ne {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Ji kerema xwe kerema API Consumer
 DocType: Program Enrollment Fee,Program Enrollment Fee,Bernameya Enrollmentê
+DocType: Employee Checkin,Shift Actual End,End Actual Shift
 DocType: Serial No,Warranty Expiry Date,Daxuyaniya Daxistinê
 DocType: Hotel Room Pricing,Hotel Room Pricing,Pricing Room Room
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Derfetên bacê yên derveyî (ji bilî rêjeya xurek, nil û şaş kirin"
@@ -2251,6 +2269,7 @@
 DocType: Quality Inspection Reading,Reading 5,Xwendinê 5
 DocType: Shopping Cart Settings,Display Settings,Settings Settings
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Ji kerema xwe hejmara hejmarên nirxandinê binivîsin
+DocType: Shift Type,Consequence after,Piştî encam
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Hûn hewceyê alîkarî bi çi hewce?
 DocType: Journal Entry,Printing Settings,Settings Settings
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banking
@@ -2260,6 +2279,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Navnîşan Navnîşana Navnîşanê ya Navnîşanê ya Navnîşanê ye
 DocType: Account,Cash,Perê pêşîn
 DocType: Employee,Leave Policy,Pêwîste Leave
+DocType: Shift Type,Consequence,Paşî
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Navnîşana xwendekaran
 DocType: GST Account,CESS Account,Hesabê CESS
 apps/erpnext/erpnext/accounts/doctype/account/account.py,"While creating account for child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA","Dema ku hesab ji bo Kompaniya Zarokan {0} çêkirin, hesabê bavê {1} nehat dîtin. Ji kerema xwe ji hesabê bavê xwe di nav peymana COA de çêbikin"
@@ -2323,6 +2343,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Wexta Dawiyê Vûda
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Navê
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Ji kerema xwe re hesabê hesabê bistînin
+DocType: Issue,Resolution By Variance,Biryara Variance
 DocType: Employee,Resignation Letter Date,Daxwaznameya Niştimanî
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Tevlêbûna Dawîn
@@ -2334,6 +2355,7 @@
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Approval Status must be 'Approved' or 'Rejected',Divê Rewşa Destûra Divê &#39;Approved&#39; an &#39;Rejected&#39; be
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Now Niha
 DocType: Item Price,Valid Upto,Bi rast
+DocType: Employee Checkin,Skip Auto Attendance,Tevlêbûna xweseriyê vekin
 DocType: Payment Request,Transaction Currency,Dirûrek Kirînê
 DocType: Loan,Repayment Schedule,Kirêdariya Kirina
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Stock Entry
@@ -2404,6 +2426,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,Bacên Voucher POS POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Çalakiya Destpêk
 DocType: POS Profile,Applicable for Users,Ji bo Bikaranîna bikarhêneran
+,Delayed Order Report,Raporta Daxuyaniyê
 DocType: Training Event,Exam,Îmtîhan
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Navnîşên çewt ên General Ledger Entries dîtin. Hûn dikarin di nav veguhestineke çewt de bijartin.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Pipeline Sales
@@ -2418,10 +2441,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Şertên li ser tevahiya hilbijartî hatine hevgirtin kirin.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configure
 DocType: Hotel Room,Capacity,Kanîn
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Qty saz kirin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Batch {0} ya Jêder {1} qedexekirin.
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation User
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Workday du caran dubare kir
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Peymanê Rêjeya Navîn bi Tîpa Navîn {0} û Entity {1} berê heye.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Gelek Giştî ya ku di nav babetê mîvanê de navekî nirxandin {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Sernav Navê: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Territory di POS Profile de pêwîst e
@@ -2468,6 +2492,7 @@
 DocType: Depreciation Schedule,Schedule Date,Dîroka Schedule
 DocType: Packing Slip,Package Weight Details,Package Details Weight
 DocType: Job Applicant,Job Opening,Karên Civakî
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Dawiya Navnîşana Serkeftî ya Navnîşana Dawîn ya Navenda Checkin. Tenê vê yekê hilbijêre eger hûn bawer bikin ku hemû Logs ji hemî cihan veguherandin têne hev kirin. Ji kerema xwe hûn nexwestin vê guhartinê nake.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Bihayê rastîn
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Tevahiya pêşîn ({0}) li dijî Order {1} ji hêla Grand Total ({2} ve mezintir be
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Variant Variants updated
@@ -2512,6 +2537,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Daxistin
 DocType: Tally Migration,Is Day Book Data Imported,Dîroka danûstandinên pirtûka Dîjan Roj e
 ,Sales Partners Commission,Komîsyona Sales Sales
+DocType: Shift Type,Enable Different Consequence for Early Exit,Ji bo derketina zûtirîn Vebijêrîn Çalakî
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Mafî
 DocType: Loan Application,Required by Date,Pêdivî ye Dîroka
 DocType: Quiz Result,Quiz Result,Quiz Result
@@ -2570,7 +2596,6 @@
 DocType: Pricing Rule,Pricing Rule,Rule Pricing
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Lîsteya betalên niştecihan nayê destnîşankirin {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,Ji kerema xwe qada nasnameyê ya bikarhêner di karmendê karmendê da ku ji bo karmendê karmendê kar bikin
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Time To Resolve
 DocType: Training Event,Training Event,Event Event
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Gelek tedbîrên xwînê ya normal di nav zilamê de nêzîkî 120 mmHg sîstolol e, û 80 mmHg diastolic, bişkoka &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Pergala ku hebûna nirxê sifrê ye, dê tevahiya navnîşan pêk bînin."
@@ -2614,6 +2639,7 @@
 DocType: Student Applicant,Approved,Pejirandin
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Ji Dîroka Divê di salê Fînansê de be. Daxuyanî Ji Date = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Ji kerema xwe ji Saziya Saziyê Setup di Kiryarên Kirînê.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} Rewşa Tevlêbûna neyek e.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Account Accounting
 DocType: Purchase Invoice,Cash/Bank Account,Hesabê kred / bank
 DocType: Quality Meeting Table,Quality Meeting Table,Qada Kalîteyê
@@ -2649,6 +2675,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Xwarin, Beverage &amp; Tobacco"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Derseya kursiyê
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Pirtûka bacê ya balkêş e
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Tevlêbûna wê tenê piştî vê roja xwe nîşankirin.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Tenduristî ji bo xwediyên xwedan
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Daxuyaniya ji bo Quotations
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Pêvek piştî ku navnîşên hinek pereyên din bikar tînin guhertin nikare guhertin
@@ -2913,7 +2940,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Deynên bac û bihayên
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Ev li ser vê veguhestinê veguheztin. Ji bo agahdariyên jêrîn binêrin
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Ji bo Peymana Destpêk û Dawî ve bistînin.
 DocType: Delivery Note Item,Against Sales Invoice,Li Bexdayê Bazirganî
 DocType: Loyalty Point Entry,Purchase Amount,Ameya Kirînê
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Dibe ku wekî Biryara Sermonê winda dibe winda ne.
@@ -2937,7 +2963,7 @@
 DocType: Lead,Organization Name,Navê Navekî
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Ji hêla ji deverên derbasdar û deverên derbasdar divê ji bo tevlîheviyê ne
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Ne wek {1} {2}
-DocType: Employee,Leave Details,Dîtin bistînin
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Transferên bazirganî berî {0} vekirî ye
 DocType: Driver,Issuing Date,Daxuyaniya Dîroka
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Requester
@@ -2982,9 +3008,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Daxuyaniyên Kredê Mapping Dike
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Recruitment and Training
 DocType: Drug Prescription,Interval UOM,UOM Interval
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Sermaseya Xweseriya Xweseriya Otomobîlê
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Ji Zîndanê û To Currency To do it
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Dermanan
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Heta Demjimêr
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} betal an girtin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Agahdariya Bexdayê divê kredî be
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Koma alîyê Voucher (Consolidated)
@@ -3093,6 +3121,7 @@
 DocType: Territory,Territory Manager,Rêveberê Territory
 DocType: Lab Test,Sample ID,Nasnameya nimûne
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Kart eşkere ye
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Tevlêbûna ku li karmendê kontrola karmendê tête kirin
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Asset {0} divê were şandin
 ,Absent Student Report,Report Report Absent
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Di Gross Profitê de
@@ -3100,7 +3129,9 @@
 DocType: Travel Request Costing,Funded Amount,Amûr Bekir
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} nehatiye pêşkêş kirin so ku çalak nikare temam kirin
 DocType: Subscription,Trial Period End Date,Dîroka Doza Têkoşînê
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Vebijêrkên alternatîf wek IN û OUT di dema heman heman demê de derbas kirin
 DocType: BOM Update Tool,The new BOM after replacement,BOM a piştî nûvekirinê
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Item 5
 DocType: Employee,Passport Number,Nimareya pasaportê
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Vekirî vekin
@@ -3213,6 +3244,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Pargîdanek Pispor
 ,Issued Items Against Work Order,Li dijî Armanca Karê Daxuyan kirin
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creating {0} Invoice
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe vexwendina Sîstema Navneteweyî ya Perwerdehiya Mamosteyê&gt; Sîstema Perwerdehiyê
 DocType: Student,Joining Date,Join Date
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Malperê Request
 DocType: Purchase Invoice,Against Expense Account,Li Bexdayê Expense
@@ -3251,6 +3283,7 @@
 DocType: Landed Cost Item,Applicable Charges,Tezmînata Serdar
 ,Point of Sale,Point Point
 DocType: Authorization Rule,Approving User  (above authorized value),Daxuyaniya Bikarhêner (ji hêla nirxa desthilatdar)
+DocType: Service Level Agreement,Entity,Entity
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Amount {0} {1} ji {2} ji {3} veguherandin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Mirovan {0} ne girêdayî projeyê {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Ji navê Partiyê
@@ -3296,6 +3329,7 @@
 DocType: Soil Texture,Sand Composition (%),Sand Composition (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-YYYY-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Data Data Import Import
+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 veşartî ji bo {0} bi Sîstema Setup&gt; Sîstemên * Naming Series
 DocType: Asset,Asset Owner Company,Şîrketê Saziyê
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Navenda mesrefê mesref e ku hûn îdîaya dravaniyê bibînin
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} nirxên serîlêdanê yên ji bo Peldanka {1}
@@ -3353,7 +3387,6 @@
 DocType: Asset,Asset Owner,Xwedêkariya xwedan
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Warehouse ji bo pelê {0} li ser rêza {1}
 DocType: Stock Entry,Total Additional Costs,Gelek lêçûnên zêde
-DocType: Marketplace Settings,Last Sync On,Sync Dîroka Dawîn
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Ji kerema xwe re bi kêmanî yek qeq di di bacên bacê û bargehan de bicîh bikin
 DocType: Asset Maintenance Team,Maintenance Team Name,Tîma Barkirina Navîn
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Chart ya Navendên Krediyê
@@ -3369,12 +3402,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Nasnameyeke nasnameyê ji bo Karmendê {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Qty heye {0}, hûn hewce ne {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Bikarhêner {0} hat afirandin
 DocType: Stock Settings,Item Naming By,Naming By
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Birêvekirin
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ev grûpek karmendek root e û nikare guherandinê ne.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Request Request {0} betal kirin an rawestandin
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Bi zûtirîn li ser şîfreya Log-in ya karmendê Checkin
 DocType: Purchase Order Item Supplied,Supplied Qty,Qanûn
 DocType: Cash Flow Mapper,Cash Flow Mapper,Mapper cash cash
 DocType: Soil Texture,Sand,Qûm
@@ -3433,6 +3466,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Duplicate item group di tabloya materyalê de hat dîtin
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Salarya salane
 DocType: Supplier Scorecard,Weighting Function,Performansa Barkirina
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktora UOM ({0} -&gt; {1}) nehatiye dîtin: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Çewtiya nirxandina formula standard
 ,Lab Test Report,Raporta Lab Lab
 DocType: BOM,With Operations,Bi Operasyonan
@@ -3446,6 +3480,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Ne vegerandin ji bo Journal Entry
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} xwendekarek nexwend e
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Endamê Stock Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM revandin: {0} dê nikarin bav û bavê {1}
 DocType: Employee Onboarding,Activities,Çalakî
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Atleast yek xanî heye
 ,Customer Credit Balance,Balance Customer Kirance
@@ -3458,9 +3493,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Bernameya Bila Welatiya Mirovan ji bo Mişteriyê dît. Ji kerema xwe bi destê xwe hilbijêrin.
 DocType: Patient,Medication,Dermankirinê
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Bername Bernameya Hilbijartinê hilbijêre
+DocType: Employee Checkin,Attendance Marked,Beşdariya Marked
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Raw Materials
 DocType: Sales Order,Fully Billed,Fully Billed
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Ji kerema xwe ji odeya otêlê li ser xuyakirinê {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Bi tenê yek pêşdibistanê wekî bijartî hilbijêre.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Ji kerema xwe ji bo cureyê - Hesabê (Ledger) çêbikin / {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Divê kredî / Debit Ama divê wekî Journal Entry connected to
 DocType: Purchase Invoice Item,Is Fixed Asset,Bêguman Assisted Is
@@ -3479,6 +3516,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Daxuyaniya rûniştinê
 DocType: Shopping Cart Settings,Orders,Orders
 DocType: HR Settings,Retirement Age,Pirtûka Retirement
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe veşartina hejmarek ji bo Tevlêbûnê ya Setup&gt; Pirtûka Nimûne
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Qediyek Proje
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Deletion ji bo welat {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} ji berî {2}
@@ -3561,11 +3599,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Hesabdar
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS Closing Voucher ji bo {0} di dîroka {1} û {2} de heye.
 apps/erpnext/erpnext/config/help.py,Navigating,Navîgasyon
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Naverokên berbiçav nirxandin nirxandina veguherîna pêdivî ye
 DocType: Authorization Rule,Customer / Item Name,Navê / Navê Navnîşê
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,No Serial Na No Warehouse tune. Warehouse divê ji hêla Stock Entry an Rice Purchase
 DocType: Issue,Via Customer Portal,Via Portal ya Viya
 DocType: Work Order Operation,Planned Start Time,Demjimartinê Destpêk
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ye {2}
+DocType: Service Level Priority,Service Level Priority,Berfirehiya Xizmetiyê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Gelek Nirxên Têkilî Nabe ku Hêjeya Gelek Nirxên Hêjayî mezintir be
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 DocType: Journal Entry,Accounts Payable,Accounts Payable
@@ -3673,7 +3713,6 @@
 DocType: Delivery Note,Delivery To,Pêdivî ye
 DocType: Bank Statement Transaction Settings Item,Bank Data,Data Data
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Dema Scheduled Up
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Hêzên Times Times Bi Saziya Demjimêr û Karên Demjimar biparêzin
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Track Source by Lead Source.
 DocType: Clinical Procedure,Nursing User,Nursing User
 DocType: Support Settings,Response Key List,Lîsteya Keyê
@@ -3840,6 +3879,7 @@
 DocType: Work Order Operation,Actual Start Time,Dema Destpêk Destpêk
 DocType: Antibiotic,Laboratory User,Bikaranîna Bikaranîna bikarhêner
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Auctions
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Pêşdibistan {0} hate dubare kirin.
 DocType: Fee Schedule,Fee Creation Status,Status Creation Fee
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Softwares
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Birêvebirinê Bargirtina Serdanînê
@@ -3904,6 +3944,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Agahdarî ji bo {0} agahdar nekir.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Pêdivî ye ku pêdivî ye ku pêdivî ye ku an jî heya karsaziya şîrket an diravê hesabê partiyê be
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Ji kerema xwe kesê xerîdarê Îdamê karmendê xwe bistînin
+DocType: Shift Type,Early Exit Consequence after,Pevçûnek destpêkê
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Dabeşandina firotin û firotanê vekin vekin
 DocType: Disease,Treatment Period,Dermankirinê
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Sazkirina Email
@@ -3921,7 +3962,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Navê Şagirt:
 DocType: SMS Log,Sent On,Şandin
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Invoice Sales
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Vebijêrk Dema ku ji Biryara Biryara bêtir mezintir be
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Ji bo Bersîvê Xwendekarê Xwendekarê Xwendekarê Xwendekaran ji bo her xwendekaran ji Kursên Nused-ê di Bernameya Bernameyê de were pejirandin.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Barkirina Navneteweyî
 DocType: Employee,Create User Permission,Destûra Bikarhêner hilbijêre
@@ -3958,6 +3998,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Peymanên standard ji bo firotanê yan kirînê.
 DocType: Sales Invoice,Customer PO Details,Pêwendiyên Pêkûpêk
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Nexweş nayê dîtin
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Default Preference Hilbijêre.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Heger hilweşînin eger heger li ser vê tiştê nayê derbas kirin
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Koma Giştî ya Gelek Navnîşê heman navnîşê heye, ji kerema xwe navê navnîşa bazirganî an navnîşê Giştî ya Giştî"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -3996,6 +4037,7 @@
 DocType: Quality Goal,Quality Goal,Goaliya Kalîteyê
 DocType: Support Settings,Support Portal,Portela Piştgiriyê
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Xebatkar {0} li Niştecîh {1} ye
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Peymana Dema Ewlekariya Taybet e ku taybetmendiya mişterî {0}
 DocType: Employee,Held On,Held On
 DocType: Healthcare Practitioner,Practitioner Schedules,Schedule Practitioner
 DocType: Project Template Task,Begin On (Days),On Start (Days)
@@ -4003,6 +4045,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Karê Karê Saziyê {0}
 DocType: Inpatient Record,Admission Schedule Date,Dîroka Schedule Hatina
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Peymana Nirxandinê
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Li ser bingeha veguherandina vê karmendê ji bo &#39;Serkevtina Checkin&#39; li ser bingeha Marxanê ye.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Tenduristên Kesên Neqeydkirî hatine kirin
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Hemû Kar
 DocType: Appointment Type,Appointment Type,Tîpa rûniştinê
@@ -4115,7 +4158,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bi giraniya pakêtê. Bi giraniya nerm + + pargîdaniya materyalê. (ji bo çapkirinê)
 DocType: Plant Analysis,Laboratory Testing Datetime,Datetime Testing Testatory
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Peyva {0} nikare Batch
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Pipeline Sales by Stage
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Stratejiya Xwendekaran
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Navnîşa Transferê ya Bexdayê Entry
 DocType: Purchase Order,Get Items from Open Material Requests,Ji daxwaznameyên Open Material Requests Get Items
@@ -4196,7 +4238,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Vebijêrk Warehouse-wise
 DocType: Sales Invoice,Write Off Outstanding Amount,Girtîgeha Bêbaweriyê binivîse
 DocType: Payroll Entry,Employee Details,Agahdarî
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Destpêk Destpêk Ji hêla End-time ji {0} ve bêtir mezintirîn.
 DocType: Pricing Rule,Discount Amount,Discount Amount
 DocType: Healthcare Service Unit Type,Item Details,Agahdarî
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js,From Delivery Note,Ji Têgihîştinê ve
@@ -4247,7 +4288,7 @@
 DocType: Customer,CUST-.YYYY.-,CUST -YYYY.-
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Paya Net nikare neyînî
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Naverokî tune
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Tarloqî
+DocType: Attendance,Shift,Tarloqî
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Projeya Karûbarên Hesab û Partiyan
 DocType: Stock Settings,Convert Item Description to Clean HTML,Vebijêrk Nîşan Bigere HTML to Clean
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,All Supplier Groups
@@ -4318,6 +4359,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Yekîneya Xizmetiya Mirovan
 DocType: Sales Invoice,Include Payment (POS),Payment (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Yekîtiya Xweser
+DocType: Shift Type,First Check-in and Last Check-out,Yekem Check-in û Dawîn Paşîn-der
 DocType: Landed Cost Item,Receipt Document,Belgeya belgeyê
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Supplier Scorecard Period
 DocType: Employee Grade,Default Salary Structure,Structural Salary Default
@@ -4399,6 +4441,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Daxuyaniya kirînê bikî
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Performansa budceyê ji bo salek fînansî.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Qanûna hesab nikare nebixwe.
+DocType: Employee Checkin,Entry Grace Period Consequence,Bêvajoya Bendava Grace
 ,Payment Period Based On Invoice Date,Dîroka Daxuyaniya Dîroka Bingeha Demjimêr
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Dîroka sazkirinê ji beriya danûstandinê ya berî {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Link to Material Request
@@ -4407,6 +4450,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Ji bo vê vegereyê ya veguhestina navnîşê ji berî {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Dîrok
 DocType: Monthly Distribution,Distribution Name,Nav Nabe
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Workday {0} hate dubare kirin.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Koma Bi Non-Group
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Pêşkeftina pêşveçûnê. Ew dikare demekê bigirin.
 DocType: Item,"Example: ABCD.#####
@@ -4419,6 +4463,7 @@
 DocType: Vehicle Log,Fuel Qty,Fuel Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile Na
 DocType: Invoice Discounting,Disbursed,Perçekirin
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Piştî dema dawiya veguherandina dema ku lêpirsînek ji bo beşdarî tê de tête kirin.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Guhertoya Net Neteweyek Payable
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Not Available
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Nîvdem
@@ -4432,7 +4477,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,PDC di çapkirinê de nîşan bide
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Supplier
 DocType: POS Profile User,POS Profile User,POS Profîl User
-DocType: Student,Middle Name,Navê navbendî
 DocType: Sales Person,Sales Person Name,Navê Kesê Xweser
 DocType: Packing Slip,Gross Weight,Gross Weight
 DocType: Journal Entry,Bill No,Bill No
@@ -4441,7 +4485,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-YYYY-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Peymanê Rêjeya Navîn
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Ji kerema xwe pêşî yê karmend û dîrokê hilbijêrin
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Rêjeya nirxê nirxê li gorî nirxê xerca kirê ya xemgîniyê ye
 DocType: Timesheet,Employee Detail,Daxuyaniya karker
 DocType: Tally Migration,Vouchers,Vouchers
@@ -4476,7 +4519,7 @@
 DocType: Additional Salary,Date on which this component is applied,Dîrok li ser vê beşê ye
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Lîsteya lîsansên peywendîdar bi bi hejmarên folio re
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Hesabên Gateway Setup
-DocType: Service Level,Response Time Period,Dema Demjimêra Response
+DocType: Service Level Priority,Response Time Period,Dema Demjimêra Response
 DocType: Purchase Invoice,Purchase Taxes and Charges,Xercan û bihayên kirînê
 DocType: Course Activity,Activity Date,Çalakiya Dîroka
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Hilbijêre an mişterek nû bike
@@ -4501,6 +4544,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Sala Financial
 DocType: Sales Invoice Item,Deferred Revenue,Revenue Deferred
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Atleast yek ji Bazirganî an Bazirganî divê bê hilbijartin
+DocType: Shift Type,Working Hours Threshold for Half Day,Ji bo Nîvê Nîv Demjimar Karên Xebatê
 ,Item-wise Purchase History,Dîroka kirîna Dîroka Bargiraniyê
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Dibe ku xizmeta astengkirina astengkirina astengkirina navxweyî de li ser rêzê {0}
 DocType: Production Plan,Include Subcontracted Items,Têkilî Subcontracted Items
@@ -4532,6 +4576,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Destûra Siyaseta Pirrjimar Pirrjimar Dike
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOM
 DocType: Healthcare Practitioner,Charges,Tezmînata
+DocType: Employee,Attendance and Leave Details,Tevlêbûnê û Dervekirinê
 DocType: Student,Personal Details,Agahiyên kesane
 DocType: Sales Order,Billing and Delivery Status,Status Status
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Row {0}: Ji bo peywenddarê {0} Navnîşa e-nameya pêwîst e-nameyê bişînin
@@ -4583,7 +4628,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Heqê valahiyê {0} û {1} binivîse
 DocType: Purchase Order,Order Confirmation Date,Daxuyaniya Daxuyaniya Daxuyaniyê
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Hilbijartina Hatîn Hatîn Times
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe veguhastina Sîstema Sîstema Navnetewî di Çavkaniya Mirovan&gt; HR Set
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Bawer
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-YYYY-
 DocType: Subscription,Subscription Start Date,Daxuyaniya destpêkê
@@ -4605,7 +4649,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Hesabê rojnamevanê
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Çalakiya Forum
-DocType: Service Level,Resolution Time Period,Demjimêra Demjimêra Biryara
+DocType: Service Level Priority,Resolution Time Period,Demjimêra Demjimêra Biryara
 DocType: Request for Quotation,Supplier Detail,Supplier Detail
 DocType: Project Task,View Task,Task
 DocType: Serial No,Purchase / Manufacture Details,Dîrok / Pêşniyarên Bazirganiyê
@@ -4672,6 +4716,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse tenê bi Stock Entry / Remarkirina Kirînê / Reya Kirînê veguherîne
 DocType: Support Settings,Close Issue After Days,Piştî rojan paşde
 DocType: Payment Schedule,Payment Schedule,Schedule Payment
+DocType: Shift Type,Enable Entry Grace Period,Demjimêra Grace Entry Enable
 DocType: Patient Relation,Spouse,Jin
 DocType: Purchase Invoice,Reason For Putting On Hold,Reason for Putting On Hold
 DocType: Item Attribute,Increment,Zêdebûna
@@ -4810,6 +4855,7 @@
 DocType: Vehicle Log,Invoice Ref,Refugee Invoice
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-form ji bo vexwendinê ne derbas e: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Invoice afirandin
+DocType: Shift Type,Early Exit Grace Period,Dema destpêka derheqê destpêkê
 DocType: Patient Encounter,Review Details,Agahdariyên Çavdêriya
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Row {0}: Hêjeya nirxên ku ji sîvanê mezintir be.
 DocType: Account,Account Number,Hejmara Hesabê
@@ -4821,7 +4867,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Bêguman eger şirket SPA, SAPA û SRL ye"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Gelek mercên pêkanîna di navbera:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Paid û Not Delivered
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Kodê Pêwîst e ku ji hêla xweya xwe bixweber nabe
 DocType: GST HSN Code,HSN Code,Kodê HSN
 DocType: GSTR 3B Report,September,Îlon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Mesrefên îdarî
@@ -4857,6 +4902,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Account CWIP
 DocType: SMS Log,Sender Name,Navê Navekî
 DocType: Pricing Rule,Supplier Group,Suppliers Group
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Di encama {1} de di dema \ \ Dayan piştgirî {0} de Destpêk Destpêk û Dawî veke.
 DocType: Employee,Date of Issue,Dîroka Nîqaş
 ,Requested Items To Be Transferred,Tiştên Pêdivî kirin Ji bo Transferred
 DocType: Employee,Contract End Date,Peymana End Date
@@ -4867,6 +4914,7 @@
 DocType: Opportunity,Sales Stage,Stage
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Dema ku hûn ji Biryara Firotinê biparêzin, gotinên di binçavkirinê de xuya bibin."
 DocType: Item Reorder,Re-order Level,Re-order
+DocType: Shift Type,Enable Auto Attendance,Tevlêbûna Otomobîlan çalak bike
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Hezî
 ,Department Analytics,Analytics
 DocType: Crop,Scientific Name,Navê zanistî
@@ -4879,6 +4927,7 @@
 DocType: Quiz Activity,Quiz Activity,Çalakiya Quiz
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} Di heyama Payrollê de ne ne
 DocType: Timesheet,Billed,Billed
+apps/erpnext/erpnext/config/support.py,Issue Type.,Tîpa Nimûne.
 DocType: Restaurant Order Entry,Last Sales Invoice,Last Sales Invoice
 DocType: Payment Terms Template,Payment Terms,Şertên Payan
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Qty Reserved: Hêjeya ji bo firotanê ji bo firotanê, lê ne diyar kir."
@@ -4973,6 +5022,7 @@
 DocType: Account,Asset,Asset
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} Schedule a Dozgehên Xizmetkariya Xizmetiyê tune. Di masterê Xizmetkariya Tenduristiyê de zêde bike
 DocType: Vehicle,Chassis No,Chassis No
+DocType: Employee,Default Shift,Default Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Şirketek Nirxandin
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Dariya Bill Bill Material
 DocType: Article,LMS User,LMS Bikarhêner
@@ -5021,6 +5071,7 @@
 DocType: Sales Person,Parent Sales Person,Kesê Mirovan Parêzer
 DocType: Student Group Creation Tool,Get Courses,Bersiv bibin
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Divê Qty be 1, wekî ku materyalek xelet e. Ji kerema xwe ji bo qutiyek pirjimêr bikar bînin."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Karên saetan yên jêrîn ku Nerazî ne diyar kirin. (Zero to disable)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Tenê nîwanên tenê tenê di veguhestinê de ne
 DocType: Grant Application,Organization,Sazûman
 DocType: Fee Category,Fee Category,Category Category
@@ -5033,6 +5084,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Ji kerema xwe ji bo çalakiya vê perwerdehiya xwe nû bike
 DocType: Volunteer,Morning,Sib
 DocType: Quotation Item,Quotation Item,Item Quotation
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Pêşniyara meseleyê
 DocType: Journal Entry,Credit Card Entry,Karta Krediyê
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Demjimêrk veşartî, slot {0} heta {1} serlêdana jêbirinê {2} ji {3}"
 DocType: Journal Entry Account,If Income or Expense,Heke dahat an lêçûn
@@ -5083,11 +5135,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Import Import and Settings
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Heke Opt Opt In kontrol kirin, wê paşê dê mişterî dê bixweber bi bernameya Loyalty re têkildar bibin (li ser parastinê)"
 DocType: Account,Expense Account,Hesabê mesrefê
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Dema ku berê veguherîna destpêka dema ku Karmendê Check-in tê dayîn ji bo beşdarî tête kirin.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Têkilî bi Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Vebijêrk çêbikin
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Request Payment already exists {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Karmendê li ser xilaskirina {0} divê divê &#39;Left&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Pay {0} {1}
+DocType: Company,Sales Settings,Setups Sales
 DocType: Sales Order Item,Produced Quantity,Hêjeya hilberîn
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Daxwaza daxuyaniyê ji hêla girêdana jêrîn ve bitikînin
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navbera belavkirina mehane
@@ -5165,6 +5219,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Saziyên bacê yên ji bo firotin û kirînê ji nû ve tên afirandin.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Vebijêrk {0} nikare bistînin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debît divê hesabê hesab be
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Dîroka Peymana Dîroka îro ji kêmtir be.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Ji kerema xwe re li Hesabê Warehouse {0} an Hesabê Gerînendeya Navîn li Company Company {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Set as Default
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nerazîbûna vê pakêtê. (otomatîk wekî wek kûya neteweyî ya nirxandin)
@@ -5191,8 +5246,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Piçikên Expired
 DocType: Shipping Rule,Shipping Rule Type,Rêwira Qanûna Rêwîtiyê
 DocType: Job Offer,Accepted,Qebûl kirin
-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","Ji kerema xwe kerema xwe ya karmend <a href=""#Form/Employee/{0}"">{0}</a> \ ji bo vê belgeyê betal bikin"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Hûn ji bo pîvanên nirxandina nirxên xwe ji berî nirxandin.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Nîşeyên Batch Hilbijêre
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Dîrok (Rojan)
@@ -5219,6 +5272,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Domainên xwe hilbijêrin
 DocType: Agriculture Task,Task Name,Navê Task
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Dîroka Stock Entries ji bo karûbarê kar ji bo xebitandin
+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","Ji kerema xwe kerema xwe ya karmend <a href=""#Form/Employee/{0}"">{0}</a> \ ji bo vê belgeyê betal bikin"
 ,Amount to Deliver,Amûr to Deliver
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Şirket {0} nîne
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Naverokên Daxuyaniya Pîroz nehat dîtin ku ji bo peyda tiştên girêdanê.
@@ -5268,6 +5323,7 @@
 DocType: Lab Prescription,Test Code,Kodê testê
 DocType: Purchase Taxes and Charges,On Previous Row Total,Li Row Row
 DocType: Student,Student Email Address,Navnîşana Şîfreya Xwendekarê
+,Delayed Item Report,Şîrovekirina Ameyê
 DocType: Academic Term,Education,Zanyarî
 DocType: Supplier Quotation,Supplier Address,Address Address
 DocType: Salary Detail,Do not include in total,Bi tevahî nabe
@@ -5275,7 +5331,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} tune
 DocType: Purchase Receipt Item,Rejected Quantity,Pîvana Rejected
 DocType: Cashier Closing,To TIme,To TIme
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktora UOM ({0} -&gt; {1}) nehatiye dîtin: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Koma Giştî ya Koma Giştî ya Rojane
 DocType: Fiscal Year Company,Fiscal Year Company,Şirketa Fiscal Year
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Divê belgeya alternatîf divê wekî kodê kodê ne
@@ -5327,6 +5382,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Between Between Delivery Stops
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stock Stocks Freeze Than [Days]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Disc Disc Promotional Product Discount
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Pêşniyariya pêşî ya berê berê ye
 DocType: Account,Asset Received But Not Billed,Bêguman Received But Billed Not
 DocType: POS Closing Voucher,Total Collected Amount,Giştî Hatin Collected
 DocType: Course,Default Grading Scale,Default Grading Scale
@@ -5368,6 +5424,7 @@
 DocType: Contract,Fulfilment Terms,Şertên Fîlm
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Bi Group-Non-Group
 DocType: Student Guardian,Mother,Dê
+DocType: Issue,Service Level Agreement Fulfilled,Peymaneka Rêjeya Xweyê
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Ji bo Xercên Karkerên Neheqdar yên Xercê Dravê
 DocType: Travel Request,Travel Funding,Fona Rêwîtiyê
 DocType: Shipping Rule,Fixed,Tişt
@@ -5397,10 +5454,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ti tişt nehat dîtin.
 DocType: Item Attribute,From Range,Ji Range
 DocType: Clinical Procedure,Consumables,Consumables
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; û &#39;timestamp&#39; pêwîst e.
 DocType: Purchase Taxes and Charges,Reference Row #,Row #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Ji kerema xwe &#39;Navenda Krediya Bexdayê&#39; li Kompaniyê binivîse {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: Daxistina pelê pêwîst e ku tevlihevkirina kravê bigirin
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Vebijêrk vê pêvekê hilbijêre da ku daneyên firotina firotanê ya ji M Amazon-MWS ve vekin.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Karên ku li Dalf Half Dayê tête nîşankirin (Zero to disable)
 ,Assessment Plan Status,Rewşa Nirxandina Rewşa Rewşa
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Ji kerema xwe ya yekem {0} hilbijêrin
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Vê şîfre bikin ku ji bo reklama karker biafirîne
@@ -5471,6 +5530,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Vekirî veke
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Toggle Filters
 DocType: Production Plan,Material Request Detail,Pêdivî ye
+DocType: Shift Type,Process Attendance After,Pêvajoya Pêvajoya Pêvajojê
 DocType: Material Request Item,Quantity and Warehouse,Gelek û Warehouse
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Herin bernameyan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Di navnîşên têketinê de tête navnîşan {1} {2}
@@ -5528,6 +5588,7 @@
 DocType: Pricing Rule,Party Information,Agahdariya Partiya
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debtors ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Dîrok nikare bêtir karmendek ji karmendê xwe bigire
+DocType: Shift Type,Enable Exit Grace Period,Demjimêra Xweşînek Derkeve
 DocType: Expense Claim,Employees Email Id,Karmendên E-Mail
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Pirtûka nûjen ji Shopify ya ERPNext Bi bihayê bihîstinê
 DocType: Healthcare Settings,Default Medical Code Standard,Standard Code
@@ -5557,7 +5618,6 @@
 DocType: Budget,Applicable on Material Request,Li ser daxwaznameya materyalê bicîh kirin
 DocType: Support Settings,Search APIs,APIs lêgerîn
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Percentage Overgduction For Sale Order
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Specifications
 DocType: Purchase Invoice,Supplied Items,Peyda kirin
 DocType: Leave Control Panel,Select Employees,Karker hilbijêre
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,All items have already been transferred for this Work Order.,Hemû tiştên ku ji ber vê yekê ji bo Karê Karker ve hatibû veguhestin.
@@ -5582,7 +5642,7 @@
 ,Supplier-Wise Sales Analytics,Supplier-Wise Sales Analytics
 DocType: GSTR 3B Report,February,Reşemî
 DocType: Appraisal,For Employee,Ji bo karmendê
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Dîroka Demkî ya Actual
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Dîroka Demkî ya Actual
 DocType: Sales Partner,Sales Partner Name,Navê Niştimanî Hevkariyê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Rêjeya Bexdayê {0}
 DocType: GST HSN Code,Regional,Dorane
@@ -5621,6 +5681,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Supplier Scorecard
 DocType: Travel Itinerary,Travel To,Travel To
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Beşdariya Mark
+DocType: Shift Type,Determine Check-in and Check-out,Di binçavkirinê de Check-in û Check-out
 DocType: POS Closing Voucher,Difference,Ferq
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Biçûk
 DocType: Work Order Item,Work Order Item,Karê Karê Kar
@@ -5654,6 +5715,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Tevazok
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} girtî ye
 DocType: Patient,Medical History,Dîroka Tenduristiyê
+DocType: Expense Claim,Expense Taxes and Charges,Xercên Baca û Bargiran
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Hejmara rojan piştî roja bihayê vekişînê ji ber betalkirina betalkirinê an betalkirina betaleyê bête betal kirin
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Têgihîştinê Têkilî {0} hatibû şandin
 DocType: Patient Relation,Family,Malbat
@@ -5686,7 +5748,6 @@
 DocType: Dosage Strength,Strength,Qawet
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} yekîneyên {1} di hewceya {2} de hewceya vê veguhestinê tije bikin.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Raw Material of Deposit Based On
-DocType: Bank Guarantee,Customer,Miştirî
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Heke çalak, zeviya Termê Akademîk dê di navmalê Bernameya Navneteweyî de Nerast be."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Ji bo Koma Koma Xwendekarê Bingeha Batch, Batchê ya Xwendekaran ji bo her xwendekar ji Bernameya Enrollmentê ve tê destnîşankirin."
 DocType: Course,Topics,Mijarek
@@ -5764,6 +5825,7 @@
 DocType: Chapter,Chapter Members,Endamên Beşê
 DocType: Warranty Claim,Service Address,Navnîşana Xizmet
 DocType: Journal Entry,Remark,Bingotin
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Kuştî ji bo navnîşan {4} di nav xaniyê {1} de naxwaze navnîşa navnîşan ({2} {3}
 DocType: Patient Encounter,Encounter Time,Demjimêr Dike
 DocType: Serial No,Invoice Details,Agahdariya Bexdayê
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Di heman demê de bêhtir hesabên di bin koman de têne çêkirin, lê navnîşan dikarin li dijî ne-Groups bêne çêkirin"
@@ -5843,6 +5905,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Pevçûn
 DocType: Supplier Scorecard Criteria,Criteria Formula,Formula Formula
 apps/erpnext/erpnext/config/support.py,Support Analytics,Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Nasnameya Amûriyê ya Tevlêbûnê (ID-ê Biometric / RF-ê)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Dîtin û Çalakiyê
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ger hesabek zindî ye, lêgerîn bi bikarhênerên sînor têne qedexekirin."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Piştî paşveçûnê
@@ -5864,6 +5927,7 @@
 DocType: Salary Slip,Loan Repayment,Deynkirina Lînansê
 DocType: Employee Education,Major/Optional Subjects,Babetên sereke / navendî
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Navnîşan Navnîşan û Têkilî
 DocType: Bank Guarantee,Bank Guarantee Type,Tîpa Qanûna Bankê
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Heke neheqê, qada tevahî &#39;field&#39; dê di nav ti veguhestinê de xuya nakin"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5901,6 +5965,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Di veguhestina Înfiroşa Makseyê de vekin
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Têkiliyên POSê de
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Na karmend ji bo karûbarê xanî yê nirxê dît. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Gelek Gotin (Firotana Kredî)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage tije ye, ne rizgar kirin"
 DocType: Chapter Member,Chapter Member,Beşa Endamê
@@ -5932,6 +5997,7 @@
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Koma Komên No Student nehat afirandin.
 DocType: Employee,Salary Details,Daxuyaniyê
+DocType: Employee Checkin,Exit Grace Period Consequence,Vebijdana Dawîn
 DocType: Bank Statement Transaction Invoice Item,Invoice,Biha
 DocType: Special Test Items,Particulars,Peyvên
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Ji kerema xwe re peldanka li ser naveroka an jî Warehouse hilbijêre
@@ -6032,6 +6098,7 @@
 DocType: Serial No,Out of AMC,Ji AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Profîla karûbar, karsaziyê pêwîst"
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Ship To State
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Ma hûn dixwazin daxwaza materyalê bikin
 DocType: Opportunity Item,Basic Rate,Rêjeya bingehîn
 DocType: Compensatory Leave Request,Work End Date,Dîroka Karê Dawîn
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Serdana Rawêjiya Rawayî
@@ -6212,6 +6279,7 @@
 DocType: Sales Order Item,Gross Profit,Gross Profit
 DocType: Quality Inspection,Item Serial No,Serial No Item No
 DocType: Asset,Insurer,Sîgorteyê
+DocType: Employee Checkin,OUT,DERVE
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Amînê Kirînê
 DocType: Asset Maintenance Task,Certificate Required,Sertîfîkaya pêwîst
 DocType: Retention Bonus,Retention Bonus,Bonus retain
@@ -6327,6 +6395,8 @@
 DocType: Invoice Discounting,Sanctioned,Pejirandin
 DocType: Course Enrollment,Course Enrollment,Bernameya enrollment
 DocType: Item,Supplier Items,Supplier Items
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Destpêk Destpêk Ji hêla dawîn \ ji {0} ve bêtir an jî wekhev be.
 DocType: Sales Order,Not Applicable,Rêveber
 DocType: Support Search Source,Response Options,Options Options
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,Divê {0} nirxek di navbera 0 û 100 de
@@ -6413,7 +6483,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Alîkarî
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Tiştê Tevahî
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Giştî&gt; Giştî ya Giştî&gt; Herêmî
 DocType: Share Balance,From No,Ji Na
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Alîkariya Bacêkirinê
 DocType: Purchase Invoice,Taxes and Charges Added,Tax û Dezgehên Têkilî
@@ -6521,6 +6590,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Rule Pricing Binirxînin
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Xûrek
 DocType: Lost Reason Detail,Lost Reason Detail,Reason Detailed
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Hejmarên serialê hatine afirandin: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Feedback Feedback
 DocType: Serial No,Warranty / AMC Details,Agahdariya / AMC Agahdariyê
 DocType: Issue,Opening Time,Dema vekirî
@@ -6569,6 +6639,7 @@
 DocType: Item,"Publish ""In Stock"" or ""Not in Stock"" on Hub based on stock available in this warehouse.",Li ser vê barehouse li &quot;Li Stock&quot; an &quot;Hîn In Stock&quot; ye.
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Navekî şirket nayê
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Berhemên Pêşveçûnê Berî beriya Pêşveçûn Dîrok nikare nabe
+DocType: Employee Checkin,Employee Checkin,Karmendê Checkin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Dîroka destpêkê divê ji dawiya dawîn ji bo Mijarek {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Bersivên bargiraniyê çêbikin
 DocType: Buying Settings,Buying Settings,Mîhengên kirînê
@@ -6590,6 +6661,7 @@
 DocType: Patient,Patient Demographics,Demografiya Nexweş
 DocType: Share Transfer,To Folio No,To Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Flêwaya Kredê ji Operasyonê
+DocType: Employee Checkin,Log Type,Tîpa Logê
 DocType: Stock Settings,Allow Negative Stock,Destûra Negative Bikin
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Ne tu tiştek guhertin an jî hejmar an jî nirxê xwe tune.
 DocType: Asset,Purchase Date,Dîroka kirînê
@@ -6632,6 +6704,7 @@
 DocType: Vital Signs,Very Hyper,Gelek Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Xwezayî ya xwezayî hilbijêre.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Ji kerema xwe meha û salê hilbijêrin
+DocType: Service Level,Default Priority,Default Priority
 DocType: Student Log,Student Log,Xwendekarên Xwendekar
 DocType: Shopping Cart Settings,Enable Checkout,Enable Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Çavkaniyên Mirovan
@@ -6660,7 +6733,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Têkilî bi ERPNext Connect Shopify
 DocType: Homepage Section Card,Subtitle,Binnivîs
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: BOM,Scrap Material Cost(Company Currency),Scrap Material Cost (Company Company)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Têkiliya şandina {0} divê nayê pêşkêş kirin
 DocType: Task,Actual Start Date (via Time Sheet),Dîroka Destpêka Destpêkê (bi rêya Şertê ve)
@@ -6715,6 +6787,7 @@
 DocType: Drug Prescription,Dosage,Pîvanîk
 DocType: Cheque Print Template,Starting position from top edge,Desteya avakirina ji binê çermê
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Demjimardana Demjimêr (min)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Ev karmend ji berî heman timestamp heye. {0}
 DocType: Accounting Dimension,Disable,Disable
 DocType: Email Digest,Purchase Orders to Receive,Navnîşan kirîna Kirîna Kirînê
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Productions Orders ji bo ku bêne avakirin ne:
@@ -6730,7 +6803,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Mînak ji bo veguhestinê veguhastin
 DocType: Job Card,Timing Detail,Dîroka Demjimêr
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Pêdivî ye
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Import {0} ji {1}
 DocType: Job Offer Term,Job Offer Term,Karê Xwendina Kar
 DocType: SMS Center,All Contact,All Contact
 DocType: Project Task,Project Task,Task Project
@@ -6781,7 +6853,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Item {0} ji bo Serial Nos saz nake
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Ji Dewletê
 DocType: Leave Type,Maximum Continuous Days Applicable,Rojên Xwerû Dema Rojane Têkilî
-apps/erpnext/erpnext/config/support.py,Support Team.,Tîma piştevanîya
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Ji kerema xwe re navê yekem şirket bike
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Import Successful
 DocType: Guardian,Alternate Number,Hejmarên Alternatîf
@@ -6871,6 +6942,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Row # {0}: Tiştek zêdekirin
 DocType: Student Admission,Eligibility and Details,Nirx û Agahdariyê
 DocType: Staffing Plan,Staffing Plan Detail,Pîlana Karanîna Determî
+DocType: Shift Type,Late Entry Grace Period,Wextê Gracea Dawiyê
 DocType: Email Digest,Annual Income,Hatina salane
 DocType: Journal Entry,Subscription Section,Beşê Beşê
 DocType: Salary Slip,Payment Days,Rojên Payan
@@ -6921,6 +6993,7 @@
 DocType: Journal Entry Account,Account Balance,Balance Account
 DocType: Asset Maintenance Log,Periodicity,Demjimêr
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Radyoya Tenduristiyê
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Tîpa têketinê pêwist e ku ji bo kontrola kontrola kontrol-insê ye: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Birêverbirî
 DocType: Item,Valuation Method,Vebijandin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} Li dijî Barkirina firotanê {1}
@@ -7005,6 +7078,7 @@
 DocType: Loan Type,Loan Name,Navê Lînanê
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Modela default default of payment set
 DocType: Quality Goal,Revision,Nûxwestin
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Dema ku berê veguherandina dawiya dema ku kontrola pêşî (di çend deqîqan) tê tête têne tête kirin.
 DocType: Healthcare Service Unit,Service Unit Type,Yekîneya Xizmetiyê
 DocType: Purchase Invoice,Return Against Purchase Invoice,Li Beriya Bûxandina Bersivê Vegere
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Secret secret
@@ -7160,12 +7234,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Cosmetics
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Heke hûn bixwazin bikarhêner bikar bînin ku hûn bikarhênerek rêzikek berî hilbijêre hêz bikin. Heke hûn kontrol bikin, dê nayê çêkirin."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bikarhênerên ku ev rola destûr dide ku ji hesabên vekirî saz bikin û çêkirina hesabên hesabê li dijî hesabên jîn têne çêkirin
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kodê Asayîş&gt; Tîpa Group&gt; Brand
 DocType: Expense Claim,Total Claimed Amount,Giştî Hatina Gelek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Ne ku li rojên {0} ji bo operasyonê {1} Dema Demê Slot bibînin.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Wrapping up
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Hûn dikarin tenê nûve bikin eger endametiya we di nav 30 rojan de derbas dibe
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Nirx divê di navbera {0} û {1} de
 DocType: Quality Feedback,Parameters,Parameters
+DocType: Shift Type,Auto Attendance Settings,Sîstema Tevlêbûna Otomobîlê
 ,Sales Partner Transaction Summary,Hevpeyivîna Hevpeymaniya Hevpeymaniyê
 DocType: Asset Maintenance,Maintenance Manager Name,Navê Mersûmê Navend
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Pêdivî ye ku ji bo agahdariya tiştên tomar bike.
@@ -7255,10 +7331,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Rule Applied Approved
 DocType: Job Card Item,Job Card Item,Item Card
 DocType: Homepage,Company Tagline for website homepage,Ji bo malpera malperê ya Tagline Company
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Sermaseya Destnîşan û Biryara ji bo pêşîn {0} li ser index {1} veke.
 DocType: Company,Round Off Cost Center,Navenda Kontrolê ya Çolê
 DocType: Supplier Scorecard Criteria,Criteria Weight,Nirxên giran
 DocType: Asset,Depreciation Schedules,Schedule
-DocType: Expense Claim Detail,Claim Amount,Amadekariyê
 DocType: Subscription,Discounts,Disc Discounts
 DocType: Shipping Rule,Shipping Rule Conditions,Rewşa Qanûna Rêwîtiyê
 DocType: Subscription,Cancelation Date,Dîroka Cancelkirinê
@@ -7286,7 +7362,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Nirxên sifir nîşan bidin
 DocType: Employee Onboarding,Employee Onboarding,Karker Onboarding
 DocType: POS Closing Voucher,Period End Date,Dîroka Dawîn Dîrok
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Opportunities ji hêla Çavkaniyê ve
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pêveka pêşîn ya pêşîn di lîsteyê dê wekî veberhênana dermana pêşniyazkirî be.
 DocType: POS Settings,POS Settings,POS Settings
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Hemû hesab
@@ -7306,7 +7381,6 @@
 apps/erpnext/erpnext/accounts/doctype/bank/bank_dashboard.py,Bank Deatils,Dezgeha Banka
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-YYYY-
 DocType: Healthcare Settings,Healthcare Service Items,Xizmetên tendurustî yên tenduristî
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,No records found
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Aging Range 3
 DocType: Vital Signs,Blood Pressure,Pressure Pressure
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Target At
@@ -7351,6 +7425,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Çep
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Parastinî
 DocType: Item,Has Batch No,Batch No No
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Rojên Dereng
 DocType: Lead,Person Name,Navê Nasnav
 DocType: Item Variant,Item Variant,Variant Vîdeo
 DocType: Training Event Employee,Invited,Invited
@@ -7370,7 +7445,7 @@
 DocType: Purchase Order,To Receive and Bill,Ji bo Receive û Bill
 DocType: POS Profile,Only show Customer of these Customer Groups,Tenê tenê Gelek Gelek Giştî ya Giştî
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Hilbijêrin hilbijêrin ku ji berevaniya tomar bikî
-DocType: Service Level,Resolution Time,Dema Biryara Hilbijartinê
+DocType: Service Level Priority,Resolution Time,Dema Biryara Hilbijartinê
 DocType: Grading Scale Interval,Grade Description,Dîroka Gêjeya
 DocType: Homepage Section,Cards,Karta
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kuştinên Kuştinê
@@ -7397,6 +7472,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Li gorî Lîgerê Giştî ya Danûstandinê Bank
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Tenduristiyê (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Navnîşana Warehouse ya ku ji bo çêkirina Peymana Rêwirmend û Kirînê ya Firotinê çêbikin
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Dema bersiva bersiva {0} li ser index {1} ji hêla Biryara Resolutionê ve mezintir be.
 DocType: Opportunity,Customer / Lead Name,Navnîşan / Lead Navê
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Heqê nenaskirî
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 38634dd..9736578 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,ໃບສະເຫນີ {0} ແລະໃບແຈ້ງຍອດຂາຍ {1} ຖືກຍົກເລີກ
 DocType: Purchase Receipt,Vehicle Number,ຫມາຍເລກຍານພາຫະນະ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,ທີ່ຢູ່ອີເມວຂອງເຈົ້າ...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,ປ້ອນລາຍະການປື້ມຄູ່ມືມາດຕະຖານ
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,ປ້ອນລາຍະການປື້ມຄູ່ມືມາດຕະຖານ
 DocType: Activity Cost,Activity Type,ປະເພດກິດຈະກໍາ
 DocType: Purchase Invoice,Get Advances Paid,Get Advances Paid
 DocType: Company,Gain/Loss Account on Asset Disposal,ບັນຊີການສູນເສຍ / ສູນເສຍໃນການກໍາຈັດຊັບສິນ
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,ລາຍການການຈ່າຍເງິນ
 DocType: Employee Education,Class / Percentage,Class / Percentage
 ,Electronic Invoice Register,Electronic Invoice Register
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,ຈໍານວນຂອງການເກີດຂຶ້ນຫຼັງຈາກທີ່ຜົນໄດ້ຮັບຖືກປະຕິບັດ.
 DocType: Sales Invoice,Is Return (Credit Note),ແມ່ນການກັບຄືນ (ຫມາຍເຫດການປ່ອຍສິນເຊື່ອ)
+DocType: Price List,Price Not UOM Dependent,Price Not UOM Dependent
 DocType: Lab Test Sample,Lab Test Sample,Lab Test Sample
 DocType: Shopify Settings,status html,html ສະຖານະພາບ
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ສໍາລັບຕົວຢ່າງ 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Net Pay
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Total Invoiced Amt
 DocType: Clinical Procedure,Consumables Invoice Separately,ບັນຊີເງິນຝາກປະຢັດແຍກຕ່າງຫາກ
+DocType: Shift Type,Working Hours Threshold for Absent,ການເຮັດວຽກຊົ່ວໂມງສໍາລັບການຂາດ
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-YY-MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},ບໍ່ສາມາດກໍານົດງົບປະມານຕໍ່ບັນຊີກຸ່ມ {0}
 DocType: Purchase Receipt Item,Rate and Amount,ອັດຕາແລະຈໍານວນ
@@ -380,7 +383,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Out Patient Settings
 DocType: Asset,Insurance End Date,ວັນສິ້ນສຸດການປະກັນໄພ
 DocType: Bank Account,Branch Code,ລະຫັດສາຂາ
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,ເວລາທີ່ຈະຕອບສະຫນອງ
 apps/erpnext/erpnext/public/js/conf.js,User Forum,User Forum
 DocType: Landed Cost Item,Landed Cost Item,ລາຄາທີ່ດິນທີ່ມີລາຍໄດ້
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,ຜູ້ຂາຍແລະຜູ້ຊື້ບໍ່ສາມາດດຽວກັນ
@@ -598,6 +600,7 @@
 DocType: Share Transfer,Transfer,ການໂອນເງິນ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Search Item (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} ຜົນໄດ້ຮັບສົ່ງ
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ຈາກວັນທີບໍ່ສາມາດຈະສູງກວ່າວັນທີ
 DocType: Supplier,Supplier of Goods or Services.,ຜູ້ໃຫ້ບໍລິການສິນຄ້າຫຼືບໍລິການ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,ຊື່ບັນຊີໃຫມ່. ຫມາຍເຫດ: ກະລຸນາຢ່າສ້າງບັນຊີສໍາລັບລູກຄ້າແລະຜູ້ໃຫ້ບໍລິການ
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,ກຸ່ມນັກຮຽນຫຼືກໍານົດເວລາແນ່ນອນແມ່ນຈໍາເປັນ
@@ -883,7 +886,6 @@
 DocType: Skill,Skill Name,ຊື່ສີມືແຮງງານ
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Print Report Card
 DocType: Soil Texture,Ternary Plot,Ternary Plot
-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/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,ສະຫນັບສະຫນູນປີ້
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,ຫຼ້າສຸດ
@@ -896,6 +898,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,ຂໍ້ບັງຄັບສໍາລັບໃບດຸ່ນດ່ຽງ
 DocType: Payment Entry,Total Allocated Amount,ຈໍານວນເງິນທີ່ຖືກມອບຫມາຍ
 DocType: Sales Invoice,Get Advances Received,Get Advances Received
+DocType: Shift Type,Last Sync of Checkin,ສຸດທ້າຍ Sync ຂອງ Checkin
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,ຈໍານວນເງິນພາສີປະກອບມີໃນມູນຄ່າ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -904,7 +907,9 @@
 DocType: Student,Blood Group,ກຸ່ມເລືອດ
 apps/erpnext/erpnext/config/healthcare.py,Masters,Masters
 DocType: Crop,Crop Spacing UOM,ການລວບລວມພື້ນທີ່ UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,ເວລາຫຼັງຈາກເວລາເລີ່ມຕົ້ນທີ່ປ່ຽນເວລາໃນເວລາເຊັກອິນແມ່ນຖືວ່າເປັນເວລາຊັກຊ້າ (ໃນນາທີ).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,ການສໍາຫຼວດ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,ບໍ່ມີໃບເກັບເງິນທີ່ຍັງເຫຼືອ
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} ຫວ່າງແລະ {1} ງົບປະມານສໍາລັບ {2} ແລ້ວໄດ້ວາງແຜນໄວ້ສໍາລັບບໍລິສັດຍ່ອຍຂອງ {3}. \ ທ່ານພຽງແຕ່ສາມາດວາງແຜນໄວ້ສໍາລັບ {4} ຫວ່າງງານແລະງົບປະມານ {5} ຕໍ່ແຜນທຸລະກິດ {6} ສໍາລັບບໍລິສັດແມ່ {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Product Sheets
@@ -1006,6 +1011,7 @@
 DocType: Item,Moving Average,Moving Average
 DocType: Employee Attendance Tool,Unmarked Attendance,ການເຂົ້າຮ່ວມທີ່ບໍ່ໄດ້ຫມາຍຄວາມວ່າ
 DocType: Homepage Section,Number of Columns,ຈໍານວນຄໍລໍາ
+DocType: Issue Priority,Issue Priority,ລໍາດັບຄວາມສໍາຄັນ
 DocType: Holiday List,Add Weekly Holidays,ເພີ່ມວັນຢຸດຕໍ່ອາທິດ
 DocType: Shopify Log,Shopify Log,Shopify Log
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,ສ້າງລາຍຈ່າຍເງິນເດືອນ
@@ -1014,6 +1020,7 @@
 DocType: Warranty Claim,Issue Date,Issue Date
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກ Batch for Item {0}. ບໍ່ສາມາດຊອກຫາຊຸດດຽວທີ່ປະຕິບັດຕາມຂໍ້ກໍານົດນີ້
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,ບໍ່ສາມາດສ້າງເງິນບໍານານເກັບຮັກສາໄວ້ສໍາລັບພະນັກງານຊ້າຍ
+DocType: Employee Checkin,Location / Device ID,ທີ່ຕັ້ງ / ອຸປະກອນ ID
 DocType: Purchase Order,To Receive,ການໄດ້ຮັບ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອບໄລນ໌. ທ່ານຈະບໍ່ສາມາດໂຫຼດຄືນໄດ້ຈົນກວ່າທ່ານຈະມີເຄືອຂ່າຍ.
 DocType: Course Activity,Enrollment,ການລົງທະບຽນ
@@ -1022,7 +1029,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},ສູງສຸດ: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ຂໍ້ມູນ E -Invoicing ຫາຍໄປ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ບໍ່ມີການຂໍອຸປະກອນການສ້າງ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Loan,Total Amount Paid,ຈໍານວນເງິນທີ່ຈ່າຍ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,ລາຍການທັງຫມົດເຫຼົ່ານີ້ໄດ້ຖືກມອບໃຫ້ແລ້ວ
 DocType: Training Event,Trainer Name,ຊື່ຄູຝຶກ
@@ -1133,6 +1139,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},ກະລຸນາລະບຸຊື່ທີ່ນໍາມານໍາໃນ {0}
 DocType: Employee,You can enter any date manually,ທ່ານສາມາດປ້ອນວັນທີດ້ວຍຕົນເອງ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item Reconciliation Item
+DocType: Shift Type,Early Exit Consequence,Early Exit Consequence
 DocType: Item Group,General Settings,ການຕັ້ງຄ່າທົ່ວໄປ
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,ວັນຄົບກໍານົດບໍ່ສາມາດເປັນໄປໄດ້ກ່ອນ Posting / Supplier Invoice Date
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,ກະລຸນາໃສ່ຊື່ຂອງ Beneficiary ກ່ອນສົ່ງຄໍາສັ່ງ.
@@ -1171,6 +1178,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,ການຍືນຍັນການຈ່າຍເງິນ
 ,Available Stock for Packing Items,ຫຼັກຊັບທີ່ມີຢູ່ສໍາລັບບັນຈຸສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບແຈ້ງຫນີ້ {0} ນີ້ອອກຈາກ C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,ທຸກໆເຊັກອິນແລະເຊັກເອົາ
 DocType: Support Search Source,Query Route String,Query Route String
 DocType: Customer Feedback Template,Customer Feedback Template,Customer Feedback Template
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,ຄໍາຊີ້ແຈງໃຫ້ຜູ້ນໍາຫຼືລູກຄ້າ.
@@ -1205,6 +1213,7 @@
 DocType: Authorization Control,Authorization Control,ການຄວບຄຸມການອະນຸຍາດ
 ,Daily Work Summary Replies,ຕອບຫຼ້າສຸດ
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນໃຫ້ຮ່ວມມືໃນໂຄງການນີ້: {0}
+DocType: Issue,Response By Variance,ການຕອບສະຫນອງໂດຍ Variance
 DocType: Item,Sales Details,ລາຍະລະອຽດການຂາຍ
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,ຫົວຈົດຫມາຍສໍາລັບແມ່ພິມພິມ.
 DocType: Salary Detail,Tax on additional salary,ພາສີກ່ຽວກັບເງິນເດືອນເພີ່ມເຕີມ
@@ -1328,6 +1337,7 @@
 DocType: Project,Task Progress,Task Progress
 DocType: Journal Entry,Opening Entry,Opening Entry
 DocType: Bank Guarantee,Charges Incurred,Charges Incurred
+DocType: Shift Type,Working Hours Calculation Based On,ການຄິດໄລ່ຊົ່ວໂມງເຮັດວຽກອີງໃສ່
 DocType: Work Order,Material Transferred for Manufacturing,ວັດສະດຸທີ່ຖືກໂອນສໍາລັບການຜະລິດ
 DocType: Products Settings,Hide Variants,Hide Variants
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ການປິດການຈັດວາງແຜນການແລະການຕິດຕາມເວລາ
@@ -1357,6 +1367,7 @@
 DocType: Guardian,Interests,ຄວາມສົນໃຈ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Qty ນໍາໃຊ້
 DocType: Education Settings,Education Manager,Education Manager
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,ວາງຕາຕະລາງເວລາທີ່ຢູ່ນອກເວລາເຮັດວຽກຂອງ Workstation.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},ຜະລິດແນນຄວາມສັດຊື່: {0}
 DocType: Healthcare Settings,Registration Message,ຂໍ້ຄວາມລົງທະບຽນ
@@ -1381,9 +1392,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,ໃບເກັບເງິນທີ່ສ້າງແລ້ວສໍາລັບຊົ່ວໂມງເອີ້ນເກັບເງິນທັງຫມົດ
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Purchase Invoice,Pricing Rules,ລາຄາກໍານົດ
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","ຍ້ອນວ່າມີການໂອນເງິນທີ່ມີຢູ່ແລ້ວກັບ {0}, ທ່ານບໍ່ສາມາດປ່ຽນຄ່າຂອງ {1}"
 DocType: Hub Tracked Item,Image List,ລາຍະການຮູບພາບ
 DocType: Item Variant Settings,Allow Rename Attribute Value,ອະນຸຍາດໃຫ້ປ່ຽນຊື່ຄ່າຄຸນລັກສະນະ
-DocType: Price List,Price Not UOM Dependant,Price Not UOM Dependent
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),ເວລາ (ໃນນາທີ)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,ພື້ນຖານ
 DocType: Loan,Interest Income Account,ບັນຊີລາຍຮັບດອກເບ້ຍ
@@ -1393,6 +1404,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,ເລືອກລາຍຊື່ POS
 DocType: Support Settings,Get Latest Query,Get Query ຫຼ້າສຸດ
 DocType: Employee Incentive,Employee Incentive,ແຮງຈູງໃຈ
+DocType: Service Level,Priorities,ຄວາມສໍາຄັນ
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,ເພີ່ມບັດຫຼືສ່ວນບຸກຄົນໃນຫນ້າເວັບທໍາອິດ
 DocType: Homepage,Hero Section Based On,Hero Section Based On
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ຄ່າໃຊ້ຈ່າຍໃນການຊື້ທັງຫມົດ (ຜ່ານການຊື້ໃບເກັບເງິນ)
@@ -1453,7 +1465,7 @@
 DocType: Blanket Order Item,Ordered Quantity,ຈໍານວນສັ່ງຊື້
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ແຖວ # {0}: ຂໍ້ມູນສາງທີ່ຖືກປະຕິເສດແມ່ນບັງຄັບໃຊ້ຕໍ່ກັບລາຍການທີ່ຖືກປະຕິເສດ {1}
 ,Received Items To Be Billed,ບັນດາລາຍການທີ່ໄດ້ມາເພື່ອຈະຖືກເອີ້ນເກັບເງິນ
-DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
+DocType: Attendance,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,ໂຫມດການຊໍາລະເງິນ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,ລາຍການຄໍາສັ່ງຊື້ບໍ່ໄດ້ຮັບໃນເວລາ
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,ໄລຍະເວລາໃນວັນ
@@ -1573,7 +1585,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,ຂໍ້ມູນກົດລະບຽບແລະຂໍ້ມູນທົ່ວໄປກ່ຽວກັບຜູ້ຜະລິດຂອງທ່ານ
 DocType: Item Default,Default Selling Cost Center,ສູນຕົ້ນທຶນຂາຍແບບເດີມ
 DocType: Sales Partner,Address & Contacts,ທີ່ຢູ່ &amp; ການຕິດຕໍ່
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕັ້ງຄ່າຊຸດຈໍານວນສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 DocType: Subscriber,Subscriber,Subscriber
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ແບບຟອມ / ລາຍການ / {0}) ແມ່ນອອກຫຼັກຊັບ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ລົງໂຄສະນາກ່ອນ
@@ -1584,7 +1595,7 @@
 DocType: Detected Disease,Tasks Created,Tasks Created
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ຕ້ອງໃຊ້ສໍາລັບລາຍການນີ້ຫຼືແບບຂອງມັນ
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,ຄະນະກໍາມະການອັດຕາ%
-DocType: Service Level,Response Time,ເວລາຕອບສະຫນອງ
+DocType: Service Level Priority,Response Time,ເວລາຕອບສະຫນອງ
 DocType: Woocommerce Settings,Woocommerce Settings,ການຕັ້ງຄ່າ Woocommerce
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,ຈໍານວນຕ້ອງເປັນບວກ
 DocType: Contract,CRM,CRM
@@ -1601,7 +1612,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Transaction Data Mapping
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,ຜູ້ນໍາຕ້ອງຮຽກຮ້ອງຊື່ຂອງບຸກຄົນຫຼືຊື່ຂອງອົງການ
 DocType: Student,Guardians,ຜູ້ປົກຄອງ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ&gt; ການສຶກສາການສຶກສາ
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ເລືອກຍີ່ຫໍ້ ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,ລາຍໄດ້ກາງ
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ອີງໃສ່
@@ -1638,6 +1648,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},ບັນທຶກການເຂົ້າຮ່ວມ {0} ມີຕໍ່ Student {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Date of Transaction
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,ຍົກເລີກການຈອງ
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,ບໍ່ສາມາດຕັ້ງສັນຍາລະດັບການບໍລິການ {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,ເງິນເດືອນສຸດທິ
 DocType: Account,Liability,ຄວາມຮັບຜິດຊອບ
 DocType: Employee,Bank A/C No.,Bank A / C No
@@ -1703,7 +1714,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,ຊື້ໃບແຈ້ງຫນີ້ {0} ແລ້ວ
 DocType: Fees,Student Email,Email ນັກຮຽນ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},ການເອີ້ນຄືນຄະດີ: {0} ບໍ່ສາມາດເປັນພໍ່ແມ່ຫລືເດັກຂອງ {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,ເອົາລາຍການຈາກບໍລິການສຸຂະພາບ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,ບໍ່ມີການສົ່ງເອກະສານເຂົ້າ {0}
 DocType: Item Attribute Value,Item Attribute Value,Item Attribute Value
@@ -1728,7 +1738,6 @@
 DocType: Production Plan,Select Items to Manufacture,ເລືອກລາຍການເພື່ອຜະລິດ
 DocType: Leave Application,Leave Approver Name,ອອກຊື່ຊື່ຜູ້ພິພາກສາ
 DocType: Shareholder,Shareholder,ຜູ້ຖືຫຸ້ນ
-DocType: Issue,Agreement Status,ສະຖານະສັນຍາ
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,ການຕັ້ງຄ່າເລີ່ມຕົ້ນສໍາລັບການຂາຍຂາຍ.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,ກະລຸນາເລືອກການເຂົ້າຮຽນຂອງນັກຮຽນເຊິ່ງບັງຄັບໃຫ້ນັກຮຽນທີ່ໄດ້ຮັບຄ່າຈ້າງ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,ເລືອກ BOM
@@ -1991,6 +2000,7 @@
 DocType: Account,Income Account,ບັນຊີລາຍຮັບ
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,ທຸກຄັງສິນຄ້າ
 DocType: Contract,Signee Details,Signee Details
+DocType: Shift Type,Allow check-out after shift end time (in minutes),ອະນຸຍາດໃຫ້ອອກເດີນທາງຫຼັງຈາກເວລາສິ້ນສຸດລົງ (ໃນນາທີ)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,ການຈັດຊື້
 DocType: Item Group,Check this if you want to show in website,ກວດເບິ່ງນີ້ຖ້າທ່ານຕ້ອງການສະແດງໃນເວັບໄຊທ໌
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,ປີງົບປະມານ {0} ບໍ່ພົບ
@@ -2057,6 +2067,7 @@
 DocType: Activity Cost,Billing Rate,ອັດຕາດອກເບ້ຍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},ຄໍາເຕືອນ: ມີ {0} # {1} ອີກຕໍ່ໄປຕໍ່ກັບການເຂົ້າຮຸ້ນ {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,ກະລຸນາເປີດໃຊ້ Google Maps Settings ເພື່ອປະເມີນແລະ optimize ເສັ້ນທາງ
+DocType: Purchase Invoice Item,Page Break,Page Break
 DocType: Supplier Scorecard Criteria,Max Score,Max Score
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,ວັນທີເລີ່ມຕົ້ນການຊໍາລະເງິນບໍ່ສາມາດເປັນວັນທີທີ່ໄດ້ຮັບເງິນປັນຜົນ.
 DocType: Support Search Source,Support Search Source,ສະຫນັບສະຫນູນຄົ້ນຫາແຫຼ່ງຂໍ້ມູນ
@@ -2125,6 +2136,7 @@
 DocType: Employee Transfer,Employee Transfer,ການໂອນເງິນພະນັກງານ
 ,Sales Funnel,Funnel ຂາຍ
 DocType: Agriculture Analysis Criteria,Water Analysis,ການວິເຄາະນ້ໍາ
+DocType: Shift Type,Begin check-in before shift start time (in minutes),ເລີ່ມຕົ້ນກວດສອບກ່ອນເວລາເລີ່ມຕົ້ນຂອງການປ່ຽນເວລາ (ໃນນາທີ)
 DocType: Accounts Settings,Accounts Frozen Upto,Accounts Frozen Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,ບໍ່ມີຫຍັງທີ່ຈະແກ້ໄຂ.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ການເຮັດວຽກ {0} ຍາວກວ່າເວລາເຮັດວຽກທີ່ມີຢູ່ໃນສະຖານທີ່ເຮັດວຽກ {1}, ເຮັດໃຫ້ລະບົບປະຕິບັດງານແຕກຕ່າງກັນ"
@@ -2138,7 +2150,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},ຄໍາສັ່ງຂາຍ {0} ແມ່ນ {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),ຊັກຊ້າໃນການຊໍາລະເງິນ (ວັນ)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,ກະລຸນາໃສ່ລາຍະລະຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Customer PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,ວັນສົ່ງມອບຕ້ອງແມ່ນຫຼັງຈາກວັນທີ່ສັ່ງຊື້
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,ຈໍານວນຂອງສິນຄ້າບໍ່ສາມາດເປັນສູນ
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Invalid Attribute
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},ກະລຸນາເລືອກ BOM ຕໍ່ກັບລາຍການ {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ປະເພດໃບເກັບເງິນ
@@ -2148,6 +2162,7 @@
 DocType: Volunteer,Afternoon,ຕອນບ່າຍ
 DocType: Vital Signs,Nutrition Values,Nutrition Values
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),ການມີອາການໄຂ້ (ຄວາມຮ້ອນ&gt; 385 ° C / 1013 ° F ຫຼືຄວາມຊ້າ&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຂອງພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC Reversed
 DocType: Project,Collect Progress,ເກັບກໍາຄວາມກ້າວຫນ້າ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ພະລັງງານ
@@ -2198,6 +2213,7 @@
 ,Ordered Items To Be Billed,ລາຍການສັ່ງຊື້ທີ່ຈະຖືກເອີ້ນເກັບເງິນ
 DocType: Taxable Salary Slab,To Amount,ເພື່ອຈໍານວນເງິນ
 DocType: Purchase Invoice,Is Return (Debit Note),ແມ່ນການກັບຄືນ (ຫມາຍເຫດການປ່ອຍສິນເຊື່ອ)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 apps/erpnext/erpnext/config/desktop.py,Getting Started,ການເລີ່ມຕົ້ນ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ປ້ອນຂໍ້ມູນ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ບໍ່ສາມາດປ່ຽນແປງວັນທີເລີ່ມຕົ້ນຂອງປີງົບປະມານແລະວັນສິ້ນສຸດປີງົບປະມານເມື່ອປີງົບປະມານໄດ້ຖືກບັນທຶກໄວ້.
@@ -2216,8 +2232,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},ວັນເລີ່ມຕົ້ນການບໍາລຸງຮັກສາບໍ່ສາມາດເປັນວັນສົ່ງມອບສໍາລັບ Serial No {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,ແຖວ {0}: ອັດຕາແລກປ່ຽນແມ່ນຈໍາເປັນ
 DocType: Purchase Invoice,Select Supplier Address,ເລືອກທີ່ຢູ່ຂອງຜູ້ສະຫນອງ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","ປະລິມານທີ່ມີຢູ່ແມ່ນ {0}, ທ່ານຕ້ອງການ {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,ກະລຸນາໃສ່ລະຫັດລັບ Consumer Secret
 DocType: Program Enrollment Fee,Program Enrollment Fee,ຄ່າທໍານຽມການເຂົ້າຮຽນຂອງໂຄງການ
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,ວັນທີການຍືນຍັນການຮັບປະກັນ
 DocType: Hotel Room Pricing,Hotel Room Pricing,Hotel Room Pricing
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","ອຸປະກອນການຈ່າຍພາສີພາຍນອກ (ນອກເຫນືອຈາກອັດຕາທີ່ບໍ່ມີການປະເມີນ, ບໍ່ມີການປະເມີນແລະຍົກເວັ້ນ"
@@ -2277,6 +2295,7 @@
 DocType: Quality Inspection Reading,Reading 5,ອ່ານ 5
 DocType: Shopping Cart Settings,Display Settings,Display Settings
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,ກະລຸນາຕັ້ງຄ່າຈໍານວນເງິນທີ່ຖືກຈອງໄວ້
+DocType: Shift Type,Consequence after,ຜົນສະທ້ອນຫຼັງຈາກນັ້ນ
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,ທ່ານຈໍາເປັນຕ້ອງໄດ້ຊ່ວຍຫຍັງແດ່?
 DocType: Journal Entry,Printing Settings,ການຕັ້ງຄ່າການພິມ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ທະນາຄານ
@@ -2286,6 +2305,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ທີ່ຢູ່ບັນຊີໃບບິນແມ່ນດຽວກັນກັບທີ່ຢູ່ສົ່ງ
 DocType: Account,Cash,ເງິນສົດ
 DocType: Employee,Leave Policy,ອອກຈາກນະໂຍບາຍ
+DocType: Shift Type,Consequence,ຜົນສະທ້ອນ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,ທີ່ຢູ່ໂຮງຮຽນ
 DocType: GST Account,CESS Account,CESS Account
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ສູນຕົ້ນທຶນແມ່ນຕ້ອງການສໍາລັບບັນຊີ &#39;ກໍາໄຮແລະການສູນເສຍ&#39; {2}. ກະລຸນາຕັ້ງຄ່າຄ່າສູນຕົ້ນຕໍສໍາລັບບໍລິສັດ.
@@ -2350,6 +2370,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,ໄລຍະເວລາປິດໃບຍືມ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Name
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,ກະລຸນາໃສ່ບັນຊີລາຍຈ່າຍ
+DocType: Issue,Resolution By Variance,Resolution by Variance
 DocType: Employee,Resignation Letter Date,ວັນທີອອກໃບລາຍງານ
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,ເຂົ້າຮ່ວມວັນທີ
@@ -2362,6 +2383,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,ເບິ່ງຕອນນີ້
 DocType: Item Price,Valid Upto,Valid to Up
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Doctype ອ້າງອີງຕ້ອງເປັນຫນຶ່ງໃນ {0}
+DocType: Employee Checkin,Skip Auto Attendance,ຂ້າມການເຂົ້າຮ່ວມອັດຕະໂນມັດ
 DocType: Payment Request,Transaction Currency,ເງິນຕາການເຮັດທຸລະກໍາ
 DocType: Loan,Repayment Schedule,ຕາຕະລາງການຈ່າຍຄືນ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,ສ້າງເອກະສານການເກັບຮັກສາແບບຕົວຢ່າງ
@@ -2433,6 +2455,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,ໃບຢັ້ງຢືນການປິດໃບຢັ້ງຢືນຍອດຂາຍ POS
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Action Initialised
 DocType: POS Profile,Applicable for Users,ສາມາດໃຊ້ໄດ້ສໍາລັບຜູ້ໃຊ້
+,Delayed Order Report,ລາຍງານຄໍາສັ່ງຊ້າລົງ
 DocType: Training Event,Exam,Exam
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,ຈໍານວນທີ່ບໍ່ຖືກຕ້ອງຂອງບັນຊີລາຍການ Ledger ທົ່ວໄປພົບ. ທ່ານອາດຈະໄດ້ເລືອກບັນຊີຜິດໃນການເຮັດທຸລະກໍາ.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Sales Pipeline
@@ -2447,10 +2470,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,ເງື່ອນໄຂເຫຼົ່ານີ້ຈະຕ້ອງໄດ້ຮັບການບໍລິການກ່ຽວກັບການຄັດທັງຫມົດ.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Configure
 DocType: Hotel Room,Capacity,ຄວາມສາມາດ
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Installed Qty
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,ລະຫັດ {0} ຂອງລາຍການ {1} ຖືກປິດໃຊ້ງານ.
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,ມື້ເຮັດວຽກໄດ້ຖືກຊ້ໍາສອງເທື່ອ
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,ສັນຍາການບໍລິການທີ່ມີປະເພດຂອງ Entity {0} ແລະ Entity {1} ມີຢູ່ແລ້ວ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າທີ່ບໍ່ໄດ້ກ່າວໃນຫົວຂໍ້ຕົ້ນສະບັບສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},ຊື່ຄວາມຜິດພາດ: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,ອານາເຂດແມ່ນຕ້ອງການໃນ POS Profile
@@ -2498,6 +2522,7 @@
 DocType: Depreciation Schedule,Schedule Date,Schedule Date
 DocType: Packing Slip,Package Weight Details,Package Weight Details
 DocType: Job Applicant,Job Opening,ວຽກເປີດ
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,ສຸດທ້າຍຊື່ Sync ທີ່ປະສົບຜົນສໍາເລັດຂອງ Employee Checkin. ຕັ້ງຄ່າໃຫມ່ນີ້ເທົ່ານັ້ນຖ້າທ່ານແນ່ໃຈວ່າບັນທຶກທັງຫມົດຈະຖືກ sync ຈາກທຸກສະຖານທີ່. ກະລຸນາຢ່າແກ້ໄຂບັນຫານີ້ຖ້າທ່ານບໍ່ແນ່ໃຈ.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,ຄ່າໃຊ້ຈ່າຍຈິງ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),ຍອດລ່ວງຫນ້າ ({0}) ຕໍ່ຄໍາສັ່ງ {1} ບໍ່ສາມາດຈະສູງກວ່າ Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Variants Item updated
@@ -2542,6 +2567,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Get Invocies
 DocType: Tally Migration,Is Day Book Data Imported,ແມ່ນບັນດາລາຍການປື້ມວັນທີທີ່ນໍາເຂົ້າ
 ,Sales Partners Commission,Sales Partners Commission
+DocType: Shift Type,Enable Different Consequence for Early Exit,ເຮັດໃຫ້ຜົນກະທົບທີ່ແຕກຕ່າງກັນສໍາລັບການອອກຈາກອອກມາກ່ອນ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,ກົດຫມາຍ
 DocType: Loan Application,Required by Date,Required by Date
 DocType: Quiz Result,Quiz Result,Quiz Result
@@ -2601,7 +2627,6 @@
 DocType: Pricing Rule,Pricing Rule,Pricing Rule
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},ລາຍຊື່ວັນພັກທາງເລືອກບໍ່ຖືກກໍານົດໄວ້ໃນໄລຍະເວລາພັກໄວ້ {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,ກະລຸນາຕັ້ງຊື່ຜູ້ໃຊ້ ID ໃນບັນທຶກພະນັກງານເພື່ອກໍານົດຕໍາແຫນ່ງພະນັກງານ
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,ເວລາທີ່ຈະແກ້ໄຂ
 DocType: Training Event,Training Event,ການຝຶກອົບຮົມເຫດການ
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","ຄວາມດັນເລືອດປົກກະຕິຢູ່ໃນຜູ້ໃຫຍ່ແມ່ນປະມານ 120 mmHg systolic, ແລະ 80 mmHg diastolic, ຫຍໍ້ວ່າ &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,ລະບົບຈະລວບລວມລາຍະການທັງຫມົດຖ້າຄ່າຈໍາກັດແມ່ນສູນ.
@@ -2645,6 +2670,7 @@
 DocType: Student Applicant,Approved,ອະນຸມັດ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},ຈາກວັນຄວນຢູ່ພາຍໃນປີງົບປະມານ. ສົມມຸດຈາກວັນ = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,ກະລຸນາຕັ້ງກຸ່ມຜູ້ໃຫ້ບໍລິການໃນການຊື້ການຕັ້ງຄ່າ.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} ເປັນສະຖານະການເຂົ້າຮ່ວມທີ່ບໍ່ຖືກຕ້ອງ.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,ບັນຊີເປີດຊົ່ວຄາວ
 DocType: Purchase Invoice,Cash/Bank Account,ເງິນສົດ / ບັນຊີທະນາຄານ
 DocType: Quality Meeting Table,Quality Meeting Table,Quality Meeting Table
@@ -2680,6 +2706,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ອາຫານ, ເຄື່ອງດື່ມແລະຢາສູບ"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Schedule Schedule
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,ການເຂົ້າຮ່ວມຈະຖືກຫມາຍອັດຕະໂນມັດພາຍຫຼັງວັນທີນີ້.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,ອຸປະກອນທີ່ເຮັດໃຫ້ຜູ້ຖື UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Request for Quotations
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,ເງິນສະກຸນເງິນບໍ່ສາມາດປ່ຽນແປງໄດ້ຫຼັງຈາກການເຮັດລາຍະການໂດຍນໍາໃຊ້ສະກຸນເງິນອື່ນ
@@ -2728,7 +2755,6 @@
 DocType: Item,Is Item from Hub,ແມ່ນຈຸດຈາກ Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Quality Procedure
 DocType: Share Balance,No of Shares,ບໍ່ມີການແບ່ງປັນ
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: ບໍ່ມີສໍາລັບການ {4} ໃນສາງ {1} ໃນເວລາທີ່ປ້ອນຂໍ້ມູນ ({2} {3})
 DocType: Quality Action,Preventive,ການປ້ອງກັນ
 DocType: Support Settings,Forum URL,Forum URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,ພະນັກງານແລະຜູ້ເຂົ້າຮ່ວມ
@@ -2950,7 +2976,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,ພາສີແລະຄ່າທໍານຽມມາດຕະຖານ
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການໂອນກັບຜູ້ຜະລິດນີ້. ເບິ່ງຕາຕະລາງຂ້າງລຸ່ມສໍາລັບລາຍລະອຽດ
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,ໃສ່ວັນເລີ່ມຕົ້ນແລະວັນສິ້ນສຸດສໍາລັບສັນຍາ.
 DocType: Delivery Note Item,Against Sales Invoice,Against Invoice Sales
 DocType: Loyalty Point Entry,Purchase Amount,ຈໍານວນການຊື້
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດຕັ້ງຄ່າ Lost as Sales Order ໄດ້ຖືກສ້າງຂຶ້ນ.
@@ -2974,7 +2999,7 @@
 DocType: Lead,Organization Name,ຊື່ອົງກອນ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,ຂໍ້ມູນທີ່ຖືກຕ້ອງແລະຖືກຕ້ອງເຖິງແມ່ນຈະຕ້ອງບັງຄັບສໍາລັບການສະສົມ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},ແຖວ # {0}: ຈໍານວນບໍ່ຕ້ອງມີຄືກັນກັບ {1} {2}
-DocType: Employee,Leave Details,ອອກຈາກລາຍລະອຽດ
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,ການໂອນຫຼັກຊັບກ່ອນ {0} ແມ່ນ frozen
 DocType: Driver,Issuing Date,ວັນທີອອກໃບອະນຸຍາດ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Requestor
@@ -3019,9 +3044,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ລາຍະລະອຽດແບບແຜນກາຟ Flow Mapping
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,ການຝຶກອົບຮົມແລະການຝຶກອົບຮົມ
 DocType: Drug Prescription,Interval UOM,ໄລຍະເວລາ UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Grace Period Settings ສໍາລັບ Auto Attendance
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,ຈາກສະກຸນເງິນແລະເພື່ອສະກຸນເງິນບໍ່ສາມາດມີຄວາມຄືກັນ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Pharmaceuticals
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,ສະຫນັບສະຫນູນຊົ່ວໂມງ
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} ຖືກຍົກເລີກຫຼືປິດ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ແຖວ {0}: ການລ່ວງລະເມີດຕໍ່ລູກຄ້າຕ້ອງເປັນຫນີ້
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Group by Voucher (Consolidated)
@@ -3131,6 +3158,7 @@
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Lab Test,Sample ID,ID ຕົວຢ່າງ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,ໂຄງຮ່າງການແມ່ນຫວ່າງເປົ່າ
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,ການເຂົ້າຮ່ວມໄດ້ຮັບການຈົດທະບຽນໂດຍການກວດສອບຂອງພະນັກງານ
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,ຕ້ອງໄດ້ສົ່ງສິນຄ້າ {0}
 ,Absent Student Report,Reported Student Absent
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,ລວມຢູ່ໃນກໍາໄຮຂັ້ນຕົ້ນ
@@ -3138,7 +3166,9 @@
 DocType: Travel Request Costing,Funded Amount,ຈໍານວນເງິນທີ່ໄດ້ຮັບທຶນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} ບໍ່ໄດ້ຖືກສົ່ງດັ່ງນັ້ນການປະຕິບັດບໍ່ສາມາດສໍາເລັດ
 DocType: Subscription,Trial Period End Date,ໄລຍະເວລາການທົດລອງຂອງການທົດລອງ
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,ການຄັດເລືອກການເຂົ້າຫາເປັນ IN ແລະ OUT ໃນລະຫວ່າງການປ່ຽນແປງດຽວກັນ
 DocType: BOM Update Tool,The new BOM after replacement,BOM ໃຫມ່ຫຼັງຈາກການທົດແທນ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Item 5
 DocType: Employee,Passport Number,Passport Number
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,ຊົ່ວຄາວເປີດ
@@ -3254,6 +3284,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 ,Issued Items Against Work Order,ລາຍການລາຍການອອກຈາກວຽກງານ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,ການສ້າງ {0} ໃບເກັບເງິນ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງຊື່ລະບົບການໃຫ້ຄໍາແນະນໍາໃນການສຶກສາ&gt; ການສຶກສາການສຶກສາ
 DocType: Student,Joining Date,ເຂົ້າຮ່ວມວັນທີ
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Requesting Site
 DocType: Purchase Invoice,Against Expense Account,Against Expense Account
@@ -3293,6 +3324,7 @@
 DocType: Landed Cost Item,Applicable Charges,ຄ່າທໍານຽມທີ່ສາມາດນໍາໃຊ້ໄດ້
 ,Point of Sale,ຈຸດຂອງການຂາຍ
 DocType: Authorization Rule,Approving User  (above authorized value),ການອະນຸມັດຜູ້ໃຊ້ (ຂ້າງເທິງມູນຄ່າທີ່ໄດ້ຮັບອະນຸຍາດ)
+DocType: Service Level Agreement,Entity,Entity
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},ຈໍານວນເງິນ {0} {1} ຖືກໂອນຈາກ {2} ກັບ {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ຂຶ້ນກັບໂຄງການ {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,From Party Name
@@ -3339,6 +3371,7 @@
 DocType: Soil Texture,Sand Composition (%),ອົງປະກອບຂອງທາຍ (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Import Day Book Data
+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
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນແມ່ນຕ້ອງການທີ່ຈະຈອງຄໍາຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} serial Nos ທີ່ຖືກຕ້ອງສໍາລັບລາຍການ {1}
@@ -3399,7 +3432,6 @@
 DocType: Asset,Asset Owner,ເຈົ້າຂອງຊັບສິນ
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},ຄັງສິນຄ້າແມ່ນຈໍາເປັນສໍາລັບຫຼັກຊັບສິນຄ້າ {0} ໃນແຖວ {1}
 DocType: Stock Entry,Total Additional Costs,ຄ່າໃຊ້ຈ່າຍລວມທັງຫມົດ
-DocType: Marketplace Settings,Last Sync On,Last Sync On
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,ກະລຸນາຕັ້ງຄ່າຢ່າງນ້ອຍຫນຶ່ງແຖວໃນຕາລາງພາສີແລະຄ່າບໍລິການ
 DocType: Asset Maintenance Team,Maintenance Team Name,ຊື່ທີມບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,ຕາຕະລາງຂອງສູນຕົ້ນທຶນ
@@ -3415,12 +3447,12 @@
 DocType: Job Card,WIP Warehouse,WIP Warehouse
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ລະຫັດຜູ້ໃຊ້ບໍ່ຖືກກໍານົດສໍາລັບພະນັກງານ {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","ທີ່ມີ qty ແມ່ນ {0}, ທ່ານຕ້ອງການ {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,User {0} ສ້າງ
 DocType: Stock Settings,Item Naming By,Item Naming By
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,ຄໍາສັ່ງ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ນີ້ແມ່ນກຸ່ມລູກຮາກແລະບໍ່ສາມາດແກ້ໄຂໄດ້.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,ການຮ້ອງຂໍວັດສະດຸ {0} ຖືກຍົກເລີກຫຼືຢຸດເຊົາ
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,ໂດຍອີງໃສ່ຢ່າງເຂັ້ມງວດກ່ຽວກັບປະເພດໃບປະກາດໃນການກວດສອບພະນັກງານ
 DocType: Purchase Order Item Supplied,Supplied Qty,ຈໍານວນທີ່ຈໍາຫນ່າຍ
 DocType: Cash Flow Mapper,Cash Flow Mapper,Cash Flow Mapper
 DocType: Soil Texture,Sand,ຊາຍ
@@ -3479,6 +3511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,ຄັດລອກກຸ່ມລາຍການທີ່ພົບຢູ່ໃນຕາຕະລາງກຸ່ມລາຍການ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,ເງິນເດືອນປະຈໍາປີ
 DocType: Supplier Scorecard,Weighting Function,Functional Weighting
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,ຂໍ້ຜິດພາດໃນການປະເມີນສູດຂໍ້ກໍານົດ
 ,Lab Test Report,Lab Report Test
 DocType: BOM,With Operations,ມີການດໍາເນີນງານ
@@ -3492,6 +3525,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,ບໍ່ມີການຊໍາລະເງິນສໍາລັບວາລະສານເຂົ້າ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ແມ່ນນັກຮຽນບໍ່ມີປະສົບການ
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Make Stock Entry
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},ການເອີ້ນຄືນຄະດີ: {0} ບໍ່ສາມາດເປັນພໍ່ແມ່ຫລືເດັກຂອງ {1}
 DocType: Employee Onboarding,Activities,ກິດຈະກໍາ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,ສາງຫນຶ່ງແມ່ນຄ້ໍາປະກັນ
 ,Customer Credit Balance,ຍອດລູກຫນີ້ສິນຄ້າຂອງລູກຄ້າ
@@ -3504,9 +3538,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,ໂປລແກລມຄວາມພັກດີຫຼາຍໆຄົນພົບເຫັນສໍາລັບລູກຄ້າ. Please select manually
 DocType: Patient,Medication,ການໃຊ້ຢາ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,ເລືອກໂຄງການຄວາມພັກດີ
+DocType: Employee Checkin,Attendance Marked,ເຂົ້າຮ່ວມພິທີມອບຫມາຍ
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,ວັດຖຸດິບ
 DocType: Sales Order,Fully Billed,Fully Billed
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},ກະລຸນາຕັ້ງໂຮງແຮມ Rate on {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,ເລືອກເອົາພຽງແຕ່ຄວາມຕ້ອງການເປັນຄວາມສໍາຄັນເທົ່ານັ້ນ.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},ກະລຸນາລະບຸ / ສ້າງບັນຊີ (Ledger) ສໍາລັບປະເພດ - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,ຈໍານວນເງິນເຄດິດ / ເງິນຝາກທະນາຄານທັງຫມົດຄວນຈະມີການເຊື່ອມໂຍງກັນກັບວາລະສານ
 DocType: Purchase Invoice Item,Is Fixed Asset,ແມ່ນຊັບສິນຄົງທີ່
@@ -3527,6 +3563,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,ການຍືນຍັນການແຕ່ງຕັ້ງ
 DocType: Shopping Cart Settings,Orders,ຄໍາສັ່ງ
 DocType: HR Settings,Retirement Age,Age Retirement
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕັ້ງຄ່າຊຸດຈໍານວນສໍາລັບການເຂົ້າຮ່ວມໂດຍຜ່ານ Setup&gt; ເລກລໍາດັບ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,ຄາດຄະເນຈໍານວນ
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},ການຍົກເລີກບໍ່ໄດ້ຮັບອະນຸຍາດສໍາລັບປະເທດ {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},ແຖວ # {0}: ຊັບສິນ {1} ແມ່ນແລ້ວ {2}
@@ -3610,11 +3647,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},ໃບຢັ້ງຢືນການປິດໃບຢັ້ງຢືນ POS ສໍາລັບ {0} ລະຫວ່າງວັນ {1} ແລະ {2}
 apps/erpnext/erpnext/config/help.py,Navigating,ການທ່ອງທ່ຽວ
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,ບໍ່ມີໃບເກັບເງິນທີ່ຍັງເຫຼືອຕ້ອງການການປະເມີນຄືນອັດຕາແລກປ່ຽນ
 DocType: Authorization Rule,Customer / Item Name,ລູກຄ້າ / ຊື່ສິນຄ້າ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ບໍ່ຈໍາເປັນຕ້ອງມີຄັງສິນຄ້າໃຫມ່. ຄັງສິນຄ້າຕ້ອງຖືກກໍານົດໄວ້ໂດຍການເຂົ້າຊື້ສິນຄ້າຫຼືໃບຢັ້ງຢືນການຊື້
 DocType: Issue,Via Customer Portal,ຜ່ານເວັບໄຊທ໌ຂອງລູກຄ້າ
 DocType: Work Order Operation,Planned Start Time,ເວລາເລີ່ມຕົ້ນທີ່ວາງແຜນ
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ແມ່ນ {2}
+DocType: Service Level Priority,Service Level Priority,Service Priority
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນການຫັກເງິນທີ່ຖືກຈອງບໍ່ສາມາດຈະສູງກວ່າຈໍານວນເງິນຫນີ້ທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 DocType: Journal Entry,Accounts Payable,ບັນຊີທີ່ຕ້ອງຈ່າຍ
@@ -3725,7 +3764,6 @@
 DocType: Delivery Note,Delivery To,Delivery To
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bank Data
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,ກໍານົດໄວ້ Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,ຮັກສາເວລາໃບບິນແລະເວລາເຮັດວຽກຄືກັນກັບເວລາ
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,ຕິດຕາມນໍາໂດຍແຫຼ່ງທີ່ມາ.
 DocType: Clinical Procedure,Nursing User,ຜູ້ໃຊ້ພະຍາບານ
 DocType: Support Settings,Response Key List,ບັນຊີລາຍຊື່ສໍາຄັນ
@@ -3893,6 +3931,7 @@
 DocType: Work Order Operation,Actual Start Time,ເວລາເລີ່ມຕົ້ນທີ່ແທ້ຈິງ
 DocType: Antibiotic,Laboratory User,User Laboratory
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Online Auctions
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,ຄວາມສໍາຄັນ {0} ໄດ້ຖືກຊ້ໍາ.
 DocType: Fee Schedule,Fee Creation Status,ສະຖານະການສ້າງຄ່າທໍານຽມ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Softwares
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,ຄໍາສັ່ງສັ່ງຊື້ໄປຊໍາລະເງິນ
@@ -3959,6 +3998,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,ບໍ່ສາມາດດຶງຂໍ້ມູນສໍາລັບ {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ສະກຸນເງິນໃບຢັ້ງຢືນຕ້ອງມີເງີນເທົ່າກັບສະກຸນເງິນສະກຸນເງິນຂອງບໍລິສັດຫຼືຄ່າສະກຸນເງິນຂອງບໍລິສັດ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,ກະລຸນາໃສ່ Id ພະນັກງານຂອງຜູ້ຂາຍນີ້
+DocType: Shift Type,Early Exit Consequence after,ຜົນອອກມາກ່ອນອອກມາກ່ອນ
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,ສ້າງໃບສັ່ງຊື້ຂາຍແລະຊື້ໃບຢັ້ງຢືນການຊື້
 DocType: Disease,Treatment Period,ໄລຍະເວລາການປິ່ນປົວ
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ການຕັ້ງຄ່າອີເມວ
@@ -3976,7 +4016,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,ຊື່ນັກຮຽນ:
 DocType: SMS Log,Sent On,Sent On
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Sales Invoice
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,ເວລາຕອບໂຕ້ບໍ່ສາມາດຈະສູງກວ່າເວລາທີ່ມີຄວາມລະອຽດ
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","ສໍາລັບກຸ່ມນັກຮຽນທີ່ມີຫຼັກສູດຫຼັກສູດ, ຫຼັກສູດຈະຖືກຮັບຮອງສໍາລັບນັກຮຽນທຸກຄົນຈາກຫຼັກສູດການລົງທະບຽນເຂົ້າຮຽນໃນລະບົບ."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,ອຸປະກອນພາຍໃນລັດ
 DocType: Employee,Create User Permission,ສ້າງການອະນຸຍາດໃຫ້ຜູ້ໃຊ້
@@ -4015,6 +4054,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,ເງື່ອນໄຂສັນຍາມາດຕະຖານສໍາລັບການຂາຍຫຼືການຊື້.
 DocType: Sales Invoice,Customer PO Details,ລາຍະລະອຽດຂອງລູກຄ້າ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ບໍ່ພົບຄົນເຈັບ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,ເລືອກຄວາມສໍາຄັນ Default.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,ລົບລາຍະການຖ້າຫາກວ່າຄ່າບໍລິການບໍ່ສາມາດນໍາໃຊ້ກັບລາຍການນັ້ນໄດ້
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ກຸ່ມລູກຄ້າມີຊື່ດຽວກັນກະລຸນາປ່ຽນຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ລູກຄ້າ
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4054,6 +4094,7 @@
 DocType: Support Settings,Support Portal,Support Portal
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,ວັນທີສຸດທ້າຍຂອງວຽກ <b>{0}</b> ບໍ່ສາມາດນ້ອຍກວ່າ <b>{1}</b> ວັນເລີ່ມຕົ້ນທີ່ຄາດໄວ້ <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},ພະນັກງານ {0} ແມ່ນຢູ່ໃນວັນພັກສຸດ {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},ສັນຍາລະດັບການບໍລິການນີ້ແມ່ນສະເພາະກັບລູກຄ້າ {0}
 DocType: Employee,Held On,Held On
 DocType: Healthcare Practitioner,Practitioner Schedules,ປະຕິບັດຕາຕະລາງປະຕິບັດ
 DocType: Project Template Task,Begin On (Days),ເລີ່ມຕົ້ນ (ວັນ)
@@ -4061,6 +4102,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},ຄໍາສັ່ງເຮັດວຽກແມ່ນ {0}
 DocType: Inpatient Record,Admission Schedule Date,ວັນທີ Admission Schedule
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,ການປັບຄ່າມູນຄ່າຊັບສິນ
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Mark attendance ອີງໃສ່ &#39;Employee Checkin&#39; ສໍາລັບພະນັກງານທີ່ໄດ້ຮັບມອບຫມາຍໃນການປ່ຽນແປງນີ້.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,ອຸປະກອນທີ່ເຮັດໃຫ້ຜູ້ທີ່ບໍ່ໄດ້ຈົດທະບຽນ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,All Jobs
 DocType: Appointment Type,Appointment Type,ປະເພດການນັດຫມາຍ
@@ -4174,7 +4216,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ນ້ໍາຫນັກລວມຂອງແພກເກດ. ປົກກະຕິນ້ໍາຫນັກສຸດທິ + ນ້ໍາຫນັກອຸປະກອນການຫຸ້ມຫໍ່ (ສໍາລັບການພິມ)
 DocType: Plant Analysis,Laboratory Testing Datetime,ທົດລອງທົດລອງທົດລອງໄລຍະເວລາ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Item {0} ບໍ່ສາມາດມີ Batch
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Sales Pipeline by Stage
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Student Group Strength
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Bank Statement Transaction Entry
 DocType: Purchase Order,Get Items from Open Material Requests,ໄດ້ຮັບລາຍການຈາກຄໍາຮ້ອງຂໍວັດຖຸທີ່ເປີດ
@@ -4256,7 +4297,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,ສະແດງອາຍຸເກົ່າແກ່ - ຄັງສິນຄ້າ
 DocType: Sales Invoice,Write Off Outstanding Amount,ຂຽນຈໍານວນເງິນທີ່ຍັງຄ້າງຄາ
 DocType: Payroll Entry,Employee Details,ລາຍລະອຽດຂອງພະນັກງານ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,ເວລາເລີ່ມຕົ້ນບໍ່ສາມາດໃຫຍ່ກວ່າເວລາທີ່ສິ້ນສຸດສໍາລັບ {0}.
 DocType: Pricing Rule,Discount Amount,ສ່ວນລົດ
 DocType: Healthcare Service Unit Type,Item Details,ລາຍະລະອຽດຂອງສິນຄ້າ
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},ໃບລາຍງານພາສີຂອງຄູ່ສໍາລັບ {0} ສໍາລັບໄລຍະເວລາ {1}
@@ -4309,7 +4349,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,ເງິນສົດສຸດທິບໍ່ສາມາດລົບໄດ້
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,No of Interactions
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Row {0} # Item {1} ບໍ່ສາມາດຖືກຍົກຍ້າຍຫຼາຍກວ່າ {2} ຕໍ່ຄໍາສັ່ງຊື້ {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,ຕາຕະລາງການປຸງແຕ່ງຂອງບັນຊີແລະພາກສ່ວນຕ່າງໆ
 DocType: Stock Settings,Convert Item Description to Clean HTML,ແປງລາຍລະອຽດຂອງລາຍການເພື່ອຄວາມສະອາດ HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,ກຸ່ມຜູ້ສະຫນອງທັງຫມົດ
@@ -4380,6 +4420,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,ຫນ່ວຍບໍລິການຂອງພໍ່ແມ່
 DocType: Sales Invoice,Include Payment (POS),ລວມການຊໍາລະເງິນ (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Private Equity
+DocType: Shift Type,First Check-in and Last Check-out,ເຊັກອິນຄັ້ງທໍາອິດແລະເຊັກເອົາຄັ້ງສຸດທ້າຍ
 DocType: Landed Cost Item,Receipt Document,ເອກະສານໃບຮັບເງິນ
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,ໄລຍະເວລາຂອງການທົດສອບຜູ້ຜະລິດ
 DocType: Employee Grade,Default Salary Structure,Default Structure ເງິນເດືອນ
@@ -4462,6 +4503,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,ສ້າງການສັ່ງຊື້
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,ກໍານົດງົບປະມານສໍາລັບປີການເງິນ.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດເປົ່າຫວ່າງ.
+DocType: Employee Checkin,Entry Grace Period Consequence,Entry Grace Period Consequence
 ,Payment Period Based On Invoice Date,ໄລຍະເວລາການຈ່າຍເງິນອີງໃສ່ວັນທີໃບຢັ້ງຢືນ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},ວັນທີຕິດຕັ້ງບໍ່ສາມາດເປັນວັນສົ່ງມອບສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,ການເຊື່ອມຕໍ່ຫາຄໍາຮ້ອງຂໍວັດຖຸ
@@ -4470,6 +4512,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},ແຖວ {0}: ມີລາຍະການ Reorder ແລ້ວສໍາລັບສາງນີ້ {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Date
 DocType: Monthly Distribution,Distribution Name,ຊື່ການແຜ່ກະຈາຍ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,ວັນເຮັດວຽກ {0} ໄດ້ຖືກຊ້ໍາ.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,ປັບປຸງໃນຄວາມຄືບຫນ້າ. ມັນອາດຈະໃຊ້ເວລາໃນຂະນະທີ່.
 DocType: Item,"Example: ABCD.#####
@@ -4482,6 +4525,7 @@
 DocType: Vehicle Log,Fuel Qty,Fuel Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobile No
 DocType: Invoice Discounting,Disbursed,ເງິນກູ້ຢືມ
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,ເວລາຫຼັງຈາກສິ້ນສຸດການປ່ຽນແປງໃນເວລາທີ່ການກວດສອບໄດ້ຖືກພິຈາລະນາສໍາລັບການເຂົ້າຮ່ວມ.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,ການປ່ຽນແປງຂອງບັນຊີທີ່ຕ້ອງຈ່າຍ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,ບໍ່ສາມາດໃຊ້ໄດ້
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,ສ່ວນທີ່ໃຊ້ເວລາ
@@ -4495,7 +4539,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,ສະແດງ PDC ໃນການພິມ
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Supplier
 DocType: POS Profile User,POS Profile User,POS User Profile
-DocType: Student,Middle Name,ຊື່ກາງ
 DocType: Sales Person,Sales Person Name,ຊື່ຜູ້ຂາຍ
 DocType: Packing Slip,Gross Weight,ນ້ໍາຫນັກລວມ
 DocType: Journal Entry,Bill No,Bill No
@@ -4504,7 +4547,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,ຂໍ້ຕົກລົງໃນລະດັບການບໍລິການ
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,ກະລຸນາເລືອກພະນັກງານແລະວັນທີທໍາອິດ
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,ອັດຕາການປະເມີນມູນຄ່າແມ່ນຖືກຄິດໄລ່ຄືນໃຫມ່ໃນການພິຈາລະນາມູນຄ່າການລົງທຶນຂອງລູກຄ້າ
 DocType: Timesheet,Employee Detail,ລາຍລະອຽດພະນັກງານ
 DocType: Tally Migration,Vouchers,ວີດີໂອ
@@ -4539,7 +4581,7 @@
 DocType: Additional Salary,Date on which this component is applied,ວັນທີທີ່ອົງປະກອບນີ້ຖືກນໍາໃຊ້
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,ລາຍຊື່ຜູ້ຖືຫຸ້ນທີ່ມີຈໍານວນຜູ້ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,ບັນຊີ Setup Gateway.
-DocType: Service Level,Response Time Period,ໄລຍະເວລາຕອບໂຕ້
+DocType: Service Level Priority,Response Time Period,ໄລຍະເວລາຕອບໂຕ້
 DocType: Purchase Invoice,Purchase Taxes and Charges,ຊື້ຄ່າພາສີແລະຄ່າບໍລິການ
 DocType: Course Activity,Activity Date,ວັນທີກິດຈະກໍາ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,ເລືອກຫຼືເພີ່ມລູກຄ້າໃຫມ່
@@ -4564,6 +4606,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,ປີການເງິນ
 DocType: Sales Invoice Item,Deferred Revenue,ລາຍໄດ້ທີ່ຄ້າງຊໍາລະ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,ຕ້ອງໄດ້ຮັບການຄັດເລືອກຢ່າງຫນ້ອຍຫນຶ່ງຂອງການຂາຍຫຼືການຊື້
+DocType: Shift Type,Working Hours Threshold for Half Day,ເວລາເຮັດວຽກຊົ່ວໂມງສໍາລັບເຄິ່ງມື້
 ,Item-wise Purchase History,ປະຫວັດການຊື້ສິນຄ້າແບບສະຫລາດ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},ບໍ່ສາມາດປ່ຽນວັນຢຸດການບໍລິການສໍາລັບລາຍການໃນແຖວ {0}
 DocType: Production Plan,Include Subcontracted Items,ລວມເອົາລາຍການທີ່ຕິດຕໍ່ພາຍໃຕ້ເງື່ອນໄຂ
@@ -4596,6 +4639,7 @@
 DocType: BOM,Allow Same Item Multiple Times,ອະນຸຍາດໃຫ້ເອກະສານດຽວກັນຫຼາຍຄັ້ງ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,ສ້າງລະຫັດຜ່ານ
 DocType: Healthcare Practitioner,Charges,ຄ່າບໍລິການ
+DocType: Employee,Attendance and Leave Details,ລາຍະລະອຽດການເຂົ້າຮ່ວມແລະການອອກກໍາລັງກາຍ
 DocType: Student,Personal Details,ຂໍ້ມູນສ່ວນຕົວ
 DocType: Sales Order,Billing and Delivery Status,ສະຖານະການໂອນເງິນແລະການຈັດສົ່ງ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,ແຖວ {0}: ສໍາລັບຜູ້ສະຫນອງ {0} ທີ່ຢູ່ອີເມວແມ່ນຕ້ອງການສົ່ງອີເມວ
@@ -4647,7 +4691,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},ກະລຸນາໃສ່ມູນຄ່າ betweeen {0} ແລະ {1}
 DocType: Purchase Order,Order Confirmation Date,ວັນທີທີ່ຢືນຢັນການສັ່ງຊື້
 DocType: Delivery Trip,Calculate Estimated Arrival Times,ຄິດໄລ່ເວລາມາຮອດປະມານ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຂອງພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; HR Settings
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ສາມາດໃຊ້ໄດ້
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,ວັນທີເລີ່ມຕົ້ນສະມາຊິກ
@@ -4670,7 +4713,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Journal Entry Account
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variant
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forum Activity
-DocType: Service Level,Resolution Time Period,Resolution Time Period
+DocType: Service Level Priority,Resolution Time Period,Resolution Time Period
 DocType: Request for Quotation,Supplier Detail,Supplier Detail
 DocType: Project Task,View Task,ເບິ່ງວຽກງານ
 DocType: Serial No,Purchase / Manufacture Details,ລາຍລະອຽດການຊື້ / ຜະລິດຕະພັນ
@@ -4737,6 +4780,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ຄັງສິນຄ້າສາມາດປ່ຽນແປງໄດ້ໂດຍຜ່ານການເຂົ້າຊື້ / ຈັດສົ່ງສິນຄ້າ / ໃບຢັ້ງຢືນການຊື້
 DocType: Support Settings,Close Issue After Days,ປິດບັນຫາຫຼັງຈາກມື້
 DocType: Payment Schedule,Payment Schedule,ຕາຕະລາງການຈ່າຍເງິນ
+DocType: Shift Type,Enable Entry Grace Period,ເປີດໃຊ້ເວລາເຂົ້າ Grace ໄລຍະເວລາ
 DocType: Patient Relation,Spouse,ຄູ່ສົມລົດ
 DocType: Purchase Invoice,Reason For Putting On Hold,ເຫດຜົນສໍາລັບການວາງໄວ້
 DocType: Item Attribute,Increment,ເພີ່ມຂຶ້ນ
@@ -4876,6 +4920,7 @@
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},ແບບຟອມ C ບໍ່ສາມາດໃຊ້ໄດ້ສໍາລັບໃບເກັບເງິນ: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Invoice Created
+DocType: Shift Type,Early Exit Grace Period,Early Exit Grace Period
 DocType: Patient Encounter,Review Details,ລາຍະລະອຽດການທົບທວນ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,ແຖວ {0}: ຄ່າເວລາຕ້ອງສູງກວ່າສູນ.
 DocType: Account,Account Number,ເລກບັນຊີ
@@ -4887,7 +4932,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","ສາມາດໃຊ້ໄດ້ຖ້າບໍລິສັດແມ່ນ SpA, SApA ຫຼື SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,ເງື່ອນໄຂທີ່ຊ້ໍາກັນພົບເຫັນລະຫວ່າງ:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,ຈ່າຍແລະບໍ່ຈັດສົ່ງ
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,ລະຫັດສິນຄ້າແມ່ນບັງຄັບເພາະວ່າສິນຄ້າບໍ່ໄດ້ຖືກນັບເລກໄວ້ໂດຍອັດຕະໂນມັດ
 DocType: GST HSN Code,HSN Code,HSN Code
 DocType: GSTR 3B Report,September,ເດືອນກັນຍາ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administrative Expenses
@@ -4923,6 +4967,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,ບັນຊີ CWIP
 DocType: SMS Log,Sender Name,Sender Name
 DocType: Pricing Rule,Supplier Group,Supplier Group
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",ຕັ້ງເວລາເລີ່ມຕົ້ນແລະເວລາສິ້ນສຸດສໍາລັບ \ ວັນທີ່ສະຫນັບສະຫນູນ {0} ທີ່ດັດສະນີ {1}.
 DocType: Employee,Date of Issue,Date of Issue
 ,Requested Items To Be Transferred,ລາຍການທີ່ຕ້ອງການຈະຖືກໂອນ
 DocType: Employee,Contract End Date,ວັນສິ້ນສຸດຂອງສັນຍາ
@@ -4933,6 +4979,7 @@
 DocType: Opportunity,Sales Stage,Sales Stage
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ໃນຄໍາສັບຕ່າງໆຈະຖືກເບິ່ງເຫັນເມື່ອທ່ານປະຢັດຄໍາສັ່ງຂາຍ.
 DocType: Item Reorder,Re-order Level,Re-order Level
+DocType: Shift Type,Enable Auto Attendance,ເປີດຕົວອັດຕະໂນມັດ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Preference
 ,Department Analytics,Department Analytics
 DocType: Crop,Scientific Name,ຊື່ວິທະຍາສາດ
@@ -4945,6 +4992,7 @@
 DocType: Quiz Activity,Quiz Activity,Quiz Activity
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} ບໍ່ຢູ່ໃນໄລຍະເວລາຊໍາລະເງິນທີ່ຖືກຕ້ອງ
 DocType: Timesheet,Billed,Billed
+apps/erpnext/erpnext/config/support.py,Issue Type.,ປະເພດບັນຫາ.
 DocType: Restaurant Order Entry,Last Sales Invoice,ໃບຄໍາສັ່ງຊື້ຂາຍສຸດທ້າຍ
 DocType: Payment Terms Template,Payment Terms,ເງື່ອນໄຂການຊໍາລະເງິນ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","ຈໍານວນທີ່ຖືກເກັບໄວ້: ຈໍານວນສັ່ງຊື້ຂາຍ, ແຕ່ບໍ່ຖືກສົ່ງ."
@@ -5040,6 +5088,7 @@
 DocType: Account,Asset,ຊັບສິນ
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} ບໍ່ມີແຜນການປະຕິບັດດ້ານສຸຂະພາບ. ຕື່ມມັນໃນແມ່ບົດດ້ານການດູແລສຸຂະພາບ
 DocType: Vehicle,Chassis No,Chassis No
+DocType: Employee,Default Shift,Default Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Company Abbreviation
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,ຕົ້ນໄມ້ຂອງບັນຊີວັດສະດຸ
 DocType: Article,LMS User,ຜູ້ໃຊ້ LMS
@@ -5088,6 +5137,7 @@
 DocType: Sales Person,Parent Sales Person,ພໍ່ຄ້າຂາຍພໍ່ແມ່
 DocType: Student Group Creation Tool,Get Courses,Get Courses
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ແຖວ # {0}: ຈໍານວນຕ້ອງເປັນ 1, ຍ້ອນວ່າລາຍະການເປັນຊັບສິນຄົງທີ່. ກະລຸນາໃຊ້ແຖວແຍກຕ່າງຫາກສໍາລັບຫຼາຍ qty."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),ເວລາເຮັດວຽກຂ້າງລຸ່ມນີ້ທີ່ຖືກຍົກເລີກ. (ສູນທີ່ຈະປິດການໃຊ້ງານ)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ມີພຽງໃບອະນຸຍາດໃບອະນຸຍາດໃນການເຮັດທຸລະກໍາ
 DocType: Grant Application,Organization,ອົງການຈັດຕັ້ງ
 DocType: Fee Category,Fee Category,ຫມວດຄ່າທໍານຽມ
@@ -5100,6 +5150,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,ໂປດອັບເດດສະຖານະຂອງທ່ານສໍາລັບເຫດການຝຶກອົບຮົມນີ້
 DocType: Volunteer,Morning,ເຊົ້າ
 DocType: Quotation Item,Quotation Item,Item Quotation
+apps/erpnext/erpnext/config/support.py,Issue Priority.,ລໍາດັບຄວາມສໍາຄັນ.
 DocType: Journal Entry,Credit Card Entry,Credit Card Entry
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","ທີ່ໃຊ້ເວລາ slot skiped, slot {0} ກັບ {1} ຂື້ນ exiting slot {2} ກັບ {3}"
 DocType: Journal Entry Account,If Income or Expense,ຖ້າລາຍໄດ້ຫລືຄ່າໃຊ້ຈ່າຍ
@@ -5150,11 +5201,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,ການນໍາເຂົ້າຂໍ້ມູນແລະການຕັ້ງຄ່າ
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","ຖ້າ Auto Opt In ຖືກກວດກາ, ຫຼັງຈາກນັ້ນລູກຄ້າຈະຖືກເຊື່ອມຕໍ່ໂດຍອັດຕະໂນມັດກັບໂຄງການຄວາມພັກດີທີ່ກ່ຽວຂ້ອງ (ໃນການບັນທຶກ)"
 DocType: Account,Expense Account,ບັນຊີລາຍຈ່າຍ
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,ເວລາກ່ອນທີ່ຈະປ່ຽນເວລາປ່ຽນເວລາໃນເວລາທີ່ລູກຈ້າງເຂົ້າເບິ່ງຖືກພິຈາລະນາເຂົ້າຮຽນ.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ການພົວພັນກັບ Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,ສ້າງໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},ຕ້ອງການການຊໍາລະເງິນແລ້ວ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',ພະນັກງານຜ່ອນຜັນກ່ຽວກັບ {0} ຕ້ອງຖືກຕັ້ງເປັນ &#39;Left&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},ຈ່າຍ {0} {1}
+DocType: Company,Sales Settings,Sales Settings
 DocType: Sales Order Item,Produced Quantity,ຜະລິດຈໍານວນ
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,ສາມາດເຂົ້າຫາຄໍາຮ້ອງຂໍສໍາລັບຄໍາສັ່ງໄດ້ໂດຍການຄລິກໃສ່ການເຊື່ອມຕໍ່ຕໍ່ໄປນີ້
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name of the Monthly Distribution
@@ -5233,6 +5286,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,ແມ່ແບບພາສີມາດຕະຖານສໍາລັບການຂາຍແລະການຊື້ໄດ້ຖືກສ້າງຂຶ້ນ.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ອອກຈາກປະເພດ {0} ບໍ່ສາມາດສົ່ງຕໍ່ໄດ້
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,ບັນຊີຫນີ້ສິນຕ້ອງເປັນບັນຊີຮັບຫນີ້
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,ວັນທີສິ້ນສຸດຂອງສັນຍາບໍ່ສາມາດນ້ອຍກວ່າມື້ນີ້.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},ກະລຸນາຕັ້ງຄ່າ Account in Warehouse {0} ຫຼື Account Inventory Default ໃນບໍລິສັດ {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,ກໍານົດເປັນຄ່າເລີ່ມຕົ້ນ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ນ້ໍາຫນັກສຸດທິຂອງຊຸດນີ້. (ຄິດໄລ່ໂດຍອັດຕະໂນມັດເປັນຜົນລວມຂອງນ້ໍາຫນັກສຸດທິຂອງລາຍການ)
@@ -5259,8 +5313,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,ແບດເຕີລີ່ທີ່ຫມົດອາຍຸ
 DocType: Shipping Rule,Shipping Rule Type,Shipping Rule Type
 DocType: Job Offer,Accepted,ຍອມຮັບ
-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","ກະລຸນາລົບ Employee <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,ທ່ານໄດ້ປະເມີນຜົນສໍາລັບເງື່ອນໄຂການປະເມີນຜົນ {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,ເລືອກຈໍານວນຜະລິດຕະພັນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),ອາຍຸ (ວັນ)
@@ -5287,6 +5339,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,ເລືອກໂດເມນຂອງທ່ານ
 DocType: Agriculture Task,Task Name,ຊື່ວຽກງານ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,ບັນດາຜະລິດຕະພັນທີ່ໄດ້ສ້າງແລ້ວສໍາລັບຄໍາສັ່ງເຮັດວຽກ
+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","ກະລຸນາລົບ Employee <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 ,Amount to Deliver,Amount to Deliver
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,ບໍລິສັດ {0} ບໍ່ມີຢູ່
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ບໍ່ມີການສະເຫນີຂໍ້ມູນວັດຖຸທີ່ຍັງຄ້າງຢູ່ເພື່ອເຊື່ອມຕໍ່ສໍາລັບລາຍການທີ່ກໍານົດໄວ້.
@@ -5336,6 +5390,7 @@
 DocType: Lab Prescription,Test Code,Test Code
 DocType: Purchase Taxes and Charges,On Previous Row Total,ໃນແຖວກ່ອນຫນ້າທັງຫມົດ
 DocType: Student,Student Email Address,ທີ່ຢູ່ອີເມວນັກຮຽນ
+,Delayed Item Report,ລາຍງານຂໍ້ມູນທີ່ລ່າຊ້າ
 DocType: Academic Term,Education,ການສຶກສາ
 DocType: Supplier Quotation,Supplier Address,ທີ່ຢູ່ຂອງຜູ້ສະຫນອງ
 DocType: Salary Detail,Do not include in total,ບໍ່ລວມຢູ່ໃນທັງຫມົດ
@@ -5343,7 +5398,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ບໍ່ມີ
 DocType: Purchase Receipt Item,Rejected Quantity,ປະຕິເສດຈໍານວນ
 DocType: Cashier Closing,To TIme,ເພື່ອ TIme
-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: Daily Work Summary Group User,Daily Work Summary Group User,ຜູ້ປະສານງານກຸ່ມປະຈໍາວັນປະຈໍາວັນ
 DocType: Fiscal Year Company,Fiscal Year Company,Fiscal Year Company
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,ລາຍການທາງເລືອກຕ້ອງບໍ່ຄືກັບລະຫັດສິນຄ້າ
@@ -5395,6 +5449,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,ການຊັກຊ້າລະຫວ່າງຈັດສົ່ງຢຸດ
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Stocks Older Than [Days]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Promotional Scheme Product Discount
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,ປະສິດທິພາບບັນຫາມີຢູ່ແລ້ວ
 DocType: Account,Asset Received But Not Billed,ຊັບສິນໄດ້ຮັບແຕ່ບໍ່ຖືກເອີ້ນເກັບເງິນ
 DocType: POS Closing Voucher,Total Collected Amount,ຈໍານວນລວມທີ່ໄດ້ເກັບກໍາ
 DocType: Course,Default Grading Scale,Default Grading Scale
@@ -5437,6 +5492,7 @@
 DocType: Contract,Fulfilment Terms,ເງື່ອນໄຂການປະຕິບັດ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
 DocType: Student Guardian,Mother,ແມ່
+DocType: Issue,Service Level Agreement Fulfilled,ລະດັບການໃຫ້ບໍລິການທີ່ໄດ້ປະຕິບັດ
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,ເອົາພາສີອາກອນສໍາລັບຜົນປະໂຫຍດຂອງພະນັກງານທີ່ບໍ່ໄດ້ຮັບຄວາມເອົາໃຈໃສ່
 DocType: Travel Request,Travel Funding,ເງິນທຶນການເດີນທາງ
 DocType: Shipping Rule,Fixed,ແກ້ໄຂ
@@ -5466,10 +5522,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ບໍ່ພົບລາຍການ.
 DocType: Item Attribute,From Range,From Range
 DocType: Clinical Procedure,Consumables,Consumables
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,&#39;employee_field_value&#39; ແລະ &#39;timestamp&#39; ແມ່ນຕ້ອງການ.
 DocType: Purchase Taxes and Charges,Reference Row #,Reference Row #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},ກະລຸນາຕັ້ງຄ່າສູນຕົ້ນທຶນການຫັກຄ່າສິນຊັບໃນບໍລິສັດ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,ລະດັບ # {0}: ເອກະສານການຈ່າຍເງິນແມ່ນຕ້ອງການເພື່ອໃຫ້ສໍາເລັດການປະຕິບັດງານ
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,ກົດປຸ່ມນີ້ເພື່ອດຶງຂໍ້ມູນສັ່ງຊື້ຂາຍຂອງທ່ານຈາກ Amazon MWS.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),ເວລາເຮັດວຽກຂ້າງລຸ່ມນີ້ເຊິ່ງຫມາຍເຖິງມື້ເຄິ່ງມື້. (ສູນທີ່ຈະປິດການໃຊ້ງານ)
 ,Assessment Plan Status,ສະຖານະພາບແຜນການປະເມີນຜົນ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,ກະລຸນາເລືອກ {0} ກ່ອນ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ສົ່ງຂໍ້ມູນນີ້ເພື່ອສ້າງບັນທຶກພະນັກງານ
@@ -5540,6 +5598,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Set Open
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Toggle Filters
 DocType: Production Plan,Material Request Detail,Material Request Detail
+DocType: Shift Type,Process Attendance After,Process Attendance After
 DocType: Material Request Item,Quantity and Warehouse,ຈໍານວນແລະຄັງສິນຄ້າ
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,ໄປທີ່ໂຄງການ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},ແຖວ # {0}: ການຄັດລອກເຂົ້າໃນເອກະສານອ້າງອີງ {1} {2}
@@ -5597,6 +5656,7 @@
 DocType: Pricing Rule,Party Information,ຂໍ້ມູນຂອງພັກ
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),ເຈົ້າຫນີ້ ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,ເຖິງວັນທີບໍ່ສາມາດມີຫຼາຍກ່ວາວັນທີ່ໄດ້ຮັບການຍົກເວັ້ນຂອງພະນັກງານ
+DocType: Shift Type,Enable Exit Grace Period,ອະນຸຍາດໃຫ້ໄລຍະເວລາການປ່ອຍກໍາໄລອອກ
 DocType: Expense Claim,Employees Email Id,Email Id Employees
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,ປັບປຸງລາຄາຈາກ Shopify ກັບລາຄາລາຍະການ ERPNext ລາຍະການ
 DocType: Healthcare Settings,Default Medical Code Standard,ມາດຕະຖານມາດຕະຖານການແພດ
@@ -5627,7 +5687,6 @@
 DocType: Budget,Applicable on Material Request,ສາມາດໃຊ້ໄດ້ກັບການຮ້ອງຂໍວັດສະດຸ
 DocType: Support Settings,Search APIs,ຊອກຫາ APIs
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,ອັດຕາສ່ວນເກີນມູນຄ່າສໍາລັບຄໍາສັ່ງຂາຍ
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,ຂໍ້ມູນຈໍາເພາະ
 DocType: Purchase Invoice,Supplied Items,ສິນຄ້າທີ່ສະຫນອງ
 DocType: Leave Control Panel,Select Employees,ເລືອກພະນັກງານ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},ເລືອກບັນຊີລາຍຮັບດອກເບ້ຍໃນການກູ້ຢືມເງິນ {0}
@@ -5653,7 +5712,7 @@
 ,Supplier-Wise Sales Analytics,ການວິເຄາະຝ່າຍຂາຍຜູ້ສະຫນອງ - ສະຫລາດ
 DocType: GSTR 3B Report,February,ເດືອນກຸມພາ
 DocType: Appraisal,For Employee,ສໍາລັບພະນັກງານ
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,ວັນຈັດສົ່ງທີ່ແທ້ຈິງ
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,ວັນຈັດສົ່ງທີ່ແທ້ຈິງ
 DocType: Sales Partner,Sales Partner Name,ຊື່ຜູ້ຂາຍຂາຍ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີເລີ່ມຕົ້ນການເສື່ອມລາຄາຖືກລົງເປັນວັນທີ່ຜ່ານມາ
 DocType: GST HSN Code,Regional,ພາກພື້ນ
@@ -5692,6 +5751,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Scorecard Supplier
 DocType: Travel Itinerary,Travel To,ການເດີນທາງໄປ
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Mark Attendance
+DocType: Shift Type,Determine Check-in and Check-out,ກໍານົດເຊັກອິນແລະເຊັກເອົາ
 DocType: POS Closing Voucher,Difference,ຄວາມແຕກຕ່າງ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,ຂະຫນາດນ້ອຍ
 DocType: Work Order Item,Work Order Item,Work Order Item
@@ -5725,6 +5785,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ຢາເສບຕິດ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ຖືກປິດ
 DocType: Patient,Medical History,ປະຫວັດການແພດ
+DocType: Expense Claim,Expense Taxes and Charges,ຄ່າພາສີແລະຄ່າບໍລິການ
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,ຈໍານວນວັນນັບແຕ່ວັນທີໃບແຈ້ງຫນີ້ໄດ້ຖືກຍົກເລີກກ່ອນທີ່ຈະຍົກເລີກການຈອງຫຼືລົງທະບຽນເຄື່ອງຫມາຍທີ່ບໍ່ເສຍຄ່າ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ຫມາຍເຫດການຕິດຕັ້ງ {0} ໄດ້ຖືກສົ່ງແລ້ວ
 DocType: Patient Relation,Family,ຄອບຄົວ
@@ -5757,7 +5818,6 @@
 DocType: Dosage Strength,Strength,ຄວາມເຂັ້ມແຂງ
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} ຫນ່ວຍງານຂອງ {1} ຕ້ອງການໃນ {2} ເພື່ອສໍາເລັດການເຮັດທຸລະກໍານີ້.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush ວັດຖຸດິບຂອງ Subcontract Based On
-DocType: Bank Guarantee,Customer,ລູກຄ້າ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ຖ້າເປີດໃຊ້, ໄລຍະທາງວິຊາການຈະເປັນການບັງຄັບໃນເຄື່ອງມືການເຂົ້າຮຽນຂອງໂຄງການ."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ສໍາລັບກຸ່ມນັກຮຽນຂັ້ນພື້ນຖານ, ລະຫັດນັກຮຽນຈະໄດ້ຮັບການກວດສອບສໍາລັບນັກຮຽນທຸກຄົນຈາກການລົງທະບຽນເຂົ້າຮຽນ."
 DocType: Course,Topics,ຫົວຂໍ້
@@ -5837,6 +5897,7 @@
 DocType: Chapter,Chapter Members,ຫມວດສະມາຊິກ
 DocType: Warranty Claim,Service Address,ທີ່ຢູ່ບໍລິການ
 DocType: Journal Entry,Remark,ຫມາຍເຫດ
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ແຖວ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ໄດ້ສໍາລັບ {4} ໃນສາງ {1} ໃນເວລາຂຽນຂອງການເຂົ້າ ({2} {3})
 DocType: Patient Encounter,Encounter Time,Encounter Time
 DocType: Serial No,Invoice Details,ລາຍະລະອຽດໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","ບັນຊີອື່ນສາມາດເຮັດໄດ້ພາຍໃຕ້ກຸ່ມ, ແຕ່ສາມາດບັນທຶກຂໍ້ມູນຕໍ່ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ"
@@ -5916,6 +5977,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),ປິດ (ເປີດ + ລວມ)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Criteria Formula
 apps/erpnext/erpnext/config/support.py,Support Analytics,ສະຫນັບສະຫນູນການວິເຄາະ
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID ອຸປະກອນການເຂົ້າຮ່ວມ (Identity ID Biometric / RF)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,ການທົບທວນແລະການປະຕິບັດ
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ຖ້າບັນຊີຖືກແຊກແຊງ, ລາຍການຈະຖືກອະນຸຍາດໃຫ້ຜູ້ໃຊ້ຖືກຈໍາກັດ."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,ຈໍານວນເງິນຫລັງການຫັກຄ່າ
@@ -5937,6 +5999,7 @@
 DocType: Salary Slip,Loan Repayment,ການຊໍາລະເງິນກູ້
 DocType: Employee Education,Major/Optional Subjects,ຫົວຂໍ້ຕົ້ນຕໍ / ທາງເລືອກ
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,ທີ່ຢູ່ຂອງຜູ້ສະຫນອງແລະລາຍຊື່ຜູ້ຕິດຕໍ່
 DocType: Bank Guarantee,Bank Guarantee Type,Bank Guarantee Type
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","ຖ້າຫາກວ່າປິດການໃຊ້ງານ, ກໍລະນີ &#39;Rounded Total&#39; ຈະບໍ່ສາມາດເຫັນໄດ້ໃນການເຮັດທຸລະກໍາໃດໆ"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5975,6 +6038,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ການເປີດບັນຊີລາຍການເຄື່ອງມືການສ້າງໃບເກັບເງິນ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,ລວມທຸລະກໍາ POS
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},ບໍ່ມີພະນັກງານພົບເຫັນສໍາລັບມູນຄ່າພາກສະຫນາມຂອງພະນັກງານທີ່ໄດ້ຮັບ. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),ຈໍານວນເງິນທີ່ໄດ້ຮັບ (ເງິນສະກຸນຂອງບໍລິສັດ)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage ເຕັມ, ບໍ່ໄດ້ປະຢັດ"
 DocType: Chapter Member,Chapter Member,Chapter Member
@@ -6007,6 +6071,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,ບໍ່ມີກຸ່ມນັກສຶກສາສ້າງ.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},ລວບລວມແຖວ {0} ທີ່ມີ {1} ດຽວ
 DocType: Employee,Salary Details,ລາຍະລະອຽດເງິນເດືອນ
+DocType: Employee Checkin,Exit Grace Period Consequence,Exit Grace Period Consequence
 DocType: Bank Statement Transaction Invoice Item,Invoice,ໃບແຈ້ງຫນີ້
 DocType: Special Test Items,Particulars,Particulars
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,ກະລຸນາຕັ້ງຄ່າຕົວກອງທີ່ອີງໃສ່ Item ຫຼື Warehouse
@@ -6108,6 +6173,7 @@
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","ປະວັດການເຮັດວຽກ, ຄຸນສົມບັດທີ່ຕ້ອງການແລະອື່ນໆ."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Ship To State
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,ທ່ານຕ້ອງການສົ່ງຄໍາຮ້ອງຂໍອຸປະກອນ
 DocType: Opportunity Item,Basic Rate,ອັດຕາພື້ນຖານ
 DocType: Compensatory Leave Request,Work End Date,Work End Date
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Request for Raw Materials
@@ -6292,6 +6358,7 @@
 DocType: Sales Order Item,Gross Profit,Gross Profit
 DocType: Quality Inspection,Item Serial No,Item Serial No
 DocType: Asset,Insurer,ຜູ້ປະກັນໄພ
+DocType: Employee Checkin,OUT,ອອກໄປ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,ຈໍານວນຊື້
 DocType: Asset Maintenance Task,Certificate Required,ໃບຢັ້ງຢືນທີ່ຕ້ອງການ
 DocType: Retention Bonus,Retention Bonus,Bonus Retention
@@ -6407,6 +6474,8 @@
 DocType: Invoice Discounting,Sanctioned,ຖືກລົງໂທດ
 DocType: Course Enrollment,Course Enrollment,Course enrollment
 DocType: Item,Supplier Items,ສິນຄ້າຜູ້ຜະລິດ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",ເວລາເລີ່ມຕົ້ນບໍ່ສາມາດໃຫຍ່ກວ່າຫລືເທົ່າກັບເວລາສິ້ນສຸດສໍາລັບ {0}.
 DocType: Sales Order,Not Applicable,ບໍ່ສາມາດນໍາໃຊ້ໄດ້
 DocType: Support Search Source,Response Options,ຕົວເລືອກການຕອບສະຫນອງ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} ຄວນເປັນຄ່າລະຫວ່າງ 0 ແລະ 100
@@ -6493,7 +6562,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Fixed Assets
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,ລວມລາຍໄດ້
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Share Balance,From No,ຈາກ No
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,ໃບເກັບເງິນການຄືນເງິນການຊໍາລະເງິນ
 DocType: Purchase Invoice,Taxes and Charges Added,ພາສີແລະຄ່າບໍລິການເພີ່ມ
@@ -6601,6 +6669,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignore Rule ລາຄາ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,ອາຫານ
 DocType: Lost Reason Detail,Lost Reason Detail,Lost Reason Detail
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},ຈໍານວນ serial ດັ່ງຕໍ່ໄປນີ້ໄດ້ຖືກສ້າງຂື້ນ: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Customer Feedback
 DocType: Serial No,Warranty / AMC Details,ລາຍະລະອຽດການຮັບປະກັນ / AMC
 DocType: Issue,Opening Time,ເປີດເວລາ
@@ -6650,6 +6719,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,ຊື່ບໍລິສັດບໍ່ຄືກັນ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,ບໍ່ສາມາດສົ່ງສົ່ງເສີມການພະນັກງານກ່ອນວັນສົ່ງເສີມໄດ້
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},ບໍ່ອະນຸຍາດໃຫ້ອັບເດດການເຮັດທຸລະກໍາເກົ່າກວ່າ {0}
+DocType: Employee Checkin,Employee Checkin,Employee Checkin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},ວັນເລີ່ມຕົ້ນຄວນຈະນ້ອຍກວ່າວັນທີສຸດທ້າຍສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ສ້າງວົງຢືມຂອງລູກຄ້າ
 DocType: Buying Settings,Buying Settings,ຊື້ການຕັ້ງຄ່າ
@@ -6671,6 +6741,7 @@
 DocType: Patient,Patient Demographics,Patient Demographics
 DocType: Share Transfer,To Folio No,To Folio No
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Cash Flow from Operations
+DocType: Employee Checkin,Log Type,ປະເພດລາຍເຊັນ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ຊື້ຂາຍຫຼັກຊັບ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,ບໍ່ມີລາຍການໃດໆມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າ.
 DocType: Asset,Purchase Date,ວັນທີ່ຊື້
@@ -6715,6 +6786,7 @@
 DocType: Vital Signs,Very Hyper,Very Hyper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,ເລືອກລັກສະນະຂອງທຸລະກິດຂອງທ່ານ.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,ກະລຸນາເລືອກເດືອນແລະປີ
+DocType: Service Level,Default Priority,ຄວາມສໍາຄັນເບື້ອງຕົ້ນ
 DocType: Student Log,Student Log,Student Log
 DocType: Shopping Cart Settings,Enable Checkout,Enable Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,ຊັບພະຍາກອນມະນຸດ
@@ -6743,7 +6815,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ເຊື່ອມຕໍ່ Shopify ກັບ ERPNext
 DocType: Homepage Section Card,Subtitle,Subtitle
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 DocType: BOM,Scrap Material Cost(Company Currency),ຕົ້ນທຶນວັດຖຸດິບ (ເງິນບໍລິສັດ)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,ບໍ່ຕ້ອງສົ່ງຄໍາສົ່ງ {0} ໄປ
 DocType: Task,Actual Start Date (via Time Sheet),ວັນທີເລີ່ມຕົ້ນທີ່ແທ້ຈິງ (ຜ່ານເວລາ)
@@ -6799,6 +6870,7 @@
 DocType: Drug Prescription,Dosage,Dosage
 DocType: Cheque Print Template,Starting position from top edge,ຕໍາແຫນ່ງເລີ່ມຕົ້ນຈາກຂອບດ້ານເທິງ
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),ໄລຍະເວລານັດຫມາຍ (ນາທີ)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},ພະນັກງານນີ້ມີບັນທຶກທີ່ມີເວລາດຽວກັນ. {0}
 DocType: Accounting Dimension,Disable,ປິດການໃຊ້ວຽກ
 DocType: Email Digest,Purchase Orders to Receive,ຊື້ຄໍາສັ່ງທີ່ຈະໄດ້ຮັບ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,ໃບສັ່ງຜະລິດບໍ່ສາມາດຍົກຂຶ້ນມາໄດ້ສໍາລັບ:
@@ -6814,7 +6886,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,ການໂອນສິນຄ້າສໍາລັບການເຮັດສັນຍາຍ່ອຍ
 DocType: Job Card,Timing Detail,Timing Detail
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Required On
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},ການນໍາເຂົ້າ {0} ຂອງ {1}
 DocType: Job Offer Term,Job Offer Term,Job Offer Term
 DocType: SMS Center,All Contact,ຕິດຕໍ່ທັງຫມົດ
 DocType: Project Task,Project Task,ໂຄງການໂຄງການ
@@ -6865,7 +6936,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,ລາຍການ {0} ບໍ່ແມ່ນການຕິດຕັ້ງສໍາລັບ Serial Nos
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,ຈາກລັດ
 DocType: Leave Type,Maximum Continuous Days Applicable,ມື້ຕໍ່ເນື່ອງສູງສຸດສາມາດໃຊ້ໄດ້
-apps/erpnext/erpnext/config/support.py,Support Team.,ທີມງານສະຫນັບສະຫນູນ.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,ກະລຸນາໃສ່ຊື່ບໍລິສັດກ່ອນ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,ນໍາເຂົ້າປະສົບຜົນສໍາເລັດ
 DocType: Guardian,Alternate Number,Alternate Number
@@ -6957,6 +7027,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,ແຖວ # {0}: ລາຍການເພີ່ມ
 DocType: Student Admission,Eligibility and Details,ສິດແລະລາຍລະອຽດ
 DocType: Staffing Plan,Staffing Plan Detail,Staffing Plan Detail
+DocType: Shift Type,Late Entry Grace Period,Late Entry Grace Period
 DocType: Email Digest,Annual Income,ລາຍຮັບປະຈໍາປີ
 DocType: Journal Entry,Subscription Section,Section Subscription
 DocType: Salary Slip,Payment Days,ວັນຈ່າຍ
@@ -7007,6 +7078,7 @@
 DocType: Journal Entry Account,Account Balance,ຍອດເງິນຂອງບັນຊີ
 DocType: Asset Maintenance Log,Periodicity,ໄລຍະເວລາ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Medical Record
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,ປະເພດໃບປະກາດແມ່ນຕ້ອງການສໍາລັບການກວດສອບການຕົກລົງໃນການປ່ຽນແປງ: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,ການປະຕິບັດ
 DocType: Item,Valuation Method,Valuation Method
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} ຕໍ່ Sales Invoice {1}
@@ -7091,6 +7163,7 @@
 DocType: Loan Type,Loan Name,ຊື່ການກູ້ຢືມ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,ຕັ້ງຄ່າໂຫມດການຈ່າຍເງິນແບບເດີມ
 DocType: Quality Goal,Revision,ການແກ້ໄຂ
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,ເວລາກ່ອນທີ່ຈະປ່ຽນເວລາປ່ຽນເວລາເຊັກເອົາແມ່ນຖືວ່າເປັນຕົ້ນ (ໃນນາທີ).
 DocType: Healthcare Service Unit,Service Unit Type,Service Unit Type
 DocType: Purchase Invoice,Return Against Purchase Invoice,ກັບຄືນໄປບ່ອນຊື້ໃບເກັບເງິນ
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,ສ້າງຄວາມລັບ
@@ -7246,12 +7319,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,ເຄື່ອງສໍາອາງ
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,ກວດເບິ່ງນີ້ຖ້າທ່ານຕ້ອງການບັງຄັບໃຫ້ຜູ້ໃຊ້ເລືອກຊຸດກ່ອນທີ່ຈະບັນທຶກ. ຈະບໍ່ມີຄ່າເລີ່ມຕົ້ນຖ້າທ່ານກວດສອບນີ້.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ຜູ້ທີ່ມີພາລະບົດບາດນີ້ຖືກອະນຸຍາດໃຫ້ຕັ້ງບັນຊີທີ່ແຊກແຊງແລະສ້າງ / ດັດແກ້ບັນຊີການບັນຊີກັບບັນຊີ frozen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Expense Claim,Total Claimed Amount,ຈໍານວນການຮ້ອງຂໍທັງຫມົດ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາເວລາທີ່ໃຊ້ໃນເວລາ {0} ຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Wrapping up
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,ທ່ານພຽງແຕ່ສາມາດຕໍ່ອາຍຸຖ້າວ່າສະມາຊິກຂອງທ່ານຫມົດອາຍຸພາຍໃນ 30 ວັນ
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},ມູນຄ່າຕ້ອງລະຫວ່າງ {0} ແລະ {1}
 DocType: Quality Feedback,Parameters,Parameters
+DocType: Shift Type,Auto Attendance Settings,Auto Attendance Settings
 ,Sales Partner Transaction Summary,Sales Partner Summary Summary
 DocType: Asset Maintenance,Maintenance Manager Name,Maintenance Manager Name
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,ມັນຈໍາເປັນຕ້ອງໄດ້ຄົ້ນຫາລາຍະລະອຽດຂອງສິນຄ້າ.
@@ -7343,10 +7418,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Validate Applied Rule
 DocType: Job Card Item,Job Card Item,Job Card Item
 DocType: Homepage,Company Tagline for website homepage,Company Tagline for homepage homepage
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,ກໍານົດເວລາຕອບສະຫນອງແລະຄວາມລະອຽດສໍາລັບຄວາມເຫມາະສົມ {0} ທີ່ດັດສະນີ {1}.
 DocType: Company,Round Off Cost Center,ສູນສໍາລັບຈຸດສູນກາງ
 DocType: Supplier Scorecard Criteria,Criteria Weight,Criteria Weight
 DocType: Asset,Depreciation Schedules,ຕາຕະລາງການຫັກຄ່າ
-DocType: Expense Claim Detail,Claim Amount,ຈໍານວນເງິນທີ່ຮ້ອງຂໍ
 DocType: Subscription,Discounts,ລາຄາຜ່ອນຜັນ
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rule ເງື່ອນໄຂ
 DocType: Subscription,Cancelation Date,ວັນທີຍົກເລີກ
@@ -7374,7 +7449,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,ສະແດງຄ່າສູນ
 DocType: Employee Onboarding,Employee Onboarding,Employee Onboarding
 DocType: POS Closing Voucher,Period End Date,ວັນສິ້ນສຸດໄລຍະເວລາ
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,ໂອກາດການຂາຍໂດຍແຫຼ່ງຂໍ້ມູນ
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,ຜູ້ອອກໃບອະນຸຍາດທໍາອິດໃນບັນຊີຈະໄດ້ຮັບການກໍານົດໄວ້ເປັນຜູ້ໃຫ້ໃບອະນຸຍາດໄວ້ໃນຕອນຕົ້ນ.
 DocType: POS Settings,POS Settings,POS Settings
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,ບັນຊີທັງຫມົດ
@@ -7395,7 +7469,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,ລະດັບ # {0}: ອັດຕາຕ້ອງຄືກັບ {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR -YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Health Care Service Items
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,ບໍ່ພົບບັນທຶກ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Aging Range 3
 DocType: Vital Signs,Blood Pressure,ຄວາມດັນເລືອດ
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,ເປົ້າຫມາຍສຸດ
@@ -7442,6 +7515,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Batches
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,ປ້ອງກັນ
 DocType: Item,Has Batch No,Has Batch No
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,ວັນທີລ່າຊ້າ
 DocType: Lead,Person Name,ຊື່ບຸກຄົນ
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Training Event Employee,Invited,ເຊີນ
@@ -7463,7 +7537,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","ວັນທີເລີ່ມຕົ້ນແລະສິ້ນສຸດບໍ່ໄດ້ຢູ່ໃນໄລຍະເວລາຊໍາລະເງິນທີ່ຖືກຕ້ອງ, ບໍ່ສາມາດຄິດໄລ່ {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,ສະແດງໃຫ້ເຫັນລູກຄ້າຂອງກຸ່ມລູກຄ້າເຫຼົ່ານີ້ເທົ່ານັ້ນ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,ເລືອກລາຍການເພື່ອບັນທຶກໃບເກັບເງິນ
-DocType: Service Level,Resolution Time,Resolution Time
+DocType: Service Level Priority,Resolution Time,Resolution Time
 DocType: Grading Scale Interval,Grade Description,ລາຍລະອຽດຂອງຊັ້ນ
 DocType: Homepage Section,Cards,ບັດ
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Quality Meeting Minutes
@@ -7490,6 +7564,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,ຍອດເງິນງົບປະມານຂອງທະນາຄານຕາມລາຍຊື່ຜູ້ນໍາທົ່ວໄປ
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),ສຸຂະພາບ (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,ຄັງສິນຄ້າມາດຕະຖານເພື່ອສ້າງຄໍາສັ່ງຊື້ຂາຍແລະຫມາຍສົ່ງສິນຄ້າ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,ເວລາຕອບສະຫນອງສໍາລັບ {0} ຢູ່ດັດຊະນີ {1} ບໍ່ສາມາດຈະສູງກວ່າເວລາທີ່ມີຄວາມລະອຽດ.
 DocType: Opportunity,Customer / Lead Name,ຊື່ລູກຄ້າ / ຊື່ຜູ້ນໍາ
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-yYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,ຈໍານວນເງິນທີ່ບໍ່ໄດ້ຮັບການເອີ້ນ
@@ -7536,7 +7611,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,ການນໍາເຂົ້າພາກສ່ວນແລະທີ່ຢູ່ອາໄສ
 DocType: Item,List this Item in multiple groups on the website.,ລາຍຊື່ລາຍການນີ້ຢູ່ໃນຫລາຍກຸ່ມຢູ່ໃນເວັບໄຊທ໌.
 DocType: Request for Quotation,Message for Supplier,ຂໍ້ຄວາມສໍາລັບຜູ້ຜະລິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,ບໍ່ສາມາດປ່ຽນແປງ {0} ເປັນການຊື້ຂາຍຫຼັກຊັບສໍາລັບລາຍການ {1}.
 DocType: Healthcare Practitioner,Phone (R),ໂທລະສັບ (R)
 DocType: Maintenance Team Member,Team Member,ທີມງານສະມາຊິກ
 DocType: Asset Category Account,Asset Category Account,Asset Category Account
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 63422b2..7e631f1 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Paskyrimas {0} ir pardavimo sąskaita {1} atšauktos
 DocType: Purchase Receipt,Vehicle Number,Transporto priemonės numeris
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Jūsų elektroninio pašto adresas...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Įtraukti numatytuosius knygų įrašus
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Įtraukti numatytuosius knygų įrašus
 DocType: Activity Cost,Activity Type,Veiklos tipas
 DocType: Purchase Invoice,Get Advances Paid,Gauti išankstinius mokėjimus
 DocType: Company,Gain/Loss Account on Asset Disposal,Pelno (nuostolio) ataskaita dėl turto disponavimo
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Mokėjimo įrašai
 DocType: Employee Education,Class / Percentage,Klasė / procentinė dalis
 ,Electronic Invoice Register,Elektroninių sąskaitų faktūrų registras
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Įvykių skaičius, po kurio įvykdoma pasekmė."
 DocType: Sales Invoice,Is Return (Credit Note),Ar grąža (kredito pastaba)
+DocType: Price List,Price Not UOM Dependent,Kaina nėra UOM priklausoma
 DocType: Lab Test Sample,Lab Test Sample,Laboratorinio tyrimo pavyzdys
 DocType: Shopify Settings,status html,būsena html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Pavyzdžiui, 2012, 2012-13"
@@ -325,6 +327,7 @@
 DocType: Salary Slip,Net Pay,Grynasis darbo užmokestis
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Iš viso sąskaitoje faktūroje nurodyta suma
 DocType: Clinical Procedure,Consumables Invoice Separately,Eksploatacinių medžiagų sąskaita faktūra atskirai
+DocType: Shift Type,Working Hours Threshold for Absent,Nėra darbo valandų ribos
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Biudžetas negali būti priskirtas prie grupės paskyros {0}
 DocType: Purchase Receipt Item,Rate and Amount,Kursas ir suma
@@ -377,7 +380,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Iš paciento nustatymų
 DocType: Asset,Insurance End Date,Draudimo pabaigos data
 DocType: Bank Account,Branch Code,Filialo kodas
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Laikas reaguoti
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Vartotojo forumas
 DocType: Landed Cost Item,Landed Cost Item,Išvesties kaina
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Pardavėjas ir pirkėjas negali būti vienodi
@@ -595,6 +597,7 @@
 DocType: Share Transfer,Transfer,Perkėlimas
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Paieškos elementas (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Rezultatai pateikiami
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Nuo datos negali būti daugiau nei iki šiol
 DocType: Supplier,Supplier of Goods or Services.,Prekių ar paslaugų teikėjas.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Naujos paskyros pavadinimas. Pastaba: nesukurkite klientų ir tiekėjų paskyrų
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentų grupė arba kursų tvarkaraštis yra privalomas
@@ -879,7 +882,6 @@
 DocType: Skill,Skill Name,Įgūdžių pavadinimas
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Spausdinti ataskaitos kortelę
 DocType: Soil Texture,Ternary Plot,Trivietis sklypas
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatykite {0} pavadinimo seriją naudodami sąrankos nustatymus&gt; Nustatymai&gt; Pavadinimo serija
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Palaikymo bilietai
 DocType: Asset Category Account,Fixed Asset Account,Fiksuoto turto sąskaita
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Naujausi
@@ -892,6 +894,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Privalomas balansui
 DocType: Payment Entry,Total Allocated Amount,Bendra skirta suma
 DocType: Sales Invoice,Get Advances Received,Gaukite gautus avansus
+DocType: Shift Type,Last Sync of Checkin,Paskutinis „Checkin“ sinchronizavimas
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,"Sumos, įtrauktos į vertę, suma"
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -900,7 +903,9 @@
 DocType: Student,Blood Group,Kraujo grupė
 apps/erpnext/erpnext/config/healthcare.py,Masters,Meistrai
 DocType: Crop,Crop Spacing UOM,Apkarpyti tarpą UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Laikas po pamainos pradžios, kai registracija laikoma vėlyvu (minutėmis)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Naršyti
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Nerasta neapmokėtų sąskaitų faktūrų
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} laisvų darbo vietų ir {1} biudžetas {2} jau numatytas {3} dukterinėms įmonėms. Jūs galite planuoti tik iki {4} laisvas darbo vietas ir biudžetą {5} pagal personalo planą {6} patronuojančiai bendrovei {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Produkto nuolaidų plokštės
@@ -1001,6 +1006,7 @@
 DocType: Item,Moving Average,Kintantis vidurkis
 DocType: Employee Attendance Tool,Unmarked Attendance,Nepažymėtas lankymas
 DocType: Homepage Section,Number of Columns,Stulpelių skaičius
+DocType: Issue Priority,Issue Priority,Emisijos prioritetas
 DocType: Holiday List,Add Weekly Holidays,Pridėti savaitės šventes
 DocType: Shopify Log,Shopify Log,„Shopify“ žurnalas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Sukurkite atlyginimo lapelį
@@ -1009,6 +1015,7 @@
 DocType: Warranty Claim,Issue Date,Išdavimo data
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Pasirinkite elementą {0}. Nepavyko rasti vienos partijos, kuri atitinka šį reikalavimą"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Nepavyksta sukurti kairiojo darbuotojo išlaikymo premijos
+DocType: Employee Checkin,Location / Device ID,Vietos / įrenginio ID
 DocType: Purchase Order,To Receive,Gauti
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Esate neprisijungus. Jūs negalėsite įkrauti, kol neturėsite tinklo."
 DocType: Course Activity,Enrollment,Registracija
@@ -1017,7 +1024,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maks.: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informacijos apie e. Sąskaitą faktūros trūksta
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nėra sukurtas materialus prašymas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Elemento kodas&gt; Prekių grupė&gt; Gamintojas
 DocType: Loan,Total Amount Paid,Iš viso sumokėta suma
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Visi šie elementai jau buvo išrašyti sąskaitoje
 DocType: Training Event,Trainer Name,Trenerio vardas
@@ -1128,6 +1134,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Nurodykite pagrindinį pavadinimą lyderyje {0}
 DocType: Employee,You can enter any date manually,Bet kurią datą galite įvesti rankiniu būdu
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Akcijų suderinimo punktas
+DocType: Shift Type,Early Exit Consequence,Ankstyvo išėjimo pasekmė
 DocType: Item Group,General Settings,Bendrieji nustatymai
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Galutinė data negali būti iki paskelbimo / tiekėjo sąskaitos faktūros datos
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Prieš pateikdami nurodykite gavėjo vardą.
@@ -1166,6 +1173,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Mokėjimo patvirtinimas
 ,Available Stock for Packing Items,Galimos pakuotės atsargos
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Pašalinkite šią sąskaitą faktūrą {0} iš „C“ formos {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Kiekvienas galiojantis įsiregistravimas ir išsiregistravimas
 DocType: Support Search Source,Query Route String,Užklausos maršruto eilutė
 DocType: Customer Feedback Template,Customer Feedback Template,Klientų atsiliepimų šablonas
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citatos vadovams arba klientams.
@@ -1200,6 +1208,7 @@
 DocType: Authorization Control,Authorization Control,Autorizacijos kontrolė
 ,Daily Work Summary Replies,Dienos darbo santrauka Atsakymai
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Jus pakvietė bendradarbiauti projekte: {0}
+DocType: Issue,Response By Variance,Atsakymas pagal dispersiją
 DocType: Item,Sales Details,Pardavimo duomenys
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Spausdinimo šablonų raidės.
 DocType: Salary Detail,Tax on additional salary,Mokestis už papildomą atlyginimą
@@ -1323,6 +1332,7 @@
 DocType: Project,Task Progress,Užduočių eiga
 DocType: Journal Entry,Opening Entry,Atidarymo įrašas
 DocType: Bank Guarantee,Charges Incurred,Mokesčiai
+DocType: Shift Type,Working Hours Calculation Based On,Darbo valandų skaičiavimas pagrįstas
 DocType: Work Order,Material Transferred for Manufacturing,Gamybai perduota medžiaga
 DocType: Products Settings,Hide Variants,Slėpti variantus
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Išjungti pajėgumų planavimą ir laiko stebėjimą
@@ -1352,6 +1362,7 @@
 DocType: Guardian,Interests,Pomėgiai
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Vartojamas kiekis
 DocType: Education Settings,Education Manager,Švietimo vadybininkas
+DocType: Employee Checkin,Shift Actual Start,„Shift Actual Start“
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planuokite laiko žurnalus už darbo vietos darbo valandų.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Lojalumo taškai: {0}
 DocType: Healthcare Settings,Registration Message,Registracijos pranešimas
@@ -1376,9 +1387,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Sąskaita jau sukurta visiems atsiskaitymo valandoms
 DocType: Sales Partner,Contact Desc,Susisiekite su Desc
 DocType: Purchase Invoice,Pricing Rules,Kainodaros taisyklės
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi esama operacijų pagal {0} elementą, {1} reikšmės negalite keisti"
 DocType: Hub Tracked Item,Image List,Vaizdų sąrašas
 DocType: Item Variant Settings,Allow Rename Attribute Value,Leisti Pervardyti atributo vertę
-DocType: Price List,Price Not UOM Dependant,Kaina nėra UOM priklausoma
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Laikas (min.)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Pagrindiniai
 DocType: Loan,Interest Income Account,Palūkanų pajamų sąskaita
@@ -1388,6 +1399,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Pasirinkite POS profilį
 DocType: Support Settings,Get Latest Query,Gaukite naujausią užklausą
 DocType: Employee Incentive,Employee Incentive,Darbuotojų paskata
+DocType: Service Level,Priorities,Prioritetai
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Pridėkite kortelių ar pasirinktinių skyrių pagrindiniame puslapyje
 DocType: Homepage,Hero Section Based On,„Hero“ skyrius pagrįstas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Bendra pirkimo kaina (naudojant pirkimo sąskaitą faktūrą)
@@ -1448,7 +1460,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Užsakytas kiekis
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# {0} eilutė: atmestas sandėlis yra privalomas prieš atmestą {1} elementą
 ,Received Items To Be Billed,"Gauti daiktai, kuriuos reikia apmokėti"
-DocType: Salary Slip Timesheet,Working Hours,Darbo valandos
+DocType: Attendance,Working Hours,Darbo valandos
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Mokėjimo būdas
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,"Pirkimo užsakymas Prekių, kurie nebuvo gauti laiku"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Trukmė dienomis
@@ -1568,7 +1580,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Teisinė informacija ir kita bendra informacija apie jūsų tiekėją
 DocType: Item Default,Default Selling Cost Center,Numatytojo pardavimo kainos centras
 DocType: Sales Partner,Address & Contacts,Adresas ir kontaktai
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatyti numeravimo serijas dalyvavimui naudojant sąranką&gt; Numeracijos serija
 DocType: Subscriber,Subscriber,Abonentas
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) yra nepasiekiamas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Pirmiausia pasirinkite paskelbimo datą
@@ -1579,7 +1590,7 @@
 DocType: Detected Disease,Tasks Created,Užduotys sukurtos
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šiam elementui arba jo šablonui
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Komisijos tarifas%
-DocType: Service Level,Response Time,Atsakymo laikas
+DocType: Service Level Priority,Response Time,Atsakymo laikas
 DocType: Woocommerce Settings,Woocommerce Settings,„Woocommerce“ nustatymai
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Kiekis turi būti teigiamas
 DocType: Contract,CRM,CRM
@@ -1596,7 +1607,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Operacijų duomenų atvaizdavimas
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Švinas reikalauja asmens vardo arba organizacijos pavadinimo
 DocType: Student,Guardians,Globėjai
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Švietimo&gt; Švietimo nustatymuose nustatykite instruktoriaus pavadinimo sistemą
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Pasirinkite prekės ženklą ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Vidutinės pajamos
 DocType: Shipping Rule,Calculate Based On,Apskaičiuokite pagrindu
@@ -1633,6 +1643,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Dalyvio įrašas {0} egzistuoja prieš studentą {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Sandorio data
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Atšaukti prenumeratą
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Nepavyko nustatyti paslaugos lygio sutarties {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Grynoji darbo užmokesčio suma
 DocType: Account,Liability,Atsakomybė
 DocType: Employee,Bank A/C No.,Banko A / C Nr.
@@ -1698,7 +1709,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Žaliavinio produkto kodas
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Pirkimo sąskaita-faktūra {0} jau pateikta
 DocType: Fees,Student Email,Studentų el
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} negali būti {2} tėvas ar vaikas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Gaukite elementus iš sveikatos priežiūros paslaugų
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Nėra pateikiamas atsargų įrašas {0}
 DocType: Item Attribute Value,Item Attribute Value,Elemento atributo vertė
@@ -1723,7 +1733,6 @@
 DocType: Production Plan,Select Items to Manufacture,"Pasirinkite elementus, kuriuos norite gaminti"
 DocType: Leave Application,Leave Approver Name,Palikite patvirtinimo pavadinimą
 DocType: Shareholder,Shareholder,Akcininkas
-DocType: Issue,Agreement Status,Susitarimo būsena
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Numatytieji pardavimo sandorių nustatymai.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Prašome pasirinkti Studentų priėmimą, kuris yra privalomas mokamo studento pareiškėjui"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Pasirinkite BOM
@@ -1986,6 +1995,7 @@
 DocType: Account,Income Account,Pajamų sąskaita
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Visi sandėliai
 DocType: Contract,Signee Details,Pareiškėjo duomenys
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Leisti išsiregistruoti po pamainos pabaigos laiko (minutėmis)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Pirkimas
 DocType: Item Group,Check this if you want to show in website,"Patikrinkite, ar norite rodyti svetainėje"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiskaliniai metai {0} nerastas
@@ -2052,6 +2062,7 @@
 DocType: Activity Cost,Billing Rate,Atsiskaitymo norma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Įspėjimas: dar {0} # {1} egzistuoja prieš atsargų įrašą {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,"Jei norite įvertinti ir optimizuoti maršrutus, įgalinkite „Google“ žemėlapių nustatymus"
+DocType: Purchase Invoice Item,Page Break,Puslapio lūžis
 DocType: Supplier Scorecard Criteria,Max Score,Maksimalus balas
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Grąžinimo pradžios data negali būti prieš išmokėjimo datą.
 DocType: Support Search Source,Support Search Source,Pagalbos paieškos šaltinis
@@ -2120,6 +2131,7 @@
 DocType: Employee Transfer,Employee Transfer,Darbuotojų perkėlimas
 ,Sales Funnel,Pardavimų piltuvas
 DocType: Agriculture Analysis Criteria,Water Analysis,Vandens analizė
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Pradėkite registraciją prieš pamainos pradžios laiką (minutėmis)
 DocType: Accounts Settings,Accounts Frozen Upto,Sąskaitos užšaldytos iki
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,"Nėra nieko, ką reikia redaguoti."
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} ilgiau nei bet kuri darbo valandos darbo vietoje {1}, suskirstykite operaciją į kelias operacijas"
@@ -2133,7 +2145,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Pardavimo užsakymas {0} yra {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Mokėjimo vėlavimas (dienos)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Įveskite nusidėvėjimo duomenis
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Kliento PO
 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 po pardavimo užsakymo datos
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Prekių kiekis negali būti lygus nuliui
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Neteisingas atributas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Pasirinkite BOM prieš elementą {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Sąskaitos faktūros tipas
@@ -2143,6 +2157,7 @@
 DocType: Volunteer,Afternoon,Po pietų
 DocType: Vital Signs,Nutrition Values,Mitybos vertės
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Karščiavimas (temp&gt; 38,5 ° C / 101,3 ° F arba ilgalaikis tempas&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymuose
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC atšauktas
 DocType: Project,Collect Progress,Surinkite pažangą
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Energija
@@ -2193,6 +2208,7 @@
 ,Ordered Items To Be Billed,"Užsakyti elementai, kuriuos reikia apmokėti"
 DocType: Taxable Salary Slab,To Amount,Į sumą
 DocType: Purchase Invoice,Is Return (Debit Note),Ar grąža (debeto pastaba)
+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/config/desktop.py,Getting Started,Darbo pradžia
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sujungti
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Neįmanoma pakeisti fiskalinių metų pradžios datos ir fiskalinių metų pabaigos datos, kai fiskaliniai metai yra išsaugoti."
@@ -2210,8 +2226,10 @@
 DocType: Maintenance Schedule Detail,Actual Date,Faktinė data
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,{0} eilutė: kursas yra privalomas
 DocType: Purchase Invoice,Select Supplier Address,Pasirinkite Tiekėjo adresą
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Turimas kiekis yra {0}, jums reikia {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Įveskite API vartotojų paslaptį
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programos registracijos mokestis
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,Garantijos galiojimo data
 DocType: Hotel Room Pricing,Hotel Room Pricing,Viešbučio kambarių kainos
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Išoriniai apmokestinamieji sandoriai (išskyrus nulinį, nulinis ir neapmokestinamas)"
@@ -2271,6 +2289,7 @@
 DocType: Quality Inspection Reading,Reading 5,Skaitymas 5
 DocType: Shopping Cart Settings,Display Settings,Ekrano nustatymai
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Nustatykite nuskaitytų rezervų skaičių
+DocType: Shift Type,Consequence after,Pasekmė po
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Ką jums reikia pagalbos?
 DocType: Journal Entry,Printing Settings,Spausdinimo nustatymai
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Bankininkystė
@@ -2280,6 +2299,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Atsiskaitymo adresas yra toks pat kaip ir siuntimo adresas
 DocType: Account,Cash,Pinigai
 DocType: Employee,Leave Policy,Palikite politiką
+DocType: Shift Type,Consequence,Pasekmė
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Studentų adresas
 DocType: GST Account,CESS Account,CESS sąskaita
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: „Pelno ir nuostolių“ paskyros {2} išlaidų centras reikalingas. Nustatykite bendrovei numatytąjį išlaidų centrą.
@@ -2344,6 +2364,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Termino uždarymo kuponas
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 pavadinimas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Įveskite išlaidų sąskaitą
+DocType: Issue,Resolution By Variance,Rezoliucija pagal dispersiją
 DocType: Employee,Resignation Letter Date,Atsistatydinimo laiško data
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Dalyvavimas data
@@ -2356,6 +2377,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Peržiūrėti dabar
 DocType: Item Price,Valid Upto,Galioja Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Nuoroda Doctype turi būti {0}
+DocType: Employee Checkin,Skip Auto Attendance,Praleisti „Auto“ lankomumą
 DocType: Payment Request,Transaction Currency,Sandorio valiuta
 DocType: Loan,Repayment Schedule,Grąžinimo grafikas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Sukurti mėginio saugojimo atsargų įrašą
@@ -2427,6 +2449,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS uždarymo čekių mokesčiai
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Veiksmas inicijuotas
 DocType: POS Profile,Applicable for Users,Taikoma naudotojams
+,Delayed Order Report,Atidėto užsakymo ataskaita
 DocType: Training Event,Exam,Egzaminas
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Nerasta klaidingų pagrindinių knygų įrašų. Galbūt pasirinkote neteisingą paskyrą operacijoje.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Pardavimų vamzdynas
@@ -2441,10 +2464,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Sąlygos bus taikomos visoms pasirinktoms prekėms.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigūruoti
 DocType: Hotel Room,Capacity,Talpa
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Įdiegtas kiekis
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,{1} partijos {1} partija išjungta.
 DocType: Hotel Room Reservation,Hotel Reservation User,Viešbučio rezervacijos vartotojas
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Darbo diena buvo pakartota du kartus
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Paslaugų lygio sutartis su Entity Type {0} ir Entity {1} jau egzistuoja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},"Elementų grupė, kuri nebuvo nurodyta elemento kapitale {0} elementui"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Pavadinimo klaida: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Teritorija reikalinga POS profilyje
@@ -2492,6 +2516,7 @@
 DocType: Depreciation Schedule,Schedule Date,Tvarkaraščio data
 DocType: Packing Slip,Package Weight Details,Pakuotės svorio duomenys
 DocType: Job Applicant,Job Opening,Darbo atidarymas
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Paskutinis žinomas sėkmingas darbuotojų patikrinimas. Atstatykite tai tik tada, jei esate tikri, kad visi žurnalai yra sinchronizuojami iš visų vietų. Jei nesate tikri, nekeiskite."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Tikroji kaina
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Bendras išankstinis mokėjimas ({0}) prieš užsakymą {1} negali būti didesnis nei „Grand Total“ ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Atnaujinti elemento variantai
@@ -2536,6 +2561,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Gaukite „Invocies“
 DocType: Tally Migration,Is Day Book Data Imported,Ar importuojami dienos knygų duomenys
 ,Sales Partners Commission,Pardavimų partnerių komisija
+DocType: Shift Type,Enable Different Consequence for Early Exit,Įgalinti kitą pasekmę ankstyvam išėjimui
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Teisinis
 DocType: Loan Application,Required by Date,Reikalaujama pagal datą
 DocType: Quiz Result,Quiz Result,Viktorina Rezultatas
@@ -2595,7 +2621,6 @@
 DocType: Pricing Rule,Pricing Rule,Kainodaros taisyklė
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Neprivalomas atostogų sąrašas nenustatytas atostogų laikotarpiui {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Norėdami nustatyti Darbuotojų vaidmenį, darbuotojo įraše nustatykite lauką „Vartotojo ID“"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Laikas išspręsti
 DocType: Training Event,Training Event,Mokymo renginys
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Normalus kraujo spaudimas suaugusiesiems yra maždaug 120 mmHg sistolinis ir 80 mmHg diastolinis, sutrumpintas &quot;120/80 mmHg&quot;."
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Sistema atneš visus įrašus, jei ribinė vertė yra lygi nuliui."
@@ -2639,6 +2664,7 @@
 DocType: Student Applicant,Approved,Patvirtinta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Nuo datos turi būti fiskaliniai metai. Darant prielaidą iš datos = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Pirkimo nustatymuose nustatykite tiekėjų grupę.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} yra netinkama dalyvavimo būsena.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Laikina atidarymo sąskaita
 DocType: Purchase Invoice,Cash/Bank Account,Grynųjų pinigų / banko sąskaita
 DocType: Quality Meeting Table,Quality Meeting Table,Kokybės susitikimų lentelė
@@ -2674,6 +2700,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Maistas, gėrimai ir tabakas"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Modulio tvarkaraštis
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Elementas Išmintinė mokesčių informacija
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Dalyvavimas bus pažymėtas automatiškai tik po šios datos.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,"Prekės, pagamintos UIN laikikliams"
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Prašymas pateikti pasiūlymus
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Negalima keisti valiutos po įrašų panaudojimo kita valiuta
@@ -2943,7 +2970,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Numatytieji mokesčiai ir mokesčiai
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Tai grindžiama sandoriais prieš šį tiekėją. Išsamesnės informacijos ieškokite žemiau
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimali darbuotojo {0} išmokos suma viršija {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Įveskite sutarties pradžios ir pabaigos datą.
 DocType: Delivery Note Item,Against Sales Invoice,Prieš pardavimo sąskaitą
 DocType: Loyalty Point Entry,Purchase Amount,Pirkimo suma
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip prarastas kaip pardavimo užsakymas.
@@ -2967,7 +2993,7 @@
 DocType: Lead,Organization Name,Organizacijos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Galiojantys ir galiojantys laukai yra privalomi kaupiamiesiems
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},# {0} eilutė: partijos Nr. Turi būti toks pat kaip {1} {2}
-DocType: Employee,Leave Details,Palikite išsamią informaciją
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Akcijų sandoriai iki {0} yra užšaldyti
 DocType: Driver,Issuing Date,Išdavimo data
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Prašytojas
@@ -3012,9 +3038,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Pinigų srautų žemėlapių šablono informacija
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Įdarbinimas ir mokymas
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Automatinio lankomumo malonės periodo nustatymai
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Nuo valiutos ir valiutos negali būti vienodi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Farmacija
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Pagalbos valandos
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} atšauktas arba uždarytas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,{0} eilutė: avansas prieš klientą turi būti kreditas
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grupė pagal kuponus (konsoliduota)
@@ -3124,6 +3152,7 @@
 DocType: Territory,Territory Manager,Teritorijos valdytojas
 DocType: Lab Test,Sample ID,Pavyzdžio ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Krepšelis tuščias
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Dalyvavimas buvo pažymėtas kaip darbuotojų registracija
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Turi būti pateiktas {0} turtas
 ,Absent Student Report,Nėra studentų ataskaitos
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Įtrauktas į bendrąjį pelną
@@ -3131,7 +3160,9 @@
 DocType: Travel Request Costing,Funded Amount,Finansuojama suma
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nebuvo pateikta, todėl veiksmas negali būti baigtas"
 DocType: Subscription,Trial Period End Date,Bandomojo laikotarpio pabaigos data
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Pakeitus įrašus kaip IN ir OUT per tą patį pamainą
 DocType: BOM Update Tool,The new BOM after replacement,Naujas BOM po pakeitimo
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,5 punktas
 DocType: Employee,Passport Number,Paso numeris
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Laikinas atidarymas
@@ -3246,6 +3277,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Galimas tiekėjas
 ,Issued Items Against Work Order,Išduoti daiktai prieš darbo tvarką
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Sukurti {0} sąskaitą faktūrą
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Švietimo&gt; Švietimo nustatymuose nustatykite instruktoriaus pavadinimo sistemą
 DocType: Student,Joining Date,Įstojimo data
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Prašoma svetainė
 DocType: Purchase Invoice,Against Expense Account,Prieš išlaidų sąskaitą
@@ -3285,6 +3317,7 @@
 DocType: Landed Cost Item,Applicable Charges,Taikomi mokesčiai
 ,Point of Sale,Pardavimo punktas
 DocType: Authorization Rule,Approving User  (above authorized value),Patvirtinantis vartotojas (virš patvirtintos vertės)
+DocType: Service Level Agreement,Entity,Subjektas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkelta iš {2} į {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Klientas {0} nepriklauso projektui {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Iš partijos pavadinimo
@@ -3331,6 +3364,7 @@
 DocType: Soil Texture,Sand Composition (%),Smėlio sudėtis (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Importuoti dienos knygų duomenis
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nustatykite {0} pavadinimo seriją naudodami sąrankos nustatymus&gt; Nustatymai&gt; Pavadinimo serija
 DocType: Asset,Asset Owner Company,Turto savininko bendrovė
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Išlaidų reikalavimo rezervavimui reikalingas išlaidų centras
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} galiojantis serijos Nr. {1} elementui
@@ -3390,7 +3424,6 @@
 DocType: Asset,Asset Owner,Turto savininkas
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Sandėlis {0} eilutėje {1} yra privalomas
 DocType: Stock Entry,Total Additional Costs,Iš viso papildomų išlaidų
-DocType: Marketplace Settings,Last Sync On,Paskutinis sinchronizavimas
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Mokesčių ir mokesčių lentelėje nustatykite bent vieną eilutę
 DocType: Asset Maintenance Team,Maintenance Team Name,Priežiūros komandos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Išlaidų centrų diagrama
@@ -3406,12 +3439,12 @@
 DocType: Job Card,WIP Warehouse,WIP sandėlis
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ -YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},"Vartotojo ID, nenustatytas darbuotojui {0}"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Galimas kiekis yra {0}, jums reikia {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Naudotojas {0} sukurtas
 DocType: Stock Settings,Item Naming By,Elemento pavadinimas pagal
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Užsakyta
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Tai pagrindinė klientų grupė ir negali būti redaguojama.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materialinė užklausa {0} atšaukiama arba sustabdoma
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Griežtai grindžiamas žurnalo tipu darbuotojo patikrinime
 DocType: Purchase Order Item Supplied,Supplied Qty,Pateikiamas kiekis
 DocType: Cash Flow Mapper,Cash Flow Mapper,Pinigų srautų žemėlapis
 DocType: Soil Texture,Sand,Smėlis
@@ -3470,6 +3503,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Elementų grupės lentelėje pateikiama dublikato elementų grupė
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Metinis atlyginimas
 DocType: Supplier Scorecard,Weighting Function,Svorio funkcija
+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}) elementui: {2} nerastas
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Vertinant kriterijų formulę įvyko klaida
 ,Lab Test Report,Laboratorinių tyrimų ataskaita
 DocType: BOM,With Operations,Su operacijomis
@@ -3483,6 +3517,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,„Journal Entry“ nėra jokių grąžinamų mokėjimų
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} yra neaktyvus studentas
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Padaryti atsargų įrašą
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM recursion: {0} negali būti {1} tėvas ar vaikas
 DocType: Employee Onboarding,Activities,Veikla
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,„Atleast“ vienas sandėlis yra privalomas
 ,Customer Credit Balance,Kliento kreditų likutis
@@ -3495,9 +3530,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Klientui nustatyta kelių lojalumo programa. Pasirinkite rankiniu būdu.
 DocType: Patient,Medication,Vaistas
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Pasirinkite lojalumo programą
+DocType: Employee Checkin,Attendance Marked,Pažymėtas lankymas
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Žaliavos
 DocType: Sales Order,Fully Billed,Pilnai apmokėtas
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Prašome nustatyti viešbučio kambario kainą {}
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Pasirinkite tik vieną prioritetą kaip numatytąjį.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Nurodykite / sukurkite sąskaitą („Ledger“) tipui - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Bendra kredito / debeto suma turėtų būti tokia pati kaip ir susieto žurnalo įrašo
 DocType: Purchase Invoice Item,Is Fixed Asset,Ar fiksuotas turtas
@@ -3518,6 +3555,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Paskyrimo patvirtinimas
 DocType: Shopping Cart Settings,Orders,Užsakymai
 DocType: HR Settings,Retirement Age,Senatvės amžius
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatyti numeravimo serijas dalyvavimui naudojant sąranką&gt; Numeracijos serija
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Numatomas kiekis
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Šalinimas {0} neleidžiamas
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},# {0} eilutė: turtas {1} jau yra {2}
@@ -3600,11 +3638,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Buhalteris
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},„POS“ uždarymo kuponas „alreday“ yra {0} tarp {1} ir {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Naršymas
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Nė viena neapmokėta sąskaita faktūra nereikalauja valiutos kurso perkainojimo
 DocType: Authorization Rule,Customer / Item Name,Klientas / prekės pavadinimas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Naujas serijos numeris negali turėti Sandėlio. Sandėlis turi būti nustatomas pagal atsargų įrašą arba pirkimo čekį
 DocType: Issue,Via Customer Portal,Klientų portale
 DocType: Work Order Operation,Planned Start Time,Planuojamas pradžios laikas
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} yra {2}
+DocType: Service Level Priority,Service Level Priority,Paslaugų lygio prioritetas
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervuotų nusidėvėjimų skaičius negali būti didesnis nei bendras nusidėvėjimo skaičius
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Dalytis Ledger
 DocType: Journal Entry,Accounts Payable,Mokėtinos sąskaitos
@@ -3715,7 +3755,6 @@
 DocType: Delivery Note,Delivery To,Pristatyti
 DocType: Bank Statement Transaction Settings Item,Bank Data,Banko duomenys
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Planuojama Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Išlaikyti apmokėjimo valandas ir darbo valandas tą patį laiko lape
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Sekite švino šaltinius.
 DocType: Clinical Procedure,Nursing User,Slaugantis vartotojas
 DocType: Support Settings,Response Key List,Atsakymo raktų sąrašas
@@ -3883,6 +3922,7 @@
 DocType: Work Order Operation,Actual Start Time,Faktinis pradžios laikas
 DocType: Antibiotic,Laboratory User,Laboratorijos vartotojas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Internetiniai aukcionai
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,{0} prioritetas buvo pakartotas.
 DocType: Fee Schedule,Fee Creation Status,Mokesčių kūrimo būsena
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Programinės įrangos
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Pardavimo pavedimas mokėti
@@ -3949,6 +3989,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Nepavyko gauti informacijos apie {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Atsiskaitymo valiuta turi būti lygi numatytai įmonės valiutai arba šalies sąskaitos valiutai
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Prašome įvesti šio pardavėjo darbuotojo ID
+DocType: Shift Type,Early Exit Consequence after,Ankstyvo pasitraukimo pasekmė po
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Sukurti atidarymo pardavimo ir pirkimo sąskaitas
 DocType: Disease,Treatment Period,Gydymo laikotarpis
 apps/erpnext/erpnext/config/settings.py,Setting up Email,El. Pašto nustatymas
@@ -3966,7 +4007,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Studento vardas:
 DocType: SMS Log,Sent On,Išsiųsta
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Pardavimo sąskaita faktūra
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Atsakymo laikas negali būti didesnis nei skyros laikas
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kurso studento grupei kursas bus patvirtintas kiekvienam studentui iš įtrauktų kursų programoje.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Valstybinės prekės
 DocType: Employee,Create User Permission,Kurti naudotojo leidimą
@@ -4005,6 +4045,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standartinės pardavimo arba pirkimo sutarties sąlygos.
 DocType: Sales Invoice,Customer PO Details,Kliento PO informacija
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacientas nerastas
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Pasirinkite numatytąjį prioritetą.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Pašalinti elementą, jei mokesčiai netaikomi šiam elementui"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientų grupė egzistuoja su tuo pačiu pavadinimu, pakeiskite Kliento vardą arba pervadinkite klientų grupę"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4044,6 +4085,7 @@
 DocType: Support Settings,Support Portal,Paramos portalas
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Užduoties <b>{0}</b> pabaigos data negali būti mažesnė nei <b>{1}</b> tikėtina pradžios data <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Darbuotojas {0} yra paliktas {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Ši Paslaugų lygio sutartis yra specifinė Klientui {0}
 DocType: Employee,Held On,Laikoma
 DocType: Healthcare Practitioner,Practitioner Schedules,Praktikų tvarkaraščiai
 DocType: Project Template Task,Begin On (Days),Pradėti (dienos)
@@ -4051,6 +4093,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Darbo užsakymas buvo {0}
 DocType: Inpatient Record,Admission Schedule Date,Priėmimo tvarkaraštis
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Turto vertės koregavimas
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Pažymėkite lankomumą pagal „Darbuotojų patikrinimą“ darbuotojams, paskirtiems į šį pamainą."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,"Prekės, padarytos neregistruotiems asmenims"
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Visi darbai
 DocType: Appointment Type,Appointment Type,Paskyrimo tipas
@@ -4164,7 +4207,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bendras pakuotės svoris. Paprastai grynasis svoris + pakavimo medžiagos svoris. (spausdinimui)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratoriniai tyrimai Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,{0} elementas negali turėti partijos
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Pardavimų vamzdynas pagal etapus
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Studentų grupės stiprybė
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Banko ataskaitos operacijos įrašas
 DocType: Purchase Order,Get Items from Open Material Requests,Gaukite elementus iš atvirų materialinių užklausų
@@ -4246,7 +4288,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Rodyti senėjimo sandėlį
 DocType: Sales Invoice,Write Off Outstanding Amount,Nurašykite neįvykdytą sumą
 DocType: Payroll Entry,Employee Details,Darbuotojų duomenys
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Pradžios laikas negali būti didesnis nei {0} pabaigos laikas.
 DocType: Pricing Rule,Discount Amount,Nuolaidos suma
 DocType: Healthcare Service Unit Type,Item Details,Elemento informacija
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Dukart {0} mokesčių deklaracija laikotarpiui {1}
@@ -4299,7 +4340,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Grynasis darbo užmokestis negali būti neigiamas
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Sąveikos Nr
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},{0} # eilutė {1} negali būti perkelta daugiau nei {2} nuo užsakymo {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Apskaitos diagrama ir Šalys
 DocType: Stock Settings,Convert Item Description to Clean HTML,Konvertuoti elemento aprašą į švarų HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Visos tiekėjų grupės
@@ -4370,6 +4411,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Tėvų aptarnavimo skyrius
 DocType: Sales Invoice,Include Payment (POS),Įtraukti mokėjimą (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Privatus kapitalas
+DocType: Shift Type,First Check-in and Last Check-out,Pirmasis įsiregistravimas ir paskutinis išsiregistravimas
 DocType: Landed Cost Item,Receipt Document,Gavimo dokumentas
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Tiekėjas Scorecard laikotarpis
 DocType: Employee Grade,Default Salary Structure,Numatytoji atlyginimo struktūra
@@ -4452,6 +4494,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Sukurti užsakymą
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Apibrėžti finansinių metų biudžetą.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Sąskaitų lentelė negali būti tuščia.
+DocType: Employee Checkin,Entry Grace Period Consequence,Įrašo malonės periodo pasekmė
 ,Payment Period Based On Invoice Date,Mokėjimo laikotarpis pagal sąskaitos faktūros datą
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Diegimo data negali būti prieš {0} elemento pristatymo datą
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Nuoroda į medžiagos užklausą
@@ -4460,6 +4503,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},{0} eilutė: šiam sandėliui jau yra įrašų perrašymas {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Dokumento data
 DocType: Monthly Distribution,Distribution Name,Platinimo pavadinimas
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Darbo diena {0} buvo pakartota.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Grupė ne grupei
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Vyksta atnaujinimas. Tai gali užtrukti.
 DocType: Item,"Example: ABCD.#####
@@ -4472,6 +4516,7 @@
 DocType: Vehicle Log,Fuel Qty,Kuro kiekis
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,„Guardian1 Mobile“ Nr
 DocType: Invoice Discounting,Disbursed,Išmokėta
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Laikas pasibaigus pamainai, kurios metu tikrinamas atvykimas."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Grynieji mokėtinų sąskaitų pokyčiai
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nepasiekiamas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Ne visą darbo dieną
@@ -4485,7 +4530,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Rodyti PDC spausdinimui
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify Tiekėjas
 DocType: POS Profile User,POS Profile User,POS profilio vartotojas
-DocType: Student,Middle Name,Antras vardas
 DocType: Sales Person,Sales Person Name,Pardavėjo vardas
 DocType: Packing Slip,Gross Weight,Bendras svoris
 DocType: Journal Entry,Bill No,Bill Nr
@@ -4494,7 +4538,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Susitarimą dėl paslaugų lygio
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Pirmiausia pasirinkite Darbuotojai ir data
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Prekių vertės nustatymo norma perskaičiuojama atsižvelgiant į iškrautų išlaidų čekio sumą
 DocType: Timesheet,Employee Detail,Darbuotojų informacija
 DocType: Tally Migration,Vouchers,Kuponai
@@ -4529,7 +4572,7 @@
 DocType: Additional Salary,Date on which this component is applied,"Data, kada šis komponentas taikomas"
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,"Galimų akcininkų, turinčių folio numerių, sąrašas"
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Nustatykite sąsajos sąsajas.
-DocType: Service Level,Response Time Period,Atsakymo trukmė
+DocType: Service Level Priority,Response Time Period,Atsakymo trukmė
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkimo mokesčiai ir rinkliavos
 DocType: Course Activity,Activity Date,Veiklos data
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Pasirinkite arba pridėkite naują klientą
@@ -4554,6 +4597,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Finansiniai metai
 DocType: Sales Invoice Item,Deferred Revenue,Atidėtosios pajamos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Turi būti pasirinktas „Atleast“ vienas iš pardavimo ar pirkimo
+DocType: Shift Type,Working Hours Threshold for Half Day,Darbo valandų slenkstis per pusę dienos
 ,Item-wise Purchase History,Prekių supirkimo istorija
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Negalima pakeisti eilutės {0} elemento paslaugos sustabdymo datos
 DocType: Production Plan,Include Subcontracted Items,Įtraukti subrangos elementus
@@ -4586,6 +4630,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Leisti tą patį elementą kelis kartus
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Sukurti BOM
 DocType: Healthcare Practitioner,Charges,Mokesčiai
+DocType: Employee,Attendance and Leave Details,Dalyvavimas ir išsami informacija
 DocType: Student,Personal Details,Asmeninės detalės
 DocType: Sales Order,Billing and Delivery Status,Atsiskaitymo ir pristatymo būsena
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,"{0} eilutė: tiekėjui {0}, norint siųsti el"
@@ -4637,7 +4682,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Įveskite vertę {0} ir {1}
 DocType: Purchase Order,Order Confirmation Date,Užsakymo patvirtinimo data
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Apskaičiuokite numatomus atvykimo laikus
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų pavadinimo sistemą žmogiškųjų išteklių&gt; HR nustatymuose
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Vartojimas
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS - .YYYY.-
 DocType: Subscription,Subscription Start Date,Prenumeratos pradžios data
@@ -4660,7 +4704,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Žurnalo įrašo paskyra
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variantas
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Forumo veikla
-DocType: Service Level,Resolution Time Period,Rezoliucijos laikas
+DocType: Service Level Priority,Resolution Time Period,Rezoliucijos laikas
 DocType: Request for Quotation,Supplier Detail,Tiekėjo informacija
 DocType: Project Task,View Task,Peržiūrėti užduotį
 DocType: Serial No,Purchase / Manufacture Details,Pirkimo / gamybos informacija
@@ -4727,6 +4771,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sandėlį galima keisti tik per sandėlio įrašą / pristatymo pastabą / pirkimo čekį
 DocType: Support Settings,Close Issue After Days,Uždaryti problemą po dienų
 DocType: Payment Schedule,Payment Schedule,Mokėjimo planas
+DocType: Shift Type,Enable Entry Grace Period,Įgalinti atvykimo malonės laikotarpį
 DocType: Patient Relation,Spouse,Sutuoktinis
 DocType: Purchase Invoice,Reason For Putting On Hold,Patvirtinimo priežastis
 DocType: Item Attribute,Increment,Didėjimas
@@ -4864,6 +4909,7 @@
 DocType: Vehicle Log,Invoice Ref,Sąskaitos faktūros Nr
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-forma netaikoma sąskaitoje faktūroje: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Sukurta sąskaita
+DocType: Shift Type,Early Exit Grace Period,Ankstyvo pasitraukimo laikotarpis
 DocType: Patient Encounter,Review Details,Peržiūrėkite informaciją
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,{0} eilutė: valandų vertė turi būti didesnė už nulį.
 DocType: Account,Account Number,Paskyros numeris
@@ -4875,7 +4921,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Taikoma, jei bendrovė yra SpA, SApA arba SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Tarp sutapančių sąlygų nustatyta:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Mokama ir nepateikta
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Elemento kodas yra privalomas, nes elementas nėra automatiškai sunumeruotas"
 DocType: GST HSN Code,HSN Code,HSN kodas
 DocType: GSTR 3B Report,September,Rugsėjo mėn
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administracinės išlaidos
@@ -4921,6 +4966,7 @@
 DocType: Opportunity,Sales Stage,Pardavimų etapas
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Žodžiai bus matomi, kai išsaugosite pardavimų užsakymą."
 DocType: Item Reorder,Re-order Level,Pakartokite užsakymo lygį
+DocType: Shift Type,Enable Auto Attendance,Įgalinti automatinį lankomumą
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Pirmenybė
 ,Department Analytics,Departamento analizė
 DocType: Crop,Scientific Name,Mokslinis vardas
@@ -4933,6 +4979,7 @@
 DocType: Quiz Activity,Quiz Activity,Viktorina
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} nėra galiojančiame darbo užmokesčio laikotarpyje
 DocType: Timesheet,Billed,Atsiskaityta
+apps/erpnext/erpnext/config/support.py,Issue Type.,Problemos tipas.
 DocType: Restaurant Order Entry,Last Sales Invoice,Paskutinė pardavimo sąskaita
 DocType: Payment Terms Template,Payment Terms,Mokėjimo sąlygos
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervuota Kiekis: Parduodamas, bet nepateiktas kiekis."
@@ -5028,6 +5075,7 @@
 DocType: Account,Asset,Turtas
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} neturi sveikatos priežiūros specialisto tvarkaraščio. Įdėkite ją į sveikatos priežiūros specialisto šeimininką
 DocType: Vehicle,Chassis No,Važiuoklės Nr
+DocType: Employee,Default Shift,Numatytasis perkėlimas
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Įmonės santrumpa
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Medžiagų medis
 DocType: Article,LMS User,LMS vartotojas
@@ -5075,6 +5123,7 @@
 DocType: Sales Person,Parent Sales Person,Tėvų pardavimo asmuo
 DocType: Student Group Creation Tool,Get Courses,Gaukite kursus
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# {0} eilutė: Kiekis turi būti 1, nes elementas yra ilgalaikis turtas. Naudokite atskirą eilutę keliems kiekiams."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Darbo valandos, po kurių pažymėtas „Absent“ ženklas. (Nulis, jei norite išjungti)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Operacijoje leidžiami tik lapų mazgai
 DocType: Grant Application,Organization,Organizacija
 DocType: Fee Category,Fee Category,Mokesčių kategorija
@@ -5087,6 +5136,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Atnaujinkite savo mokomojo renginio būseną
 DocType: Volunteer,Morning,Rytas
 DocType: Quotation Item,Quotation Item,Citatos elementas
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Emisijos prioritetas.
 DocType: Journal Entry,Credit Card Entry,Kredito kortelės įvedimas
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Laiko lizdas praleistas, lizdas {0} iki {1} persidengia iš esamų lizdų {2} į {3}"
 DocType: Journal Entry Account,If Income or Expense,Jei pajamos ar išlaidos
@@ -5134,11 +5184,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Duomenų importavimas ir nustatymai
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Jei pažymėtas automatinis įjungimas, klientai bus automatiškai susieti su atitinkama lojalumo programa (išsaugota)"
 DocType: Account,Expense Account,Išlaidų sąskaita
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Laikas iki pamainos pradžios laiko, per kurį įdarbinamas Darbuotojų registravimas."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Santykis su Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Sukurti sąskaitą faktūrą
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Mokėjimo prašymas jau yra {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',"Darbuotojas, atleistas {0}, turi būti nustatytas kaip „Kairė“"
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Mokėkite {0} {1}
+DocType: Company,Sales Settings,Pardavimų nustatymai
 DocType: Sales Order Item,Produced Quantity,Pagamintas kiekis
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Užklausos užklausą galima rasti spustelėję šią nuorodą
 DocType: Monthly Distribution,Name of the Monthly Distribution,Mėnesinio paskirstymo pavadinimas
@@ -5217,6 +5269,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Sukuriami numatyti pardavimų ir pirkimo mokesčių šablonai.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} negalima palikti
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debeto į paskyrą turi būti gautina sąskaita
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Galutinė sutarties data negali būti mažesnė nei šiandien.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Nustatykite paskyrą sandėliuose {0} arba numatytąjį inventoriaus paskyrą kompanijoje {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Nustatykite kaip numatytąjį
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Šio paketo grynasis svoris. (automatiškai apskaičiuojamas kaip elementų grynojo svorio suma)
@@ -5243,8 +5296,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Pasibaigusios partijos
 DocType: Shipping Rule,Shipping Rule Type,Pristatymo taisyklės tipas
 DocType: Job Offer,Accepted,Priimta
-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","Jei norite atšaukti šį dokumentą, ištrinkite darbuotoją <a href=""#Form/Employee/{0}"">{0}</a>"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Jūs jau įvertinote vertinimo kriterijus {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Pasirinkite partijos numerius
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Amžius (dienos)
@@ -5271,6 +5322,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Pasirinkite domenus
 DocType: Agriculture Task,Task Name,Užduoties pavadinimas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Atsargų įrašai jau sukurti darbo užsakymui
+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","Jei norite atšaukti šį dokumentą, ištrinkite darbuotoją <a href=""#Form/Employee/{0}"">{0}</a>"
 ,Amount to Deliver,Pateikiama suma
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Įmonės {0} nėra
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nėra laukiamų esminių užklausų, susijusių su nurodytais elementais."
@@ -5320,6 +5373,7 @@
 DocType: Lab Prescription,Test Code,Bandymo kodas
 DocType: Purchase Taxes and Charges,On Previous Row Total,Ankstesnėje eilutėje
 DocType: Student,Student Email Address,Studentų el. Pašto adresas
+,Delayed Item Report,Atidėto elemento ataskaita
 DocType: Academic Term,Education,Švietimas
 DocType: Supplier Quotation,Supplier Address,Tiekėjo adresas
 DocType: Salary Detail,Do not include in total,Neįtraukite viso
@@ -5327,7 +5381,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} nėra
 DocType: Purchase Receipt Item,Rejected Quantity,Atmestas kiekis
 DocType: Cashier Closing,To TIme,TIme
-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}) elementui: {2} nerastas
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Dienos darbo suvestinė Grupės vartotojas
 DocType: Fiscal Year Company,Fiscal Year Company,Finansinių metų bendrovė
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternatyvus elementas neturi būti toks pats kaip prekės kodas
@@ -5379,6 +5432,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Vėlavimas tarp pristatymo sustabdymo
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Užšaldyti atsargas senesniems nei [dienos]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Reklaminės schemos produktų nuolaida
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Problemos prioritetas jau egzistuoja
 DocType: Account,Asset Received But Not Billed,"Turtas gautas, bet ne apmokestintas"
 DocType: POS Closing Voucher,Total Collected Amount,Iš viso surinkta suma
 DocType: Course,Default Grading Scale,Numatytoji skalės skalė
@@ -5421,6 +5475,7 @@
 DocType: Contract,Fulfilment Terms,Užpildymo sąlygos
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Grupė ne grupei
 DocType: Student Guardian,Mother,Motina
+DocType: Issue,Service Level Agreement Fulfilled,Įgyvendintas paslaugų lygio susitarimas
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Mokėti mokesčius už neprašytus darbuotojo išmokas
 DocType: Travel Request,Travel Funding,Kelionių finansavimas
 DocType: Shipping Rule,Fixed,Fiksuotas
@@ -5450,10 +5505,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nerasta elementų.
 DocType: Item Attribute,From Range,Nuo diapazono
 DocType: Clinical Procedure,Consumables,Eksploatacinės medžiagos
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,Reikalingi „worker_field_value“ ir „timestamp“.
 DocType: Purchase Taxes and Charges,Reference Row #,Nuorodos eilutė #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},„{0}“ nustatykite „Turto nusidėvėjimo savikainos centrą“
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,"# {0} eilutė: norint užbaigti operaciją, reikalingas mokėjimo dokumentas"
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Spustelėkite šį mygtuką, kad ištrauktumėte pardavimų užsakymo duomenis iš „Amazon MWS“."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Darbo valandos, po kurių pusė dienos yra pažymėtos. (Nulis, jei norite išjungti)"
 ,Assessment Plan Status,Vertinimo plano būklė
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Pirmiausia pasirinkite {0}
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Jei norite sukurti „Darbuotojų“ įrašą, pateikite šią informaciją"
@@ -5524,6 +5581,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Nustatykite atidarytą
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Perjungti filtrus
 DocType: Production Plan,Material Request Detail,Medžiagos užklausos išsami informacija
+DocType: Shift Type,Process Attendance After,Proceso lankomumas po
 DocType: Material Request Item,Quantity and Warehouse,Kiekis ir sandėlis
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Eikite į programas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Eilė # {0}: dublikatas įraše „{1} {2}
@@ -5581,6 +5639,7 @@
 DocType: Pricing Rule,Party Information,Šalies informacija
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Skolininkai ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Iki šiol negali būti didesnis nei darbuotojo atleidimo data
+DocType: Shift Type,Enable Exit Grace Period,Įgalinti išėjimo laikotarpį
 DocType: Expense Claim,Employees Email Id,Darbuotojų el
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Atnaujinkite kainą iš „Shopify“ į ERPNext Kainoraštį
 DocType: Healthcare Settings,Default Medical Code Standard,Numatytasis medicinos kodo standartas
@@ -5611,7 +5670,6 @@
 DocType: Budget,Applicable on Material Request,Taikoma materialinės užklausos atveju
 DocType: Support Settings,Search APIs,Paieškos API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Perprodukcija Pardavimo užsakymo procentas
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Specifikacijos
 DocType: Purchase Invoice,Supplied Items,Pateikiami elementai
 DocType: Leave Control Panel,Select Employees,Pasirinkite Darbuotojai
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Paskoloje {0} pasirinkite palūkanų pajamų sąskaitą
@@ -5637,7 +5695,7 @@
 ,Supplier-Wise Sales Analytics,Tiekėjo-protingo pardavimo analitika
 DocType: GSTR 3B Report,February,Vasario mėn
 DocType: Appraisal,For Employee,Darbuotojui
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Faktinė pristatymo data
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Faktinė pristatymo data
 DocType: Sales Partner,Sales Partner Name,Pardavimo partnerio pavadinimas
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Nusidėvėjimo eilutė {0}: nusidėvėjimo pradžios data įrašoma kaip ankstesnė data
 DocType: GST HSN Code,Regional,Regioninis
@@ -5676,6 +5734,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Tiekėjas Scorecard
 DocType: Travel Itinerary,Travel To,Keliauti į
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Pažymėkite lankomumą
+DocType: Shift Type,Determine Check-in and Check-out,Nustatykite įsiregistravimą ir išsiregistravimą
 DocType: POS Closing Voucher,Difference,Skirtumas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Mažas
 DocType: Work Order Item,Work Order Item,Darbo užsakymo elementas
@@ -5709,6 +5768,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Narkotikai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} uždarytas
 DocType: Patient,Medical History,Medicinos istorija
+DocType: Expense Claim,Expense Taxes and Charges,Išlaidos ir mokesčiai
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Praėjus kelioms dienoms po sąskaitų faktūrų išrašymo dienos, prieš atšaukiant prenumeratą ar žymėjimą kaip nemokamą"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Diegimo pastaba {0} jau pateikta
 DocType: Patient Relation,Family,Šeima
@@ -5741,7 +5801,6 @@
 DocType: Dosage Strength,Strength,Jėga
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} vieneto {1} reikėjo {2} užbaigti šią operaciją.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,„Subfonth“ subrangos pagrindu pagamintos žaliavos
-DocType: Bank Guarantee,Customer,Klientas
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Jei įjungta, laukas „Akademinis terminas“ bus privalomas programos registravimo priemonėje."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.",Studentų grupė pagal partiją pagrįsta kiekvienam studentui iš programos registracijos.
 DocType: Course,Topics,Temos
@@ -5821,6 +5880,7 @@
 DocType: Chapter,Chapter Members,Skyrių nariai
 DocType: Warranty Claim,Service Address,Paslaugų adresas
 DocType: Journal Entry,Remark,Pastaba
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),{0} eilutė: {4} sandėlyje {1} nepasiekiamas kiekis įrašo pateikimo metu ({2} {3})
 DocType: Patient Encounter,Encounter Time,Susitikimo laikas
 DocType: Serial No,Invoice Details,Sąskaitos faktūros duomenys
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Papildomos paskyros gali būti pateikiamos grupėse, tačiau įrašai gali būti daromi ne grupėms"
@@ -5899,6 +5959,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Uždarymas (atidarymas + iš viso)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kriterijų formulė
 apps/erpnext/erpnext/config/support.py,Support Analytics,„Analytics“ palaikymas
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Dalyvavimo įrenginio ID (biometrinis / RF žymės ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Peržiūra ir veiksmai
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jei paskyra užšaldyta, įrašai leidžiami ribotiems vartotojams."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Suma po nusidėvėjimo
@@ -5920,6 +5981,7 @@
 DocType: Salary Slip,Loan Repayment,Paskolų grąžinimas
 DocType: Employee Education,Major/Optional Subjects,Pagrindiniai / neprivalomi dalykai
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Tiekėjo adresai ir kontaktai
 DocType: Bank Guarantee,Bank Guarantee Type,Banko garantijos tipas
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Jei išjungta, laukas „Apvalus bendras“ nebus matomas jokioje operacijoje"
 DocType: Pricing Rule,Min Amt,Min
@@ -5958,6 +6020,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Sąskaitos faktūros kūrimo įrankio elemento atidarymas
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Įtraukti POS operacijas
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},"Nėra Darbuotojo, nustatyto pagal darbuotojo lauko vertę. „{}“: {}"
 DocType: Payment Entry,Received Amount (Company Currency),Gauta suma (įmonės valiuta)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","„LocalStorage“ yra pilna, neišsaugojo"
 DocType: Chapter Member,Chapter Member,Skyrius Narys
@@ -5987,6 +6050,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nėra sukurtos studentų grupės.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Pasikartojanti eilutė {0} su tuo pačiu {1}
 DocType: Employee,Salary Details,Atlyginimų duomenys
+DocType: Employee Checkin,Exit Grace Period Consequence,Išeiti iš malonės periodo pasekmės
 DocType: Bank Statement Transaction Invoice Item,Invoice,Sąskaita
 DocType: Special Test Items,Particulars,Informacija
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Prašome nustatyti filtrą pagal elementą arba sandėlį
@@ -6088,6 +6152,7 @@
 DocType: Serial No,Out of AMC,Iš AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Darbo profilis, reikalingos kvalifikacijos ir kt."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Laivas į valstybę
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Ar norite pateikti materialinę užklausą
 DocType: Opportunity Item,Basic Rate,Pagrindinis tarifas
 DocType: Compensatory Leave Request,Work End Date,Darbo pabaigos data
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Žaliavų prašymas
@@ -6273,6 +6338,7 @@
 DocType: Sales Order Item,Gross Profit,Bendrasis pelnas
 DocType: Quality Inspection,Item Serial No,Prekės serijos Nr
 DocType: Asset,Insurer,Draudikas
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Pirkimo suma
 DocType: Asset Maintenance Task,Certificate Required,Reikalingas sertifikatas
 DocType: Retention Bonus,Retention Bonus,Išlaikymo premija
@@ -6387,6 +6453,8 @@
 DocType: Invoice Discounting,Sanctioned,Sankcija
 DocType: Course Enrollment,Course Enrollment,Kursų registravimas
 DocType: Item,Supplier Items,Tiekėjo elementai
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Pradžios laikas negali būti didesnis arba lygus pabaigos laikotarpiui {0}.
 DocType: Sales Order,Not Applicable,Netaikoma
 DocType: Support Search Source,Response Options,Atsakymo parinktys
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} turėtų būti nuo 0 iki 100
@@ -6472,7 +6540,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Ilgalaikis turtas
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Visas uždarbis
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Share Balance,From No,Nuo Nr
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Mokėjimo suderinimo sąskaita
 DocType: Purchase Invoice,Taxes and Charges Added,Įtraukti mokesčiai ir mokesčiai
@@ -6580,6 +6647,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignoruoti kainodaros taisyklę
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Maistas
 DocType: Lost Reason Detail,Lost Reason Detail,Pamesta priežastis
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Buvo sukurti šie serijos numeriai: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Klientų atsiliepimai
 DocType: Serial No,Warranty / AMC Details,Garantija / AMC informacija
 DocType: Issue,Opening Time,Atidarymo laikas
@@ -6629,6 +6697,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Įmonės pavadinimas nėra tas pats
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Darbuotojų skatinimas negali būti pateiktas prieš reklamos datą
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Neleidžiama atnaujinti senesnių nei {0} akcijų sandorių
+DocType: Employee Checkin,Employee Checkin,Darbuotojų patikrinimas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Pradžios data turėtų būti mažesnė už {0} elemento pabaigos datą
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Kurkite klientų kainas
 DocType: Buying Settings,Buying Settings,Pirkimo nustatymai
@@ -6650,6 +6719,7 @@
 DocType: Patient,Patient Demographics,Pacientų demografija
 DocType: Share Transfer,To Folio No,Į „Folio“ Nr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Pinigų srautas iš operacijų
+DocType: Employee Checkin,Log Type,Žurnalo tipas
 DocType: Stock Settings,Allow Negative Stock,Leisti neigiamas atsargas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Nė vienas iš elementų neturi kiekio ar vertės pokyčių.
 DocType: Asset,Purchase Date,Pirkimo data
@@ -6694,6 +6764,7 @@
 DocType: Vital Signs,Very Hyper,Labai hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Pasirinkite savo verslo pobūdį.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Pasirinkite mėnesį ir metus
+DocType: Service Level,Default Priority,Numatytasis prioritetas
 DocType: Student Log,Student Log,Studentų žurnalas
 DocType: Shopping Cart Settings,Enable Checkout,Įgalinti „Checkout“
 apps/erpnext/erpnext/config/settings.py,Human Resources,Žmogiškieji ištekliai
@@ -6722,7 +6793,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Prijunkite „Shopify“ su ERPNext
 DocType: Homepage Section Card,Subtitle,Subtitrai
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 DocType: BOM,Scrap Material Cost(Company Currency),Metalo laužas (įmonės valiuta)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Pristatymo pastaba {0} negali būti pateikta
 DocType: Task,Actual Start Date (via Time Sheet),Faktinė pradžios data (per laiko lapą)
@@ -6778,6 +6848,7 @@
 DocType: Drug Prescription,Dosage,Dozavimas
 DocType: Cheque Print Template,Starting position from top edge,Pradinė padėtis nuo viršutinio krašto
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Paskyrimo trukmė (min.)
+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ą, turintį tą patį laiką. {0}"
 DocType: Accounting Dimension,Disable,Išjungti
 DocType: Email Digest,Purchase Orders to Receive,Pirkimo užsakymai gauti
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,„Productions“ užsakymai negali būti keliami:
@@ -6793,7 +6864,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Subrangos būdu perduota medžiaga
 DocType: Job Card,Timing Detail,Laiko išsami informacija
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Reikalingas
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} importavimas iš {1}
 DocType: Job Offer Term,Job Offer Term,Darbo pasiūlymų terminas
 DocType: SMS Center,All Contact,Visi kontaktai
 DocType: Project Task,Project Task,Projekto užduotis
@@ -6844,7 +6914,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,{0} elementas nėra nustatomas serijos Nr
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Iš valstybės
 DocType: Leave Type,Maximum Continuous Days Applicable,Taikomos maksimalios nuolatinės dienos
-apps/erpnext/erpnext/config/support.py,Support Team.,Palaikymo komanda.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Pirmiausia įveskite įmonės pavadinimą
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importuoti sėkmingai
 DocType: Guardian,Alternate Number,Alternatyvus numeris
@@ -6936,6 +7005,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,# {0} eilutė: pridėtas elementas
 DocType: Student Admission,Eligibility and Details,Tinkamumas ir išsami informacija
 DocType: Staffing Plan,Staffing Plan Detail,Personalo plano detalė
+DocType: Shift Type,Late Entry Grace Period,Vėlyvojo atvykimo atidėjimo laikotarpis
 DocType: Email Digest,Annual Income,Metinės pajamos
 DocType: Journal Entry,Subscription Section,Prenumeratos skyrius
 DocType: Salary Slip,Payment Days,Mokėjimo dienos
@@ -6986,6 +7056,7 @@
 DocType: Journal Entry Account,Account Balance,Sąskaitos balansas
 DocType: Asset Maintenance Log,Periodicity,Periodiškumas
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Medicininis įrašas
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,"Žurnalo tipas reikalingas perėjimams, kurie patenka į pamainą: {0}."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Vykdymas
 DocType: Item,Valuation Method,Vertinimo metodas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} prieš pardavimų sąskaitą {1}
@@ -7070,6 +7141,7 @@
 DocType: Loan Type,Loan Name,Paskolos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Nustatykite numatytąjį mokėjimo būdą
 DocType: Quality Goal,Revision,Peržiūra
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Laikas iki pamainos pabaigos, kai išvykimas laikomas ankstyvu (minutėmis)."
 DocType: Healthcare Service Unit,Service Unit Type,Paslaugos vieneto tipas
 DocType: Purchase Invoice,Return Against Purchase Invoice,Grįžti prieš pirkimo sąskaitą faktūrą
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Sukurti slaptą
@@ -7225,12 +7297,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmetika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Patikrinkite, ar norite priversti vartotoją pasirinkti seriją prieš išsaugant. Jei tai patikrinsite, nebus numatytosios nuostatos."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Vartotojai, turintys šį vaidmenį, gali nustatyti įšaldytas sąskaitas ir kurti / keisti apskaitos įrašus įšaldytas sąskaitas"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Elemento kodas&gt; Prekių grupė&gt; Gamintojas
 DocType: Expense Claim,Total Claimed Amount,Iš viso prašoma suma
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko lizdo kitoms {0} dienoms operacijai {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Apvyniojimas
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Galite atnaujinti tik jei narystė baigiasi per 30 dienų
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Reikšmė turi būti tarp {0} ir {1}
 DocType: Quality Feedback,Parameters,Parametrai
+DocType: Shift Type,Auto Attendance Settings,Automatinio dalyvavimo nustatymai
 ,Sales Partner Transaction Summary,Pardavimų partnerių sandorių suvestinė
 DocType: Asset Maintenance,Maintenance Manager Name,Priežiūros vadybininko pavadinimas
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Reikia atsiųsti elemento duomenis.
@@ -7321,10 +7395,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Patvirtinkite taikomą taisyklę
 DocType: Job Card Item,Job Card Item,Darbo kortelės elementas
 DocType: Homepage,Company Tagline for website homepage,Bendrovės „Tagline“ svetainė pagrindiniam tinklalapiui
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Nustatykite atsakymo laiką ir prioritetą {0} pagal indeksą {1}.
 DocType: Company,Round Off Cost Center,Apvalinimo išlaidų centras
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kriterijai Svoris
 DocType: Asset,Depreciation Schedules,Nusidėvėjimo tvarkaraščiai
-DocType: Expense Claim Detail,Claim Amount,Reikalavimo suma
 DocType: Subscription,Discounts,Nuolaidos
 DocType: Shipping Rule,Shipping Rule Conditions,Pristatymo taisyklės
 DocType: Subscription,Cancelation Date,Atšaukimo data
@@ -7352,7 +7426,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Rodyti nulines reikšmes
 DocType: Employee Onboarding,Employee Onboarding,Darbuotojo įlaipinimas
 DocType: POS Closing Voucher,Period End Date,Laikotarpio pabaigos data
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Pardavimo galimybės pagal šaltinį
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pirmasis „Leave Approver“ sąraše bus nustatytas kaip numatytasis „Leave Approver“.
 DocType: POS Settings,POS Settings,POS nustatymai
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Visos paskyros
@@ -7373,7 +7446,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# {0} eilutė: norma turi būti tokia pati kaip {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Sveikatos priežiūros paslaugos
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,įrašų nerasta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Senėjimo diapazonas 3
 DocType: Vital Signs,Blood Pressure,Kraujo spaudimas
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Tikslinis įjungimas
@@ -7420,6 +7492,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Partijos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Gynyba
 DocType: Item,Has Batch No,Ar partija Nr
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Atidėtos dienos
 DocType: Lead,Person Name,Asmens vardas
 DocType: Item Variant,Item Variant,Elementas Variantas
 DocType: Training Event Employee,Invited,Pakviestas
@@ -7441,7 +7514,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Pradžios ir pabaigos datos, kurios nėra galiojančiame darbo užmokesčio laikotarpyje, negali apskaičiuoti {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Rodyti tik šių klientų grupių klientus
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,"Pasirinkite elementus, kuriuos norite išsaugoti"
-DocType: Service Level,Resolution Time,Skyros laikas
+DocType: Service Level Priority,Resolution Time,Skyros laikas
 DocType: Grading Scale Interval,Grade Description,Įvertinimo aprašymas
 DocType: Homepage Section,Cards,Kortelės
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kokybės susitikimo protokolai
@@ -7467,6 +7540,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,"Banko išrašo balansas, kaip nurodyta generaliniame vadove"
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Sveikatos priežiūra (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,"Numatytasis sandėlis, skirtas sukurti pardavimo užsakymą ir pristatymo pastabą"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,{0} atsakymo laikas rodyklėje {1} negali būti didesnis už skyros laiką.
 DocType: Opportunity,Customer / Lead Name,Kliento / vadovo vardas
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Nepareikalauta suma
@@ -7513,7 +7587,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Šalių ir adresų importavimas
 DocType: Item,List this Item in multiple groups on the website.,Įrašykite šį elementą daugelyje grupių svetainėje.
 DocType: Request for Quotation,Message for Supplier,Pranešimas tiekėjui
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"Negalima pakeisti {0}, nes yra {1} elemento sandoris."
 DocType: Healthcare Practitioner,Phone (R),Telefonas (R)
 DocType: Maintenance Team Member,Team Member,Komandos narys
 DocType: Asset Category Account,Asset Category Account,Turto kategorijos sąskaita
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index fd6fc75..b9fc62c 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -76,7 +76,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Tikšanās {0} un pārdošanas rēķins {1} tika atcelts
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļa numurs
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Tava epasta adrese...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Iekļaut noklusētos grāmatu ierakstus
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Iekļaut noklusētos grāmatu ierakstus
 DocType: Activity Cost,Activity Type,Darbības veids
 DocType: Purchase Invoice,Get Advances Paid,Saņemiet avansa maksājumus
 DocType: Company,Gain/Loss Account on Asset Disposal,Guvuma / zaudējumu konts aktīvu atsavināšanā
@@ -222,7 +222,9 @@
 DocType: Bank Reconciliation,Payment Entries,Maksājumu ieraksti
 DocType: Employee Education,Class / Percentage,Klase / procentuālā daļa
 ,Electronic Invoice Register,Elektronisko rēķinu reģistrs
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,"Notikumu skaits, pēc kura sekas tiek veiktas."
 DocType: Sales Invoice,Is Return (Credit Note),Vai atgriešanās (kredīta piezīme)
+DocType: Price List,Price Not UOM Dependent,Cena nav atkarīga no UOM
 DocType: Lab Test Sample,Lab Test Sample,Laboratorijas testa paraugs
 DocType: Shopify Settings,status html,statuss html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Piemēram, 2012., 2012. – 2013"
@@ -324,6 +326,7 @@
 DocType: Salary Slip,Net Pay,Neto maksājums
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Kopā rēķinā iekļautā summa
 DocType: Clinical Procedure,Consumables Invoice Separately,Izejmateriālu rēķins atsevišķi
+DocType: Shift Type,Working Hours Threshold for Absent,"Darba stundu slieksnis, kas nav paredzēts"
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},"Budžetu nevar piešķirt, izmantojot grupas kontu {0}"
 DocType: Purchase Receipt Item,Rate and Amount,Likme un summa
@@ -377,7 +380,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Pacienta iestatījumi
 DocType: Asset,Insurance End Date,Apdrošināšanas beigu datums
 DocType: Bank Account,Branch Code,Filiāles kods
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Laiks atbildēt
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Lietotāja forums
 DocType: Landed Cost Item,Landed Cost Item,Izkrauto izmaksu postenis
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Pārdevējs un pircējs nevar būt vienādi
@@ -595,6 +597,7 @@
 DocType: Share Transfer,Transfer,Pārskaitījums
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Meklēšanas vienums (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Rezultāts iesniegts
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,No datuma nevar būt lielāks par datumu
 DocType: Supplier,Supplier of Goods or Services.,Preču vai pakalpojumu piegādātājs.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,"Jaunā konta nosaukums. Piezīme. Lūdzu, neizveidojiet kontus klientiem un piegādātājiem"
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Studentu grupa vai kursu saraksts ir obligāts
@@ -879,7 +882,6 @@
 DocType: Skill,Skill Name,Prasmju nosaukums
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Drukāt atskaites karti
 DocType: Soil Texture,Ternary Plot,Trīskāršais zemes gabals
-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 nosaukuma sēriju {0}, izmantojot iestatījumu&gt; Iestatījumi&gt; Nosaukumu sērija"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Atbalsta biļetes
 DocType: Asset Category Account,Fixed Asset Account,Fiksēto aktīvu konts
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Jaunākās
@@ -892,6 +894,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Obligāts bilancei
 DocType: Payment Entry,Total Allocated Amount,Kopā piešķirtā summa
 DocType: Sales Invoice,Get Advances Received,Saņemt saņemtos avansa maksājumus
+DocType: Shift Type,Last Sync of Checkin,Checkin pēdējā sinhronizācija
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Vērtībā iekļautā nodokļa summa
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -900,7 +903,9 @@
 DocType: Student,Blood Group,Asins grupa
 apps/erpnext/erpnext/config/healthcare.py,Masters,Meistari
 DocType: Crop,Crop Spacing UOM,Apgriezt atstarpi UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,"Laiks pēc maiņas sākuma laika, kad reģistrēšanās tiek uzskatīta par novēlotu (minūtēs)."
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Izpētiet
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Netika atrasti neapmaksāti rēķini
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} vakances un {1} budžets {2} jau plānots meitasuzņēmumiem {3}. Mātesuzņēmumam {3} varat plānot tikai līdz {4} vakancēm un budžetu {5} kā personāla plānu {6}.
 DocType: Promotional Scheme,Product Discount Slabs,Produktu atlaižu plāksnes
@@ -1001,6 +1006,7 @@
 DocType: Item,Moving Average,Pārvietošanās vidējais
 DocType: Employee Attendance Tool,Unmarked Attendance,Neatzīmēts apmeklējums
 DocType: Homepage Section,Number of Columns,Kolonnu skaits
+DocType: Issue Priority,Issue Priority,Emisijas prioritāte
 DocType: Holiday List,Add Weekly Holidays,Pievienot iknedēļas brīvdienas
 DocType: Shopify Log,Shopify Log,Shopify žurnāls
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Izveidot algu slīdēšanu
@@ -1009,6 +1015,7 @@
 DocType: Warranty Claim,Issue Date,Izdošanas datums
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, atlasiet partiju {0}. Nevar atrast vienu partiju, kas atbilst šai prasībai"
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Nevar izveidot saglabāšanas bonusu kreisajiem darbiniekiem
+DocType: Employee Checkin,Location / Device ID,Atrašanās vietas / ierīces ID
 DocType: Purchase Order,To Receive,Saņemt
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,"Jūs atrodaties bezsaistes režīmā. Jūs nevarēsiet pārlādēt, kamēr nebūs tīkla."
 DocType: Course Activity,Enrollment,Reģistrācija
@@ -1017,7 +1024,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Maks.: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Informācija par e-rēķinu trūkst
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nav izveidots materiāls pieprasījums
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; Vienuma grupa&gt; Zīmols
 DocType: Loan,Total Amount Paid,Kopā samaksātā summa
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Visi šie vienumi jau ir izrakstīti rēķinā
 DocType: Training Event,Trainer Name,Trenera vārds
@@ -1128,6 +1134,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Lūdzu, pieminējiet Svina nosaukumu vadībā {0}"
 DocType: Employee,You can enter any date manually,Jebkuru datumu varat ievadīt manuāli
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Akciju saskaņošanas postenis
+DocType: Shift Type,Early Exit Consequence,Agrās izejas sekas
 DocType: Item Group,General Settings,Vispārīgie iestatījumi
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Izpildes datums nevar būt pirms nosūtīšanas / piegādātāja rēķina datuma
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Pirms iesniegšanas ievadiet saņēmēja vārdu.
@@ -1166,6 +1173,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Maksājuma apstiprinājums
 ,Available Stock for Packing Items,Pieejamie krājumi iepakošanas priekšmetiem
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},"Lūdzu, noņemiet šo rēķinu {0} no C-veidlapas {1}"
+DocType: Shift Type,Every Valid Check-in and Check-out,Katra derīga reģistrēšanās un izrakstīšanās
 DocType: Support Search Source,Query Route String,Vaicājuma maršruta virkne
 DocType: Customer Feedback Template,Customer Feedback Template,Klientu atsauksmes veidne
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Citāti uz klientiem vai klientiem.
@@ -1200,6 +1208,7 @@
 DocType: Authorization Control,Authorization Control,Autorizācijas kontrole
 ,Daily Work Summary Replies,Ikdienas darba kopsavilkums Atbildes
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektā: {0}
+DocType: Issue,Response By Variance,Atbildes reakcija
 DocType: Item,Sales Details,Informācija par pārdošanu
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Burtu galviņas drukāšanas veidnēm.
 DocType: Salary Detail,Tax on additional salary,Nodoklis par papildu algu
@@ -1323,6 +1332,7 @@
 DocType: Project,Task Progress,Uzdevumu progress
 DocType: Journal Entry,Opening Entry,Atvēršanas ieraksts
 DocType: Bank Guarantee,Charges Incurred,Izmaksas iekasētas
+DocType: Shift Type,Working Hours Calculation Based On,Darba stundu aprēķināšana balstīta uz
 DocType: Work Order,Material Transferred for Manufacturing,Ražošanai nodots materiāls
 DocType: Products Settings,Hide Variants,Slēpt variantus
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Atspējot jaudas plānošanu un laika uzskaiti
@@ -1352,6 +1362,7 @@
 DocType: Guardian,Interests,Intereses
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Patērētais daudzums
 DocType: Education Settings,Education Manager,Izglītības vadītājs
+DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Plānojiet laika žurnālus ārpus darbstacijas darba stundām.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Lojalitātes punkti: {0}
 DocType: Healthcare Settings,Registration Message,Reģistrācijas ziņojums
@@ -1376,9 +1387,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Rēķins jau ir izveidots visām norēķinu stundām
 DocType: Sales Partner,Contact Desc,Sazinieties ar Desc
 DocType: Purchase Invoice,Pricing Rules,Cenu noteikšanas noteikumi
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā pastāv {0} vienuma esošie darījumi, {1} vērtību nevar mainīt"
 DocType: Hub Tracked Item,Image List,Attēlu saraksts
 DocType: Item Variant Settings,Allow Rename Attribute Value,Atļaut pārdēvēt atribūtu vērtību
-DocType: Price List,Price Not UOM Dependant,Cena nav atkarīga no UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Laiks (min.)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Pamata
 DocType: Loan,Interest Income Account,Procentu ienākumu konts
@@ -1388,6 +1399,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Izvēlieties POS profilu
 DocType: Support Settings,Get Latest Query,Saņemt jaunāko vaicājumu
 DocType: Employee Incentive,Employee Incentive,Darbinieku stimuls
+DocType: Service Level,Priorities,Prioritātes
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Mājaslapā pievienojiet kartes vai pielāgotas sadaļas
 DocType: Homepage,Hero Section Based On,Varoņa sadaļa balstīta uz
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kopējā pirkuma cena (izmantojot pirkuma rēķinu)
@@ -1447,7 +1459,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Pasūtītais daudzums
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# {0} rinda: noraidītais noliktava ir obligāta pret noraidīto vienumu {1}
 ,Received Items To Be Billed,"Saņemtie vienumi, kas jāapmaksā"
-DocType: Salary Slip Timesheet,Working Hours,Darba stundas
+DocType: Attendance,Working Hours,Darba stundas
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Maksājuma režīms
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,"Pirkuma pasūtījums Preces, kas nav saņemtas laikā"
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Ilgums dienās
@@ -1567,7 +1579,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Normatīvā informācija un cita vispārīga informācija par jūsu piegādātāju
 DocType: Item Default,Default Selling Cost Center,Noklusējuma pārdošanas izmaksu centrs
 DocType: Sales Partner,Address & Contacts,Adrese un kontakti
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, iestatiet numerācijas sērijas apmeklējumam, izmantojot iestatījumu&gt; Numerācijas sērija"
 DocType: Subscriber,Subscriber,Abonents
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) nav noliktavā
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,"Lūdzu, vispirms atlasiet Posting Date"
@@ -1578,7 +1589,7 @@
 DocType: Detected Disease,Tasks Created,"Uzdevumi, kas izveidoti"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Šim vienumam vai tā veidnei jābūt aktīvai BOM ({0})
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Komisijas likme%
-DocType: Service Level,Response Time,Reakcijas laiks
+DocType: Service Level Priority,Response Time,Reakcijas laiks
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce iestatījumi
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Daudzumam jābūt pozitīvam
 DocType: Contract,CRM,CRM
@@ -1595,7 +1606,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Darījumu datu kartēšana
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Vadītājam ir nepieciešams personas vārds vai organizācijas nosaukums
 DocType: Student,Guardians,Aizbildņi
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, iestatiet instruktora nosaukumu sistēmu izglītībā&gt; Izglītības iestatījumi"
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Atlasiet zīmolu ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Vidējie ienākumi
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
@@ -1632,6 +1642,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Apmeklējuma ieraksts {0} pastāv pret studentu {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Darījuma datums
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Atcelt abonēšanu
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Nevarēja iestatīt pakalpojuma līmeņa līgumu {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Neto alga
 DocType: Account,Liability,Atbildība
 DocType: Employee,Bank A/C No.,Bankas A / C numurs
@@ -1697,7 +1708,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielu postenis
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 DocType: Fees,Student Email,Studentu e-pasts
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM recursion: {0} nevar būt vecāks vai bērns no {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Saņemiet vienumus no veselības aprūpes pakalpojumiem
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Krājuma ieraksts {0} netiek iesniegts
 DocType: Item Attribute Value,Item Attribute Value,Vienuma atribūtu vērtība
@@ -1722,7 +1732,6 @@
 DocType: Production Plan,Select Items to Manufacture,"Izvēlieties vienumus, kurus vēlaties ražot"
 DocType: Leave Application,Leave Approver Name,Atstājiet apstiprinājuma nosaukumu
 DocType: Shareholder,Shareholder,Akcionārs
-DocType: Issue,Agreement Status,Līguma statuss
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Noklusējuma iestatījumi darījumu pārdošanai.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,"Lūdzu, izvēlieties studentu uzņemšanu, kas ir obligāta apmaksātā studenta pieteikuma iesniedzējam"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Izvēlieties BOM
@@ -1983,6 +1992,7 @@
 DocType: Account,Income Account,Ienākumu konts
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Visas noliktavas
 DocType: Contract,Signee Details,Signee Details
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Atļaut izrakstīšanos pēc maiņas beigu laika (minūtēs)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Iepirkums
 DocType: Item Group,Check this if you want to show in website,"Pārbaudiet, vai vēlaties parādīt vietnē"
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Fiskālais gads {0} nav atrasts
@@ -2049,6 +2059,7 @@
 DocType: Activity Cost,Billing Rate,Norēķinu likme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Brīdinājums: vēl {0} # {1} pastāv pret krājumu ierakstu {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,"Lūdzu, iespējojiet Google Maps iestatījumus, lai novērtētu un optimizētu maršrutus"
+DocType: Purchase Invoice Item,Page Break,Lapas pārtraukums
 DocType: Supplier Scorecard Criteria,Max Score,Maksimālais punktu skaits
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Atmaksāšanas sākuma datums nevar būt pirms izmaksas datuma.
 DocType: Support Search Source,Support Search Source,Atbalsta meklēšanas avots
@@ -2117,6 +2128,7 @@
 DocType: Employee Transfer,Employee Transfer,Darbinieku pārcelšana
 ,Sales Funnel,Tirdzniecības piltuve
 DocType: Agriculture Analysis Criteria,Water Analysis,Ūdens analīze
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Sāciet reģistrēšanos pirms maiņas sākuma laika (minūtēs)
 DocType: Accounts Settings,Accounts Frozen Upto,Konti iesaldēti Upto
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Nekas nav rediģējams.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Darbība {0} ilgāk nekā jebkurā darba vietā {1} pieejamā darba stunda, sadaliet darbību vairākās operācijās"
@@ -2130,7 +2142,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Pārdošanas pasūtījums {0} ir {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Maksājuma aizkavēšanās (dienas)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Ievadiet informāciju par amortizāciju
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Klientu PO
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Paredzamajam piegādes datumam jābūt pēc pārdošanas pasūtījuma datuma
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Vienuma daudzums nevar būt nulle
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Nederīgs atribūts
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},"Lūdzu, atlasiet BOM pret vienumu {0}"
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Rēķina veids
@@ -2140,6 +2154,7 @@
 DocType: Volunteer,Afternoon,Pēcpusdiena
 DocType: Vital Signs,Nutrition Values,Uztura vērtības
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),"Drudzis (temp&gt; 38,5 ° C / 101,3 ° F vai ilgstoša temperatūra&gt; 38 ° C / 100,4 ° F)"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, iestatiet darbinieku nosaukumu sistēmu cilvēkresursu&gt; HR iestatījumos"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ITC mainīts
 DocType: Project,Collect Progress,Savākt progresu
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Enerģija
@@ -2190,6 +2205,7 @@
 ,Ordered Items To Be Billed,"Pasūtītie vienumi, kas jāapmaksā"
 DocType: Taxable Salary Slab,To Amount,Uz summu
 DocType: Purchase Invoice,Is Return (Debit Note),Vai atgriešanās (debeta piezīme)
+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/config/desktop.py,Getting Started,Darba sākšana
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Apvienot
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,"Nevar mainīt fiskālā gada sākuma datumu un fiskālā gada beigu datumu, kad tiek saglabāts fiskālais gads."
@@ -2208,8 +2224,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšanas sākuma datums nevar būt pirms sērijas Nr. {0} piegādes datuma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Rinda {0}: valūtas kurss ir obligāts
 DocType: Purchase Invoice,Select Supplier Address,Izvēlieties piegādātāja adresi
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Pieejamais daudzums ir {0}, jums ir nepieciešams {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,"Lūdzu, ievadiet API patērētāju noslēpumu"
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programmas reģistrācijas maksa
+DocType: Employee Checkin,Shift Actual End,Shift faktiskais beigas
 DocType: Serial No,Warranty Expiry Date,Garantijas termiņa beigu datums
 DocType: Hotel Room Pricing,Hotel Room Pricing,Viesnīcas numura cenas
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Ārējie nodokļi, kas apliekami ar nodokli (izņemot nulles nominālvērtību, nulli un atbrīvoti no nodokļa)"
@@ -2269,6 +2287,7 @@
 DocType: Quality Inspection Reading,Reading 5,Lasīšana 5
 DocType: Shopping Cart Settings,Display Settings,Displeja iestatījumi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,"Lūdzu, norādiet rezervēto nolietojumu skaitu"
+DocType: Shift Type,Consequence after,Sekas pēc
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Kam tev vajag palīdzību?
 DocType: Journal Entry,Printing Settings,Drukāšanas iestatījumi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Banku darbība
@@ -2278,6 +2297,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Norēķinu adrese ir tāda pati kā piegādes adrese
 DocType: Account,Cash,Nauda
 DocType: Employee,Leave Policy,Atstāt politiku
+DocType: Shift Type,Consequence,Sekas
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Studentu adrese
 DocType: GST Account,CESS Account,CESS konts
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: izmaksu centrs ir nepieciešams kontam “Peļņa un zaudējumi” {2}. Lūdzu, iestatiet uzņēmumam noklusējuma izmaksu centru."
@@ -2342,6 +2362,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Perioda slēgšanas kupons
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 nosaukums
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,"Lūdzu, ievadiet izdevumu kontu"
+DocType: Issue,Resolution By Variance,Izšķirtspēja
 DocType: Employee,Resignation Letter Date,Atteikšanās vēstules datums
 DocType: Soil Texture,Sandy Clay,Sandy Clay
 DocType: Upload Attendance,Attendance To Date,Dalība datumā
@@ -2354,6 +2375,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Skatīt tūlīt
 DocType: Item Price,Valid Upto,Valid Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Atsauces dokumenta tipam jābūt {0}
+DocType: Employee Checkin,Skip Auto Attendance,Izlaist automātisko apmeklējumu
 DocType: Payment Request,Transaction Currency,Darījuma valūta
 DocType: Loan,Repayment Schedule,Atmaksas grafiks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Izveidot parauga saglabāšanas krājumu ierakstu
@@ -2425,6 +2447,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS slēgšanas kuponu nodokļi
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Darbība ir inicializēta
 DocType: POS Profile,Applicable for Users,Piemērojams lietotājiem
+,Delayed Order Report,Atliktā pasūtījuma ziņojums
 DocType: Training Event,Exam,Eksāmens
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,"Atrasts nepareizs ģenerālgrāmatu ierakstu skaits. Iespējams, ka esat atlasījis nepareizu kontu."
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Pārdošanas cauruļvads
@@ -2439,10 +2462,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Nosacījumi tiks piemēroti visiem atlasītajiem vienumiem.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Konfigurēt
 DocType: Hotel Room,Capacity,Jauda
+DocType: Employee Checkin,Shift End,Shift beigas
 DocType: Installation Note Item,Installed Qty,Instalētais daudzums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Partija {0} no vienuma {1} ir atspējota.
 DocType: Hotel Room Reservation,Hotel Reservation User,Viesnīcas rezervācijas lietotājs
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Darba diena ir atkārtota divas reizes
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Pakalpojuma līmeņa līgums ar entītijas veidu {0} un entītija {1} jau pastāv.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},"Vienuma grupa, kas nav pieminēta vienuma kapteiņā vienumam {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Nosaukuma kļūda: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Teritorija ir nepieciešama POS profilā
@@ -2490,6 +2514,7 @@
 DocType: Depreciation Schedule,Schedule Date,Kalendāra datums
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars
 DocType: Job Applicant,Job Opening,Darba atvēršana
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,"Pēdējā zināma veiksmīga darbinieku reģistrēšanās sinhronizācija. Atiestatiet to tikai tad, ja esat pārliecināts, ka visi žurnāli tiek sinhronizēti no visām vietām. Lūdzu, neizmainiet to, ja neesat pārliecināts."
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Faktiskās izmaksas
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Kopējais avanss ({0}) pret pasūtījumu {1} nevar būt lielāks par Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Atjaunināti vienuma varianti
@@ -2534,6 +2559,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Get Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Ir importēti dienas grāmatu dati
 ,Sales Partners Commission,Pārdošanas partneru komisija
+DocType: Shift Type,Enable Different Consequence for Early Exit,Iespējot dažādas sekas agrīnai izejai
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Juridiskā
 DocType: Loan Application,Required by Date,Nepieciešams pēc datuma
 DocType: Quiz Result,Quiz Result,Viktorīna rezultāts
@@ -2592,7 +2618,6 @@
 DocType: Pricing Rule,Pricing Rule,Cenu noteikšanas noteikums
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Izvēles brīvdienu saraksts nav noteikts atvaļinājuma periodam {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Lūdzu, iestatiet lietotāja ID lauku darbinieka ierakstā, lai iestatītu darbinieku lomu"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Laiks atrisināt
 DocType: Training Event,Training Event,Apmācības pasākums
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Parastais asinsspiediens pieaugušajiem pieaugušajiem ir aptuveni 120 mmHg sistoliskais un 80 mmHg diastoliskais, saīsināts &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,"Sistēma ielādēs visus ierakstus, ja robežvērtība ir nulle."
@@ -2635,6 +2660,7 @@
 DocType: Student Applicant,Approved,Apstiprināts
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},"No datuma jābūt fiskālajā gadā. Pieņemot, ka no datuma = {0}"
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Pirkšanas iestatījumos iestatiet piegādātāju grupu.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} ir nederīgs apmeklējuma statuss.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Pagaidu atvēršanas konts
 DocType: Purchase Invoice,Cash/Bank Account,Naudas / bankas konts
 DocType: Quality Meeting Table,Quality Meeting Table,Kvalitātes sanāksmju tabula
@@ -2670,6 +2696,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabaka"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Kursa grafiks
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Vienība Wise Tax Detail
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Dalība tiks atzīmēta automātiski tikai pēc šī datuma.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,"Izejmateriāli, kas izgatavoti no UIN turētājiem"
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Cenu pieprasījums
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,"Pēc ierakstu veikšanas, izmantojot citu valūtu, nevar mainīt valūtu"
@@ -2718,7 +2745,6 @@
 DocType: Item,Is Item from Hub,Vai vienums no Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Kvalitātes procedūra.
 DocType: Share Balance,No of Shares,Akciju skaits
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rinda {0}: daudzums nav pieejams {4} noliktavā {1} ieraksta nosūtīšanas laikā ({2} {3})
 DocType: Quality Action,Preventive,Profilakse
 DocType: Support Settings,Forum URL,Foruma URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Darbinieku un apmeklējumu skaits
@@ -2940,7 +2966,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Noklusējuma nodokļi un maksas
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Tas ir balstīts uz darījumiem pret šo piegādātāju. Sīkāku informāciju skatīt zemāk
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Maximum benefit amount of employee {0} exceeds {1},Maksimālais darbinieka {0} pabalsta apmērs pārsniedz {1}
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Ievadiet Līguma sākuma un beigu datumu.
 DocType: Delivery Note Item,Against Sales Invoice,Pret pārdošanas rēķinu
 DocType: Loyalty Point Entry,Purchase Amount,Pirkuma summa
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost as Sales Order.
@@ -2964,7 +2989,7 @@
 DocType: Lead,Organization Name,Organizācijas nosaukums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Kumulatīvam ir obligāti derīgi un derīgi lauki
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Rinda Nr. {0}: partijas Nr. Jābūt vienādam ar {1} {2}
-DocType: Employee,Leave Details,Atstājiet informāciju
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Krājumu darījumi pirms {0} ir iesaldēti
 DocType: Driver,Issuing Date,Izdošanas datums
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Pieprasītājs
@@ -3009,9 +3034,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Naudas plūsmas kartēšanas veidnes dati
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Pieņemšana darbā un apmācība
 DocType: Drug Prescription,Interval UOM,Interval UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Automātiskās apmeklētības labvēlības perioda iestatījumi
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,No Valūtas un Valūtas nevar būt vienāds
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Farmācija
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Atbalsta stundas
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} tiek atcelts vai slēgts
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rinda {0}: avansam pret Klientu jābūt kredītiem
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Grupas pa kuponiem (konsolidēti)
@@ -3121,6 +3148,7 @@
 DocType: Territory,Territory Manager,Teritorijas pārvaldnieks
 DocType: Lab Test,Sample ID,Parauga ID
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Grozs ir tukšs
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Apmeklējums ir atzīmēts kā darbinieku reģistrēšanās
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Jāiesniedz {0} aktīvs
 ,Absent Student Report,Studentu ziņojuma trūkums
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Iekļauts bruto peļņā
@@ -3128,7 +3156,9 @@
 DocType: Travel Request Costing,Funded Amount,Finansētā summa
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} nav iesniegts, tāpēc darbību nevar pabeigt"
 DocType: Subscription,Trial Period End Date,Izmēģinājuma perioda beigu datums
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Mainot ierakstus kā IN un OUT vienas maiņas laikā
 DocType: BOM Update Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja veids
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,5. punkts
 DocType: Employee,Passport Number,Pases numurs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Pagaidu atvēršana
@@ -3244,6 +3274,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Iespējamais piegādātājs
 ,Issued Items Against Work Order,Izdoti priekšmeti pret darba kārtību
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Rēķina izveide {0}
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, iestatiet instruktora nosaukumu sistēmu izglītībā&gt; Izglītības iestatījumi"
 DocType: Student,Joining Date,Pievienošanās datums
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Pieprasītā vietne
 DocType: Purchase Invoice,Against Expense Account,Pret izdevumu rēķinu
@@ -3283,6 +3314,7 @@
 DocType: Landed Cost Item,Applicable Charges,Piemērojamās maksas
 ,Point of Sale,Tirdzniecības vieta
 DocType: Authorization Rule,Approving User  (above authorized value),Lietotāja apstiprināšana (virs atļautās vērtības)
+DocType: Service Level Agreement,Entity,Uzņēmums
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} tika pārvietota no {2} uz {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Klients {0} nepieder pie projekta {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,No partijas nosaukuma
@@ -3329,6 +3361,7 @@
 DocType: Soil Texture,Sand Composition (%),Smilšu sastāvs (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Importēt dienas grāmatu datus
+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 nosaukuma sēriju {0}, izmantojot iestatījumu&gt; Iestatījumi&gt; Nosaukumu sērija"
 DocType: Asset,Asset Owner Company,Asset Owner Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Izdevumu izmaksu rezervēšanai ir nepieciešams izmaksu centrs
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} derīgs sērijas Nr. Vienumam {1}
@@ -3388,7 +3421,6 @@
 DocType: Asset,Asset Owner,Aktīvu īpašnieks
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Noliktava ir obligāta {0} rindas {1} rindā
 DocType: Stock Entry,Total Additional Costs,Kopējās papildu izmaksas
-DocType: Marketplace Settings,Last Sync On,Pēdējā sinhronizācija ieslēgta
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Tabulā Nodokļi un maksas iestatiet vismaz vienu rindu
 DocType: Asset Maintenance Team,Maintenance Team Name,Apkopes komandas nosaukums
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Izmaksu centru diagramma
@@ -3404,12 +3436,12 @@
 DocType: Job Card,WIP Warehouse,WIP noliktava
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ -YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},Lietotāja ID nav iestatīts darbiniekam {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Pieejams daudzums ir {0}, jums ir nepieciešams {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Lietotājs {0} izveidots
 DocType: Stock Settings,Item Naming By,Vienuma nosaukums ar
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Pasūtīts
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Tā ir sakņu klientu grupa un to nevar rediģēt.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Materiāla pieprasījums {0} tiek atcelts vai apturēts
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Stingri jābalstās uz žurnāla veidu darbinieka pārbaudē
 DocType: Purchase Order Item Supplied,Supplied Qty,Piegādāts daudzums
 DocType: Cash Flow Mapper,Cash Flow Mapper,Naudas plūsmas karte
 DocType: Soil Texture,Sand,Smiltis
@@ -3468,6 +3500,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Objektu grupas tabulā ir dublēta vienumu grupa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Gada alga
 DocType: Supplier Scorecard,Weighting Function,Svēruma funkcija
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM reklāmguvumu koeficients ({0} -&gt; {1}) nav atrasts vienumam: {2}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,"Novērtējot kritēriju formulu, radās kļūda"
 ,Lab Test Report,Lab testa ziņojums
 DocType: BOM,With Operations,Ar operācijām
@@ -3481,6 +3514,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Žurnāla ierakstam nav pieejami atmaksājumi
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} ir neaktīvs students
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Veikt krājumu ierakstu
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},BOM recursion: {0} nevar būt vecāks vai bērns no {1}
 DocType: Employee Onboarding,Activities,Darbības
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Viena noliktava ir obligāta
 ,Customer Credit Balance,Klientu kredīta atlikums
@@ -3493,9 +3527,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,"Vairākas lojalitātes programmas, kas atrodamas Klientam. Lūdzu, atlasiet manuāli."
 DocType: Patient,Medication,Zāles
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Izvēlieties Lojalitātes programmu
+DocType: Employee Checkin,Attendance Marked,Apmeklējums atzīmēts
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Izejvielas
 DocType: Sales Order,Fully Billed,Pilnībā uzpildīts
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Lūdzu, iestatiet viesnīcas numura cenu {}"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Atlasiet tikai vienu prioritāti kā noklusējumu.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},"Lūdzu, identificējiet / izveidojiet kontu (Ledger) tipam - {0}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Kopējai kredīta / debeta summai vajadzētu būt vienādai ar saistīto žurnāla ierakstu
 DocType: Purchase Invoice Item,Is Fixed Asset,Vai Fiksētie aktīvi
@@ -3516,6 +3552,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Iecelšanas apstiprinājums
 DocType: Shopping Cart Settings,Orders,Pasūtījumi
 DocType: HR Settings,Retirement Age,Pensijas vecums
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, iestatiet numerācijas sērijas apmeklējumam, izmantojot iestatījumu&gt; Numerācijas sērija"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js,Projected Qty,Plānotais daudzums
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Dzēšana nav atļauta valstī {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},# {0} rinda: aktīvs {1} jau ir {2}
@@ -3599,11 +3636,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Grāmatvedis
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS slēgšanas kupons alreday pastāv {0} starp datumu {1} un {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Navigācija
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Nevienam neapmaksātam rēķinam nav nepieciešama valūtas kursa pārvērtēšana
 DocType: Authorization Rule,Customer / Item Name,Klienta / vienuma nosaukums
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Jaunajam sērijas numuram nevar būt noliktava. Noliktava ir jānosaka ar krājumu ierakstu vai pirkuma kvīti
 DocType: Issue,Via Customer Portal,Izmantojot klientu portālu
 DocType: Work Order Operation,Planned Start Time,Plānotais sākuma laiks
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ir {2}
+DocType: Service Level Priority,Service Level Priority,Pakalpojumu līmeņa prioritāte
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervēto nolietojumu skaits nedrīkst būt lielāks par kopējo nolietojumu skaitu
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Share Ledger
 DocType: Journal Entry,Accounts Payable,Debitoru parādi
@@ -3714,7 +3753,6 @@
 DocType: Delivery Note,Delivery To,Piegāde līdz
 DocType: Bank Statement Transaction Settings Item,Bank Data,Bankas dati
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Plānotais Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,"Saglabājiet norēķinu stundas un darba stundas, kas norādītas laika kontrolsarakstā"
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Track Leads ar Lead Source.
 DocType: Clinical Procedure,Nursing User,Aprūpes lietotājs
 DocType: Support Settings,Response Key List,Atbildes atslēgu saraksts
@@ -3882,6 +3920,7 @@
 DocType: Work Order Operation,Actual Start Time,Faktiskais sākuma laiks
 DocType: Antibiotic,Laboratory User,Laboratorijas lietotājs
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Tiešsaistes izsoles
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Prioritāte {0} ir atkārtota.
 DocType: Fee Schedule,Fee Creation Status,Maksas izveides statuss
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Programmatūras
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Pārdošanas pasūtījums maksājumam
@@ -3948,6 +3987,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Nevarēja iegūt informāciju par {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Norēķinu valūtai jābūt vienādai ar noklusējuma uzņēmuma valūtas vai partijas konta valūtu
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,"Lūdzu, ievadiet šīs pārdošanas personas darbinieku ID"
+DocType: Shift Type,Early Exit Consequence after,Agrās izejas sekas pēc
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Izveidot atvēršanas pārdošanas un pirkuma rēķinus
 DocType: Disease,Treatment Period,Ārstēšanas periods
 apps/erpnext/erpnext/config/settings.py,Setting up Email,E-pasta iestatīšana
@@ -3965,7 +4005,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Studenta vārds:
 DocType: SMS Log,Sent On,Nosūtīts
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Pārdošanas rēķins
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Atbildes laiks nevar būt lielāks par izšķirtspējas laiku
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",Kursa studentu grupai kurss tiks apstiprināts katram studentam no uzņemto kursu programmas uzņemšanas kursos.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Valsts iekšējās piegādes
 DocType: Employee,Create User Permission,Izveidot lietotāja atļauju
@@ -4004,6 +4043,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Standarta līguma pārdošanas noteikumi vai pirkuma noteikumi.
 DocType: Sales Invoice,Customer PO Details,Klienta PO informācija
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacients nav atrasts
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Izvēlieties noklusējuma prioritāti.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,"Noņemiet vienumu, ja maksa nav attiecināma uz šo vienumu"
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Klientu grupa pastāv ar tādu pašu nosaukumu, lūdzu, nomainiet Klienta nosaukumu vai pārdēvējiet klientu grupu"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4043,6 +4083,7 @@
 DocType: Support Settings,Support Portal,Atbalsta portāls
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,<b>{0}</b> uzdevuma beigu datums nevar būt mazāks par <b>{1}</b> paredzamo sākuma datumu <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Darbinieks {0} ir palicis atvaļinājumā {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Šis Pakalpojumu līmeņa līgums ir specifisks klientam {0}
 DocType: Employee,Held On,Tiek turēts
 DocType: Healthcare Practitioner,Practitioner Schedules,Praktizētāju grafiki
 DocType: Project Template Task,Begin On (Days),Sākt (dienas)
@@ -4050,6 +4091,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Darba kārtība ir {0}
 DocType: Inpatient Record,Admission Schedule Date,Uzņemšanas grafiks Datums
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Aktīvu vērtības korekcija
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,"Atzīmēt apmeklējumu, pamatojoties uz darbiniekiem, kas norīkoti šajā maiņā."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,"Piegādes, kas veiktas nereģistrētām personām"
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Visas darba vietas
 DocType: Appointment Type,Appointment Type,Iecelšanas veids
@@ -4162,7 +4204,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Iepakojuma bruto svars. Parasti neto svars + iepakojuma materiāla svars. (drukāšanai)
 DocType: Plant Analysis,Laboratory Testing Datetime,Laboratorijas testēšana Datetime
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Vienumam {0} nevar būt partijas
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Pārdošanas cauruļvads pa posmiem
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Studentu grupas spēks
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Bankas izraksta darījums
 DocType: Purchase Order,Get Items from Open Material Requests,Saņemt vienumus no atvērtajiem materiāliem
@@ -4244,7 +4285,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Parādiet novecošanās noliktavu
 DocType: Sales Invoice,Write Off Outstanding Amount,Izrakstiet izcilu summu
 DocType: Payroll Entry,Employee Details,Darbinieku informācija
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Sākuma laiks nevar būt lielāks par {0} beigu laiku.
 DocType: Pricing Rule,Discount Amount,Atlaide
 DocType: Healthcare Service Unit Type,Item Details,Vienuma informācija
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Dublikāta {0} nodokļu deklarācija periodam {1}
@@ -4297,7 +4337,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Neto atalgojums nevar būt negatīvs
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Mijiedarbību skaits
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},{0} # postenis {1} nevar tikt pārsūtīts vairāk kā {2} pret pirkuma pasūtījumu {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Kontu un pušu apstrādes diagramma
 DocType: Stock Settings,Convert Item Description to Clean HTML,Konvertēt vienuma aprakstu uz tīru HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Visas piegādātāju grupas
@@ -4368,6 +4408,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Vecāku apkalpošanas nodaļa
 DocType: Sales Invoice,Include Payment (POS),Iekļaut maksājumu (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Privātais kapitāls
+DocType: Shift Type,First Check-in and Last Check-out,Pirmā reģistrēšanās un pēdējā izrakstīšanās
 DocType: Landed Cost Item,Receipt Document,Saņemšanas dokuments
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Piegādātāja rezultātu kartes periods
 DocType: Employee Grade,Default Salary Structure,Noklusējuma algu struktūra
@@ -4450,6 +4491,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Izveidot pirkuma pasūtījumu
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Definējiet finanšu gadu budžetu.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Kontu tabula nevar būt tukša.
+DocType: Employee Checkin,Entry Grace Period Consequence,Ieejas labvēlības perioda sekas
 ,Payment Period Based On Invoice Date,"Maksājuma periods, pamatojoties uz rēķina datumu"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Uzstādīšanas datums nevar būt pirms {0} vienuma piegādes datuma
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Saite uz materiālu pieprasījumu
@@ -4458,6 +4500,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: šai noliktavai jau ir kārtas ieraksts {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Doc Datums
 DocType: Monthly Distribution,Distribution Name,Izplatīšanas nosaukums
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Darba diena {0} ir atkārtota.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,"Grupa grupai, kas nav grupa"
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Notiek atjaunināšana. Tas var aizņemt kādu laiku.
 DocType: Item,"Example: ABCD.#####
@@ -4470,6 +4513,7 @@
 DocType: Vehicle Log,Fuel Qty,Degvielas daudzums
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Mobilais Nr
 DocType: Invoice Discounting,Disbursed,Izmaksāts
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"Laiks pēc maiņas beigām, kurā tiek pārbaudīta izbraukšana."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Neto konta neto izmaiņas
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Nav pieejams
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Nepilna laika darbs
@@ -4483,7 +4527,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Rādīt PDC Print
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Shopify piegādātājs
 DocType: POS Profile User,POS Profile User,POS profila lietotājs
-DocType: Student,Middle Name,Otrais vārds
 DocType: Sales Person,Sales Person Name,Pārdošanas personas vārds
 DocType: Packing Slip,Gross Weight,Bruto svars
 DocType: Journal Entry,Bill No,Bill Nr
@@ -4492,7 +4535,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Pakalpojumu līmeņa vienošanās
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,"Lūdzu, vispirms atlasiet Darbinieks un Datums"
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,"Vienības novērtēšanas likme tiek pārrēķināta, ņemot vērā izkrauto izmaksu kuponu summu"
 DocType: Timesheet,Employee Detail,Darbinieku informācija
 DocType: Tally Migration,Vouchers,Kuponi
@@ -4527,7 +4569,7 @@
 DocType: Additional Salary,Date on which this component is applied,"Datums, kad šo komponentu piemēro"
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Pieejamo akcionāru saraksts ar folio numuriem
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Iestatīt vārtejas vārdus.
-DocType: Service Level,Response Time Period,Atbildes laika periods
+DocType: Service Level Priority,Response Time Period,Atbildes laika periods
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkuma nodokļi un maksājumi
 DocType: Course Activity,Activity Date,Darbības datums
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Atlasiet vai pievienojiet jaunu klientu
@@ -4552,6 +4594,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Finansiālais gads
 DocType: Sales Invoice Item,Deferred Revenue,Atliktie ieņēmumi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Jāizvēlas viens no pārdošanas vai pirkšanas darījumiem
+DocType: Shift Type,Working Hours Threshold for Half Day,Darba stundu slieksnis pusdienām
 ,Item-wise Purchase History,Iepirkuma vēsture
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Nevar mainīt pakalpojuma beigu datumu vienumam {0}
 DocType: Production Plan,Include Subcontracted Items,Iekļaujiet apakšlīgumus
@@ -4583,6 +4626,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Atļaut pašus vienumus vairākas reizes
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Izveidot BOM
 DocType: Healthcare Practitioner,Charges,Maksa
+DocType: Employee,Attendance and Leave Details,Apmeklējums un informācijas atstāšana
 DocType: Student,Personal Details,Personas dati
 DocType: Sales Order,Billing and Delivery Status,Norēķinu un piegādes statuss
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,"Rinda {0}: Lai nosūtītu e-pastu, piegādātājam {0} ir nepieciešama e-pasta adrese"
@@ -4634,7 +4678,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Ievadiet vērtību {0} un {1}
 DocType: Purchase Order,Order Confirmation Date,Pasūtījuma apstiprināšanas datums
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Aprēķināt paredzamo ierašanās laiku
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, iestatiet darbinieku nosaukumu sistēmu cilvēkresursu&gt; HR iestatījumos"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Patēriņš
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS - .YYYY.-
 DocType: Subscription,Subscription Start Date,Abonēšanas sākuma datums
@@ -4657,7 +4700,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Žurnāla ievades konts
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Variants
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Foruma aktivitāte
-DocType: Service Level,Resolution Time Period,Izšķirtspējas laiks
+DocType: Service Level Priority,Resolution Time Period,Izšķirtspējas laiks
 DocType: Request for Quotation,Supplier Detail,Piegādātāja informācija
 DocType: Project Task,View Task,Skatīt uzdevumu
 DocType: Serial No,Purchase / Manufacture Details,Iegādes / izgatavošanas detaļas
@@ -4724,6 +4767,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Noliktavu var mainīt tikai ar akciju ierakstu / piegādes norādi / pirkuma kvīti
 DocType: Support Settings,Close Issue After Days,Aizvērt problēmu pēc dienām
 DocType: Payment Schedule,Payment Schedule,Maksājumu grafiks
+DocType: Shift Type,Enable Entry Grace Period,Iespējot ieceļošanas labvēlības periodu
 DocType: Patient Relation,Spouse,Laulātais
 DocType: Purchase Invoice,Reason For Putting On Hold,Aizturēšanas iemesls
 DocType: Item Attribute,Increment,Pieaugums
@@ -4862,6 +4906,7 @@
 DocType: Vehicle Log,Invoice Ref,Rēķina atsauce
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-veidlapa nav piemērojama rēķinam: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Rēķins ir izveidots
+DocType: Shift Type,Early Exit Grace Period,Early Exit Grace Periods
 DocType: Patient Encounter,Review Details,Pārskatiet informāciju
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Rinda {0}: Stundu vērtībai jābūt lielākai par nulli.
 DocType: Account,Account Number,Konta numurs
@@ -4873,7 +4918,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Piemērojams, ja uzņēmums ir SpA, SApA vai SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Starp:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Apmaksāts un netiek piegādāts
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,"Vienuma kods ir obligāts, jo vienums netiek automātiski numurēts"
 DocType: GST HSN Code,HSN Code,HSN kods
 DocType: GSTR 3B Report,September,Septembris
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Administratīvie izdevumi
@@ -4918,6 +4962,7 @@
 DocType: Opportunity,Sales Stage,Pārdošanas posms
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Vārdi būs redzami, kad būsit saglabājis pārdošanas pasūtījumu."
 DocType: Item Reorder,Re-order Level,Atkārtoti pasūtīt līmeni
+DocType: Shift Type,Enable Auto Attendance,Iespējot automātisko apmeklējumu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Priekšroka
 ,Department Analytics,Departamenta analītika
 DocType: Crop,Scientific Name,Zinātniskais nosaukums
@@ -4930,6 +4975,7 @@
 DocType: Quiz Activity,Quiz Activity,Viktorīna aktivitāte
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} nav derīgā algas periodā
 DocType: Timesheet,Billed,Norēķini
+apps/erpnext/erpnext/config/support.py,Issue Type.,Emisijas veids.
 DocType: Restaurant Order Entry,Last Sales Invoice,Pēdējais pārdošanas rēķins
 DocType: Payment Terms Template,Payment Terms,Maksājuma nosacījumi
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Rezervēts Daudzums: Pārdošanai pasūtītais daudzums, bet nav piegādāts."
@@ -5025,6 +5071,7 @@
 DocType: Account,Asset,Aktīvs
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} nav veselības aprūpes speciālista grafika. Pievienojiet to veselības aprūpes speciālista meistaram
 DocType: Vehicle,Chassis No,Šasijas Nr
+DocType: Employee,Default Shift,Noklusējuma maiņa
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Uzņēmuma saīsinājums
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Materiālu kopums
 DocType: Article,LMS User,LMS lietotājs
@@ -5073,6 +5120,7 @@
 DocType: Sales Person,Parent Sales Person,Vecāku pārdošanas persona
 DocType: Student Group Creation Tool,Get Courses,Iegūstiet kursus
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rinda # {0}: daudzumam jābūt 1, jo vienums ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu vairākiem daudzumiem."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),"Darba laiks, zem kura ir atzīmēts trūkums. (Nulle, lai atspējotu)"
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Darījumā var izmantot tikai lapu mezglus
 DocType: Grant Application,Organization,Organizācija
 DocType: Fee Category,Fee Category,Maksa kategorija
@@ -5085,6 +5133,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,"Lūdzu, atjauniniet savu apmācību pasākuma statusu"
 DocType: Volunteer,Morning,Rīts
 DocType: Quotation Item,Quotation Item,Citātu postenis
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Emisijas prioritāte.
 DocType: Journal Entry,Credit Card Entry,Kredītkaršu ievadīšana
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Laika niša ir izlaista, slots {0} līdz {1} pārklājas ar pašreizējo slotu {2} uz {3}"
 DocType: Journal Entry Account,If Income or Expense,Ja ienākumi vai izdevumi
@@ -5135,11 +5184,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Datu importēšana un iestatījumi
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Ja tiek pārbaudīta automātiskā atlase, klienti tiks automātiski saistīti ar attiecīgo lojalitātes programmu (saglabājot)"
 DocType: Account,Expense Account,Izdevumu konts
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,"Laiks pirms maiņas sākuma laika, kurā tiek uzskatīts, ka apmeklējums ir reģistrēts."
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Saistība ar Guardian1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Izveidot rēķinu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Maksājuma pieprasījums jau pastāv {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',"Darbiniekam, kurš atbrīvots no {0}, jābūt iestatītam kā “Kreisais”"
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Maksājiet {0} {1}
+DocType: Company,Sales Settings,Pārdošanas iestatījumi
 DocType: Sales Order Item,Produced Quantity,Ražots daudzums
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,"Piedāvājuma pieprasījumam var piekļūt, noklikšķinot uz šādas saites"
 DocType: Monthly Distribution,Name of the Monthly Distribution,Mēneša sadalījuma nosaukums
@@ -5218,6 +5269,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Tiek izveidotas noklusējuma nodokļu veidnes pārdošanai un pirkšanai.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Atvaļinājuma veidu {0} nevar pārnest
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Debetam kontam jābūt debitoru kontam
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Līguma beigu datums nevar būt mazāks par šodienu.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},"Lūdzu, iestatiet kontu noliktavā {0} vai noklusējuma krājumu kontā uzņēmumā {1}"
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Iestatīta pēc noklusējuma
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Šī iepakojuma neto svars. (aprēķināts automātiski kā vienību neto svara summa)
@@ -5244,8 +5296,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Beidzās partijas
 DocType: Shipping Rule,Shipping Rule Type,Piegādes noteikumu veids
 DocType: Job Offer,Accepted,Pieņemts
-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 Darbinieks <a href=""#Form/Employee/{0}"">{0},</a> lai atceltu šo dokumentu"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Jūs jau esat novērtējis vērtēšanas kritērijus {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Atlasiet Sērijas numuri
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Vecums (dienas)
@@ -5272,6 +5322,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Izvēlieties savus domēnus
 DocType: Agriculture Task,Task Name,Uzdevuma nosaukums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Krājumu ieraksti jau ir izveidoti darba kārtībai
+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 Darbinieks <a href=""#Form/Employee/{0}"">{0},</a> lai atceltu šo dokumentu"
 ,Amount to Deliver,Sniedzamā summa
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Uzņēmums {0} nepastāv
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nav saņemti materiāli materiālie pieprasījumi, kas saistīti ar norādītajiem vienumiem."
@@ -5321,6 +5373,7 @@
 DocType: Lab Prescription,Test Code,Testa kods
 DocType: Purchase Taxes and Charges,On Previous Row Total,Iepriekšējā rindā kopā
 DocType: Student,Student Email Address,Studentu e-pasta adrese
+,Delayed Item Report,Atliktā vienuma pārskats
 DocType: Academic Term,Education,Izglītība
 DocType: Supplier Quotation,Supplier Address,Piegādātāja adrese
 DocType: Salary Detail,Do not include in total,Neiekļaut kopā
@@ -5328,7 +5381,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} nepastāv
 DocType: Purchase Receipt Item,Rejected Quantity,Noraidīts daudzums
 DocType: Cashier Closing,To TIme,TIme
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM reklāmguvumu koeficients ({0} -&gt; {1}) nav atrasts vienumam: {2}
 DocType: Daily Work Summary Group User,Daily Work Summary Group User,Ikdienas darba kopsavilkums Grupas lietotājs
 DocType: Fiscal Year Company,Fiscal Year Company,Fiskālā gada uzņēmums
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Alternatīvais vienums nedrīkst būt tāds pats kā vienuma kods
@@ -5380,6 +5432,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Kavēšanās starp piegādes apstāšanos
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Iesaldēt krājumus vecākus par [dienas]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Reklāmas shēmas produktu atlaide
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Jautājuma prioritāte jau pastāv
 DocType: Account,Asset Received But Not Billed,"Aktīvs saņemts, bet nav apmaksāts"
 DocType: POS Closing Voucher,Total Collected Amount,Kopā iekasētā summa
 DocType: Course,Default Grading Scale,Noklusējuma vērtēšanas skala
@@ -5422,6 +5475,7 @@
 DocType: Contract,Fulfilment Terms,Izpildes noteikumi
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Grupai nav grupas
 DocType: Student Guardian,Mother,Māte
+DocType: Issue,Service Level Agreement Fulfilled,Ir izpildīts pakalpojumu līmeņa nolīgums
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Nodokļa atskaitīšana par nepieprasītajiem darbinieku pabalstiem
 DocType: Travel Request,Travel Funding,Ceļojumu finansēšana
 DocType: Shipping Rule,Fixed,Fiksēts
@@ -5451,10 +5505,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Neviens vienums nav atrasts.
 DocType: Item Attribute,From Range,No diapazona
 DocType: Clinical Procedure,Consumables,Izejmateriāli
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,Nepieciešama &#39;worker_field_value&#39; un &#39;timestamp&#39;.
 DocType: Purchase Taxes and Charges,Reference Row #,Atsauces rinda #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Uzņēmumā {0} iestatiet „Aktīvu nolietojuma izmaksu centru”
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,"Rinda # {0}: Maksājuma dokuments ir nepieciešams, lai pabeigtu transakciju"
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,"Noklikšķiniet uz šīs pogas, lai vilktu pārdošanas pasūtījuma datus no Amazon MWS."
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),"Darba laiks, zem kura ir atzīmēta pusdienas diena. (Nulle, lai atspējotu)"
 ,Assessment Plan Status,Novērtējuma plāna statuss
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,"Lūdzu, vispirms izvēlieties {0}"
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Iesniedziet šo, lai izveidotu darbinieku ierakstu"
@@ -5525,6 +5581,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Iestatīt Open
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Pārslēgt filtrus
 DocType: Production Plan,Material Request Detail,Materiālu pieprasījuma detaļa
+DocType: Shift Type,Process Attendance After,Procesa apmeklējums pēc
 DocType: Material Request Item,Quantity and Warehouse,Daudzums un noliktava
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Atveriet programmas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Rinda # {0}: dublikāts ierakstā {1} {2}
@@ -5582,6 +5639,7 @@
 DocType: Pricing Rule,Party Information,Informācija par partiju
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Debitori ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,Līdz šim tas nevar būt lielāks par darbinieka atbrīvošanas datumu
+DocType: Shift Type,Enable Exit Grace Period,Iespējot pārtraukšanas periodu
 DocType: Expense Claim,Employees Email Id,Darbinieku e-pasta ID
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Atjaunināt cenu no Shopify līdz ERPNext Cenrādim
 DocType: Healthcare Settings,Default Medical Code Standard,Noklusējuma medicīnas koda standarts
@@ -5612,7 +5670,6 @@
 DocType: Budget,Applicable on Material Request,Piemērojams pēc materiāla pieprasījuma
 DocType: Support Settings,Search APIs,Meklēt API
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Pārdošanas pasūtījuma procentuālā daļa
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Specifikācijas
 DocType: Purchase Invoice,Supplied Items,Piegādātās preces
 DocType: Leave Control Panel,Select Employees,Atlasiet Darbinieki
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Aizdevumā {0} izvēlieties procentu ienākumu kontu
@@ -5638,7 +5695,7 @@
 ,Supplier-Wise Sales Analytics,Piegādātāja-gudra pārdošanas analīze
 DocType: GSTR 3B Report,February,Februārī
 DocType: Appraisal,For Employee,Darbiniekam
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Faktiskais piegādes datums
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Faktiskais piegādes datums
 DocType: Sales Partner,Sales Partner Name,Pārdošanas partnera nosaukums
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,Nolietojuma rinda {0}: nolietojuma sākuma datums tiek ievadīts kā iepriekšējais datums
 DocType: GST HSN Code,Regional,Reģionālais
@@ -5677,6 +5734,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Piegādātāju rezultātu karte
 DocType: Travel Itinerary,Travel To,Ceļot uz
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Atzīmējiet apmeklējumu
+DocType: Shift Type,Determine Check-in and Check-out,Noteikt reģistrēšanos un izrakstīšanos
 DocType: POS Closing Voucher,Difference,Starpība
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Mazs
 DocType: Work Order Item,Work Order Item,Darba pasūtījuma postenis
@@ -5710,6 +5768,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Narkotika
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ir aizvērts
 DocType: Patient,Medical History,Medicīniskā vēsture
+DocType: Expense Claim,Expense Taxes and Charges,Izdevumu nodokļi un izmaksas
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"Dienu skaits pēc tam, kad pagājis rēķina izrakstīšanas datums, pirms abonēšanas vai abonēšanas atzīmēšanas anulēšanas neapmaksāta"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Instalācijas piezīme {0} jau ir iesniegta
 DocType: Patient Relation,Family,Ģimene
@@ -5742,7 +5801,6 @@
 DocType: Dosage Strength,Strength,Stiprums
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,"{2} vienības {1} bija nepieciešamas {2}, lai pabeigtu šo darījumu."
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,"Apakšuzņēmuma līgumi, kas balstīti uz apakšlīgumu"
-DocType: Bank Guarantee,Customer,Klients
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ja tas ir iespējots, lauka akadēmiskais termins būs obligāts programmas uzņemšanas rīkā."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","Studentu grupa, kas balstīta uz partijām, tiks apstiprināta katram studentam no programmas uzņemšanas."
 DocType: Course,Topics,Tēmas
@@ -5822,6 +5880,7 @@
 DocType: Chapter,Chapter Members,Nodaļas locekļi
 DocType: Warranty Claim,Service Address,Pakalpojuma adrese
 DocType: Journal Entry,Remark,Piezīme
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),"Rinda {0}: daudzums, kas nav pieejams {4} noliktavā {1} pēc ieraksta nosūtīšanas laika ({2} {3})"
 DocType: Patient Encounter,Encounter Time,Tikšanās laiks
 DocType: Serial No,Invoice Details,Rēķina dati
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Papildu kontus var veikt grupās, bet ierakstus var veikt pret grupām, kas nav grupas"
@@ -5902,6 +5961,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Slēgšana (atvēršana + kopējais)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Kritēriju formula
 apps/erpnext/erpnext/config/support.py,Support Analytics,Atbalstīt Analytics
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Apmeklējuma ierīces ID (biometriskā / RF taga ID)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Pārskatīšana un darbība
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir iesaldēts, ierakstus drīkst ierobežot lietotājiem."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Summa pēc nolietojuma
@@ -5923,6 +5983,7 @@
 DocType: Salary Slip,Loan Repayment,Aizdevuma atmaksa
 DocType: Employee Education,Major/Optional Subjects,Galvenie / izvēles priekšmeti
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Piegādātāju adreses un kontakti
 DocType: Bank Guarantee,Bank Guarantee Type,Bankas garantijas veids
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ja atspējots, lauks “noapaļots kopā” nebūs redzams nevienā transakcijā"
 DocType: Pricing Rule,Min Amt,Min
@@ -5961,6 +6022,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Rēķina izveides rīka atvēršana
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Iekļaujiet POS darījumus
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Darbiniekam nav atrasts konkrētā darbinieku lauka vērtība. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Saņemtā summa (uzņēmuma valūta)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage ir pilna, nav saglabāts"
 DocType: Chapter Member,Chapter Member,Nodaļas loceklis
@@ -5993,6 +6055,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Nav izveidota neviena studentu grupa.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Dublējiet rindu {0} ar to pašu {1}
 DocType: Employee,Salary Details,Algas informācija
+DocType: Employee Checkin,Exit Grace Period Consequence,Iziet no žēlastības perioda sekām
 DocType: Bank Statement Transaction Invoice Item,Invoice,Rēķins
 DocType: Special Test Items,Particulars,Informācija
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,"Lūdzu, iestatiet filtru, pamatojoties uz vienumu vai noliktavu"
@@ -6094,6 +6157,7 @@
 DocType: Serial No,Out of AMC,No AMC
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešamās kvalifikācijas utt."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Kuģis uz valsti
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Vai vēlaties iesniegt materiālo pieprasījumu
 DocType: Opportunity Item,Basic Rate,Pamatlikme
 DocType: Compensatory Leave Request,Work End Date,Darba beigu datums
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Izejvielu pieprasījums
@@ -6279,6 +6343,7 @@
 DocType: Sales Order Item,Gross Profit,Bruto peļņa
 DocType: Quality Inspection,Item Serial No,Sērijas Nr
 DocType: Asset,Insurer,Apdrošinātājs
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Pirkšanas summa
 DocType: Asset Maintenance Task,Certificate Required,Nepieciešams sertifikāts
 DocType: Retention Bonus,Retention Bonus,Saglabāšanas bonuss
@@ -6394,6 +6459,8 @@
 DocType: Invoice Discounting,Sanctioned,Sankcijas
 DocType: Course Enrollment,Course Enrollment,Kursa reģistrācija
 DocType: Item,Supplier Items,Piegādātāja preces
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Sākuma laiks nevar būt lielāks vai vienāds ar beigu laiku {0}.
 DocType: Sales Order,Not Applicable,Nav piemērojams
 DocType: Support Search Source,Response Options,Atbildes opcijas
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} jābūt vērtībai starp 0 un 100
@@ -6480,7 +6547,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Pamatlīdzekļi
 DocType: Purchase Order,Ref SQ,Ref SQ
 DocType: Salary Structure,Total Earning,Kopējā peļņa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 DocType: Share Balance,From No,No Nr
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Maksājuma saskaņošanas rēķins
 DocType: Purchase Invoice,Taxes and Charges Added,Pievienoti nodokļi un maksas
@@ -6588,6 +6654,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Ignorēt cenu noteikšanas noteikumu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Ēdiens
 DocType: Lost Reason Detail,Lost Reason Detail,Zaudēts iemesls
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Tika izveidoti šādi sērijas numuri: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Klientu atsauksmes
 DocType: Serial No,Warranty / AMC Details,Garantija / AMC informācija
 DocType: Issue,Opening Time,Atvēršanas laiks
@@ -6637,6 +6704,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Uzņēmuma nosaukums nav tas pats
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Darbinieku paaugstināšanu nevar iesniegt pirms reklāmas datuma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},"Nav atļauts atjaunināt akciju darījumus, kas vecāki par {0}"
+DocType: Employee Checkin,Employee Checkin,Darbinieku pārbaude
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Sākuma datumam jābūt mazākam par {0} vienuma beigu datumu
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Izveidojiet klientu cenas
 DocType: Buying Settings,Buying Settings,Pirkšanas iestatījumi
@@ -6658,6 +6726,7 @@
 DocType: Patient,Patient Demographics,Pacientu demogrāfija
 DocType: Share Transfer,To Folio No,Uz Folio Nr
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Naudas plūsma no operācijām
+DocType: Employee Checkin,Log Type,Žurnāla veids
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvo krājumu
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Nevienam vienumam nav nekādas izmaiņas daudzumā vai vērtībā.
 DocType: Asset,Purchase Date,Pirkuma datums
@@ -6702,6 +6771,7 @@
 DocType: Vital Signs,Very Hyper,Ļoti hiper
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Izvēlieties sava uzņēmuma raksturu.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,"Lūdzu, atlasiet mēnesi un gadu"
+DocType: Service Level,Default Priority,Noklusējuma prioritāte
 DocType: Student Log,Student Log,Studentu žurnāls
 DocType: Shopping Cart Settings,Enable Checkout,Iespējot Checkout
 apps/erpnext/erpnext/config/settings.py,Human Resources,Cilvēku resursi
@@ -6730,7 +6800,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Pievienojiet Shopify ar ERPNext
 DocType: Homepage Section Card,Subtitle,Apakšvirsraksts
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja veids
 DocType: BOM,Scrap Material Cost(Company Currency),Metāllūžņu materiālu izmaksas (uzņēmuma valūta)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Piegādes piezīmi {0} nedrīkst iesniegt
 DocType: Task,Actual Start Date (via Time Sheet),Faktiskais sākuma datums (ar laika lapu)
@@ -6786,6 +6855,7 @@
 DocType: Drug Prescription,Dosage,Devas
 DocType: Cheque Print Template,Starting position from top edge,Sākuma pozīcija no augšējās malas
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Iecelšanas ilgums (min)
+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}
 DocType: Accounting Dimension,Disable,Atspējot
 DocType: Email Digest,Purchase Orders to Receive,"Iegādāties pasūtījumus, lai saņemtu"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Productions Rīkojumus nevar izvirzīt:
@@ -6801,7 +6871,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Apakšlīgumam nodotais materiāls
 DocType: Job Card,Timing Detail,Laika detaļas
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Nepieciešams
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{0} importēšana no {1}
 DocType: Job Offer Term,Job Offer Term,Darba piedāvājuma termiņš
 DocType: SMS Center,All Contact,Visi kontakti
 DocType: Project Task,Project Task,Projekta uzdevums
@@ -6852,7 +6921,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,{0} vienums nav iestatīts sērijas Nr
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,No valsts
 DocType: Leave Type,Maximum Continuous Days Applicable,Piemēro maksimālās nepārtrauktās dienas
-apps/erpnext/erpnext/config/support.py,Support Team.,Atbalsta komanda.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,"Lūdzu, vispirms ievadiet uzņēmuma nosaukumu"
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Importēt veiksmīgu
 DocType: Guardian,Alternate Number,Alternatīvais numurs
@@ -6944,6 +7012,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Rinda # {0}: pievienots vienums
 DocType: Student Admission,Eligibility and Details,Atbilstība un informācija
 DocType: Staffing Plan,Staffing Plan Detail,Personāla plāns
+DocType: Shift Type,Late Entry Grace Period,Late Entry Grace Periods
 DocType: Email Digest,Annual Income,Gada ienākumi
 DocType: Journal Entry,Subscription Section,Abonēšanas sadaļa
 DocType: Salary Slip,Payment Days,Maksājumu dienas
@@ -6993,6 +7062,7 @@
 DocType: Journal Entry Account,Account Balance,Konta atlikums
 DocType: Asset Maintenance Log,Periodicity,Periodiskums
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Medicīniskais ieraksts
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,"Žurnāla veids ir vajadzīgs, lai reģistrētos maiņās: {0}."
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Izpilde
 DocType: Item,Valuation Method,Vērtēšanas metode
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
@@ -7077,6 +7147,7 @@
 DocType: Loan Type,Loan Name,Aizdevuma nosaukums
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Iestatiet noklusējuma maksājuma veidu
 DocType: Quality Goal,Revision,Pārskatīšana
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,"Laiks pirms maiņas beigu laika, kad izrakstīšanās tiek uzskatīta par agru (minūtēs)."
 DocType: Healthcare Service Unit,Service Unit Type,Servisa vienības tips
 DocType: Purchase Invoice,Return Against Purchase Invoice,Atgriezties pret pirkuma rēķinu
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Izveidot noslēpumu
@@ -7232,12 +7303,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Kosmētika
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Pārbaudiet, vai vēlaties piespiest lietotāju izvēlēties sēriju pirms saglabāšanas. Ja jūs to pārbaudīsiet, noklusējuma nav."
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotājiem, kuriem ir šī loma, ir atļauts iestatīt iesaldētos kontus un izveidot / mainīt grāmatvedības ierakstus pret iesaldētiem kontiem"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; Vienuma grupa&gt; Zīmols
 DocType: Expense Claim,Total Claimed Amount,Kopējā pieprasītā summa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajā {0} dienā operācijai {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Ietīšana
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,"Jūs varat atjaunot tikai tad, ja jūsu dalība beidzas 30 dienu laikā"
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Vērtībai jābūt starp {0} un {1}
 DocType: Quality Feedback,Parameters,Parametri
+DocType: Shift Type,Auto Attendance Settings,Auto apmeklējuma iestatījumi
 ,Sales Partner Transaction Summary,Pārdošanas partneru darījumu kopsavilkums
 DocType: Asset Maintenance,Maintenance Manager Name,Apkopes vadītāja nosaukums
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,"Ir nepieciešams, lai ielādētu vienuma detaļas."
@@ -7328,10 +7401,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Apstipriniet lietoto noteikumu
 DocType: Job Card Item,Job Card Item,Darba kartes vienums
 DocType: Homepage,Company Tagline for website homepage,Uzņēmuma Tagline vietnes mājaslapai
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Iestatiet atbildes laiku un izšķirtspēju {0} indeksā {1}.
 DocType: Company,Round Off Cost Center,Noapaļošanas izmaksu centrs
 DocType: Supplier Scorecard Criteria,Criteria Weight,Kritēriji Svars
 DocType: Asset,Depreciation Schedules,Nolietojuma grafiki
-DocType: Expense Claim Detail,Claim Amount,Prasības summa
 DocType: Subscription,Discounts,Atlaides
 DocType: Shipping Rule,Shipping Rule Conditions,Piegādes noteikumu nosacījumi
 DocType: Subscription,Cancelation Date,Atcelšanas datums
@@ -7358,7 +7431,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Rādīt nulles vērtības
 DocType: Employee Onboarding,Employee Onboarding,Darbinieku uzņemšana
 DocType: POS Closing Voucher,Period End Date,Perioda beigu datums
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Pārdošanas iespējas pēc avotiem
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Pirmais Atstāt apstiprinātājs sarakstā tiks iestatīts kā noklusējuma Atstātāja apstiprinātājs.
 DocType: POS Settings,POS Settings,POS iestatījumi
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Visi konti
@@ -7379,7 +7451,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,# {0} rinda: likmei jābūt vienādai ar {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Veselības aprūpes pakalpojumu vienības
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Ieraksti nav atrasti
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Novecošanas diapazons 3
 DocType: Vital Signs,Blood Pressure,Asinsspiediens
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Mērķis ir ieslēgts
@@ -7426,6 +7497,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Partijas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Aizsardzība
 DocType: Item,Has Batch No,Ir partijas Nr
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Aizkavētās dienas
 DocType: Lead,Person Name,Personas vārds
 DocType: Item Variant,Item Variant,Vienība Variant
 DocType: Training Event Employee,Invited,Uzaicināts
@@ -7447,7 +7519,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Sākuma un beigu datumi, kas nav derīgā algas periodā, nevar aprēķināt {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Rādīt tikai šo klientu grupu klientu
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,"Atlasiet vienumus, lai saglabātu rēķinu"
-DocType: Service Level,Resolution Time,Izšķirtspējas laiks
+DocType: Service Level Priority,Resolution Time,Izšķirtspējas laiks
 DocType: Grading Scale Interval,Grade Description,Novērtējuma apraksts
 DocType: Homepage Section,Cards,Kartes
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kvalitātes sanāksmes protokoli
@@ -7474,6 +7546,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Bankas izraksta atlikums pēc galvenās virsgrāmatas
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Veselības aprūpe (beta)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,"Noklusētā noliktava, lai izveidotu pārdošanas pasūtījumu un piegādes paziņojumu"
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,{0} atbildes laiks indeksā {1} nevar būt lielāks par izšķirtspējas laiku.
 DocType: Opportunity,Customer / Lead Name,Klienta / Svina nosaukums
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Nepieprasītā summa
@@ -7520,7 +7593,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Pušu un adrešu importēšana
 DocType: Item,List this Item in multiple groups on the website.,Uzskaitiet šo vienumu vairākās tīmekļa vietnēs.
 DocType: Request for Quotation,Message for Supplier,Ziņojums piegādātājam
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"Nevar mainīt {0}, jo ir pieejams darījums ar {1} vienumu."
 DocType: Healthcare Practitioner,Phone (R),Tālrunis (R)
 DocType: Maintenance Team Member,Team Member,Komandas biedrs
 DocType: Asset Category Account,Asset Category Account,Aktīvu kategorijas konts
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index d9b9e0d..da4ce7f 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -77,7 +77,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,Именување {0} и фактура за продажба {1} откажани
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,Твојата е-маил адреса...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Вклучете ги стандардните книги
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Вклучете ги стандардните книги
 DocType: Activity Cost,Activity Type,Тип на активност
 DocType: Purchase Invoice,Get Advances Paid,Да се платат напредок
 DocType: Company,Gain/Loss Account on Asset Disposal,Сметка за добивка / загуба за отуѓување на средства
@@ -223,7 +223,9 @@
 DocType: Bank Reconciliation,Payment Entries,Записи за исплата
 DocType: Employee Education,Class / Percentage,Класа / Процент
 ,Electronic Invoice Register,Електронски регистар на фактури
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,Бројот на појавата по која последицата се извршува.
 DocType: Sales Invoice,Is Return (Credit Note),Е враќање (кредитната белешка)
+DocType: Price List,Price Not UOM Dependent,Цена Не зависена од UOM
 DocType: Lab Test Sample,Lab Test Sample,Примерок за лабораториски испитувања
 DocType: Shopify Settings,status html,статус html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","За пример, 2012, 2012-13"
@@ -324,6 +326,7 @@
 DocType: Salary Slip,Net Pay,Нето плати
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,Вкупно фактурирани Амт
 DocType: Clinical Procedure,Consumables Invoice Separately,Потрошни фактури засебно
+DocType: Shift Type,Working Hours Threshold for Absent,Праг на работното време за отсутен
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен во однос на групна сметка {0}
 DocType: Purchase Receipt Item,Rate and Amount,Стапка и износ
@@ -379,7 +382,6 @@
 DocType: Healthcare Settings,Out Patient Settings,Надвор од Пациентот
 DocType: Asset,Insurance End Date,Датум на осигурување
 DocType: Bank Account,Branch Code,Огранок законик
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,Време за одговарање
 apps/erpnext/erpnext/public/js/conf.js,User Forum,Кориснички форум
 DocType: Landed Cost Item,Landed Cost Item,Објективна цена
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,Продавачот и купувачот не можат да бидат исти
@@ -597,6 +599,7 @@
 DocType: Share Transfer,Transfer,Трансфер
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),Ставка за пребарување (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} Резултатот е поднесен
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Од датумот не може да биде поголем од До датум
 DocType: Supplier,Supplier of Goods or Services.,Добавувач на стоки или услуги.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Име на нова сметка. Забелешка: Ве молиме не креирајте сметки за купувачи и добавувачи
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,Студентската група или распоредот на курсот е задолжителна
@@ -882,7 +885,6 @@
 DocType: Skill,Skill Name,Име на вештина
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,Печатење на извештај картичка
 DocType: Soil Texture,Ternary Plot,Троично заговор
-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; Series за именување
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,Поддршка Билети
 DocType: Asset Category Account,Fixed Asset Account,Фиксна сметка за средства
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,Најнови
@@ -895,6 +897,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,Задолжителен за биланс на состојба
 DocType: Payment Entry,Total Allocated Amount,Вкупен распределен износ
 DocType: Sales Invoice,Get Advances Received,Добие аванси
+DocType: Shift Type,Last Sync of Checkin,Последна синхронизација на проверка
 DocType: Student,B-,B-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,Ставка Даночен износ вклучен во вредност
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -903,7 +906,9 @@
 DocType: Student,Blood Group,Крвна група
 apps/erpnext/erpnext/config/healthcare.py,Masters,Мајстори
 DocType: Crop,Crop Spacing UOM,Распределба на култури UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,Времето по започнувањето на смената кога регистрацијата се смета за доцна (во минути).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,Истражува
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Не се пронајдени извонредни фактури
 apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"{0} vacancies and {1} budget for {2} already planned for subsidiary companies of {3}. \
 				You can only plan for upto {4} vacancies and and budget {5} as per staffing plan {6} for parent company {3}.",{0} слободни работни места и {1} буџет за {2} веќе планиран за подружници од {3}. \ Можете да планирате само до {4} слободни работни места и буџет {5} според планот за вработување {6} за матичната компанија {3}.
 DocType: Promotional Scheme,Product Discount Slabs,Плочи со попуст на производи
@@ -1005,6 +1010,7 @@
 DocType: Item,Moving Average,Движечки просек
 DocType: Employee Attendance Tool,Unmarked Attendance,Неозначено присуство
 DocType: Homepage Section,Number of Columns,Број на колони
+DocType: Issue Priority,Issue Priority,Приоритет на прашање
 DocType: Holiday List,Add Weekly Holidays,Додади неделни празници
 DocType: Shopify Log,Shopify Log,Купувај дневник
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,Креирај фискален лист
@@ -1013,6 +1019,7 @@
 DocType: Warranty Claim,Issue Date,Дата на издавање
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изберете пакет за елемент {0}. Не може да се најде единствена група што го исполнува ова барање
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,Не може да се создаде бонус за задржување за вработените лево
+DocType: Employee Checkin,Location / Device ID,Локација / ID на уредот
 DocType: Purchase Order,To Receive,Да прими
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Вие сте во офлајн режим. Вие нема да можете да ја превчитате се додека не сте на мрежа.
 DocType: Course Activity,Enrollment,Запишување
@@ -1021,7 +1028,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},Макс: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,Недостасува информација за е-фактурирање
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Нема креирано материјално барање
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на производ&gt; Група на производи&gt; Бренд
 DocType: Loan,Total Amount Paid,Вкупен износ платен
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Сите овие елементи веќе се фактурирани
 DocType: Training Event,Trainer Name,Име на тренерот
@@ -1132,6 +1138,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Ве молиме да го споменете Водечкото Име во Водач {0}
 DocType: Employee,You can enter any date manually,Можете да внесете кој било датум рачно
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Товар за помирување на акциите
+DocType: Shift Type,Early Exit Consequence,Рано излезната последица
 DocType: Item Group,General Settings,Општи поставувања
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,Датумот на достасаност не може да биде пред датумот на објавување / набавување на добавувачи
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,Внесете го името на Корисникот пред да поднесете.
@@ -1170,6 +1177,7 @@
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,Потврда за исплата
 ,Available Stock for Packing Items,Достапни акции за пакувања
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please remove this Invoice {0} from C-Form {1},Ве молиме отстранете ја оваа фактура {0} од C-Form {1}
+DocType: Shift Type,Every Valid Check-in and Check-out,Секој валиден Check-in и Check-out
 DocType: Support Search Source,Query Route String,Стринг на маршрутата за пребарување
 DocType: Customer Feedback Template,Customer Feedback Template,Шаблон за повратни информации за клиенти
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,Цитати до води или клиенти.
@@ -1204,6 +1212,7 @@
 DocType: Authorization Control,Authorization Control,Контрола на овластување
 ,Daily Work Summary Replies,Дневни резимеа
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},Ве поканија да соработувате на проектот: {0}
+DocType: Issue,Response By Variance,Одговор со варијација
 DocType: Item,Sales Details,Детали за продажбата
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Писма глави за шаблони за печатење.
 DocType: Salary Detail,Tax on additional salary,Данок на дополнителна плата
@@ -1327,6 +1336,7 @@
 DocType: Project,Task Progress,Напредок на задачата
 DocType: Journal Entry,Opening Entry,Отворање на влез
 DocType: Bank Guarantee,Charges Incurred,Нанесени надоместоци
+DocType: Shift Type,Working Hours Calculation Based On,Работно време пресметка Врз основа
 DocType: Work Order,Material Transferred for Manufacturing,Пренесен материјал за производство
 DocType: Products Settings,Hide Variants,Сокриј варијанти
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Оневозможи планирање на капацитети и следење на време
@@ -1356,6 +1366,7 @@
 DocType: Guardian,Interests,Интереси
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Потрошена количина
 DocType: Education Settings,Education Manager,Образование менаџер
+DocType: Employee Checkin,Shift Actual Start,Стартувај го вистинскиот старт
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Планирајте време на дневници надвор работното работно време.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},Лојални поени: {0}
 DocType: Healthcare Settings,Registration Message,Порака за регистрација
@@ -1380,9 +1391,9 @@
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Invoice already created for all billing hours,Фактура веќе креирана за сите платежни часови
 DocType: Sales Partner,Contact Desc,Контакт Desc
 DocType: Purchase Invoice,Pricing Rules,Правила за цени
+apps/erpnext/erpnext/stock/doctype/item/item.py,"As there are existing transactions against item {0}, you can not change the value of {1}","Бидејќи постојат постоечки трансакции против ставка {0}, не можете да ја промените вредноста на {1}"
 DocType: Hub Tracked Item,Image List,Листа на слики
 DocType: Item Variant Settings,Allow Rename Attribute Value,Дозволи преименување на вредноста на атрибутот
-DocType: Price List,Price Not UOM Dependant,Цена Не зависена од UOM
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),Време (во мините)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,Основно
 DocType: Loan,Interest Income Account,Каматен профит
@@ -1392,6 +1403,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,Изберете POS профил
 DocType: Support Settings,Get Latest Query,Добијте најнови пребарувања
 DocType: Employee Incentive,Employee Incentive,Поттикнување на вработените
+DocType: Service Level,Priorities,Приоритети
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,Додајте картички или сопствени делови на почетната страница
 DocType: Homepage,Hero Section Based On,Херој дел врз основа на
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупен трошок за набавка (преку фактура за набавка)
@@ -1452,7 +1464,7 @@
 DocType: Blanket Order Item,Ordered Quantity,Нареди количина
 apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлен Магацин е задолжителен против отфрлена Точка {1}
 ,Received Items To Be Billed,Добиени ставки за да се фактурираат
-DocType: Salary Slip Timesheet,Working Hours,Работно време
+DocType: Attendance,Working Hours,Работно време
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,Начин на исплата
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,Нарачките не се добиени на време
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,Времетраење во денови
@@ -1572,7 +1584,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за добавувачот
 DocType: Item Default,Default Selling Cost Center,Стандарден трошок центар за продажба
 DocType: Sales Partner,Address & Contacts,Адреса и контакти
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме наместете серија за нумерација за Присуство преку Поставување&gt; Нумерирање
 DocType: Subscriber,Subscriber,Претплатник
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Образец / точка / {0}) е надвор од акциите
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,Ве молиме изберете прво да го објавите датумот
@@ -1583,7 +1594,7 @@
 DocType: Detected Disease,Tasks Created,Создадени задачи
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,Стандардната BOM ({0}) мора да биде активна за оваа ставка или за нејзиниот шаблон
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,Стапка на Комисијата%
-DocType: Service Level,Response Time,Време на одговор
+DocType: Service Level Priority,Response Time,Време на одговор
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce Settings
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,Количината мора да биде позитивна
 DocType: Contract,CRM,CRM
@@ -1600,7 +1611,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,Мапирање податоци за трансакции
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,Олово бара или име на лице или име на организацијата
 DocType: Student,Guardians,Чувари
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ве молиме поставете Систем за наведување на наставници во образованието&gt; Образование
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,Избери Бренд ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,Среден приход
 DocType: Shipping Rule,Calculate Based On,Пресметајте врз основа на
@@ -1637,6 +1647,7 @@
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Attendance Record {0} exists against Student {1},Записник за присуство {0} постои против Студент {1}
 apps/erpnext/erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py,Date of Transaction,Датум на трансакција
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.js,Cancel Subscription,Откажи претплата
+apps/erpnext/erpnext/support/doctype/issue/issue.py,Couldn't Set Service Level Agreement {0}.,Не може да се постави Договор за ниво на услуга {0}.
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Net Salary Amount,Нето плата Износ
 DocType: Account,Liability,Одговорност
 DocType: Employee,Bank A/C No.,Банка A / C бр.
@@ -1702,7 +1713,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Код на суровина
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,Фактурата за набавка {0} е веќе доставена
 DocType: Fees,Student Email,Студентски е-пошта
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},Бум рекурзија: {0} не може да биде родител или дете на {2}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,Добијте предмети од здравствени услуги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,Внесот на акции {0} не е поднесен
 DocType: Item Attribute Value,Item Attribute Value,Вредност на атрибутот на објектот
@@ -1727,7 +1737,6 @@
 DocType: Production Plan,Select Items to Manufacture,Изберете предмети за производство
 DocType: Leave Application,Leave Approver Name,Оставете го името на одобрување
 DocType: Shareholder,Shareholder,Сопственик
-DocType: Issue,Agreement Status,Статус на договор
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,Стандардни поставки за продажба на трансакции.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,Ве молиме изберете Студентски прием кој е задолжителен за платен студент апликант
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,Изберете BOM
@@ -1990,6 +1999,7 @@
 DocType: Account,Income Account,Приход сметка
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,Сите магацини
 DocType: Contract,Signee Details,Детали за Сигните
+DocType: Shift Type,Allow check-out after shift end time (in minutes),Овозможи одјавување по завршетокот на смената (во минути)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,Набавки
 DocType: Item Group,Check this if you want to show in website,Проверете го ова ако сакате да се прикажете на веб-страница
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,Фискалната година {0} не е пронајдена
@@ -2056,6 +2066,7 @@
 DocType: Activity Cost,Billing Rate,Стапка на наплата
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Warning: Another {0} # {1} exists against stock entry {2},Предупредување: Уште {0} # {1} постои против влез на акции {2}
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,Ве молиме вклучете ги поставките на Google Maps за да ги процените и оптимизирате маршрутите
+DocType: Purchase Invoice Item,Page Break,Страница пауза
 DocType: Supplier Scorecard Criteria,Max Score,Макс рејтинг
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,Датумот на отплата не може да биде пред датумот на повлекување.
 DocType: Support Search Source,Support Search Source,Поддршка за пребарување
@@ -2124,6 +2135,7 @@
 DocType: Employee Transfer,Employee Transfer,Трансфер на вработени
 ,Sales Funnel,Продажна инка
 DocType: Agriculture Analysis Criteria,Water Analysis,Анализа на вода
+DocType: Shift Type,Begin check-in before shift start time (in minutes),Започнете пријавување пред да почнете време за менување (во минути)
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,Нема што да се уреди.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операцијата {0} подолго од расположливите работни часови на работната станица {1}, ја прекинува операцијата во повеќе операции"
@@ -2137,7 +2149,9 @@
 apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},Нарачка за продажба {0} е {1}
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Одлагање во плаќање (дена)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,Внесете детали за амортизација
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,Клиент ПО
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,Очекуваниот датум на испорака треба да биде по датумот на продажниот налог
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,Количината на предметот не може да биде нула
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,Невалиден атрибут
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select BOM against item {0},Изберете BOM против ставка {0}
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Тип на фактура
@@ -2147,6 +2161,7 @@
 DocType: Volunteer,Afternoon,Попладне
 DocType: Vital Signs,Nutrition Values,Вредности на исхрана
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),Присуство на треска (temp&gt; 38.5 ° C / 101.3 ° F или постојана температура&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ИТЦ е обратен
 DocType: Project,Collect Progress,Собери напредок
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,Енергија
@@ -2197,6 +2212,7 @@
 ,Ordered Items To Be Billed,Нарачаните предмети да бидат наплатени
 DocType: Taxable Salary Slab,To Amount,До износ
 DocType: Purchase Invoice,Is Return (Debit Note),Е Враќање (Дебитна белешка)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 apps/erpnext/erpnext/config/desktop.py,Getting Started,Да започнеме
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Спојување
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,Не може да се промени датум на почеток на фискалната година и крајниот датум на фискалната година откако ќе се зачува фискалната година.
@@ -2215,8 +2231,10 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance start date can not be before delivery date for Serial No {0},Датумот на одржување не може да биде пред датумот на испорака за Сериски број {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Exchange Rate is mandatory,Ред {0}: девизен курс е задолжителен
 DocType: Purchase Invoice,Select Supplier Address,Изберете адреса на добавувачот
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Достапната количина е {0}, потребна ви е {1}"
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,Ве молиме внесете тајната на потрошувачите на API
 DocType: Program Enrollment Fee,Program Enrollment Fee,Провизија за запишување на програмата
+DocType: Employee Checkin,Shift Actual End,Shift Actual End
 DocType: Serial No,Warranty Expiry Date,Датум на истекување на гаранцијата
 DocType: Hotel Room Pricing,Hotel Room Pricing,Цените на хотелската соба
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","Надвор оданочливи резерви (освен нула, номинално и изземени"
@@ -2276,6 +2294,7 @@
 DocType: Quality Inspection Reading,Reading 5,Читање 5
 DocType: Shopping Cart Settings,Display Settings,Поставувањата на екранот
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,Ве молиме поставете Број на резервирани амортизации
+DocType: Shift Type,Consequence after,Последици по
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,Што ти треба помош со?
 DocType: Journal Entry,Printing Settings,Поставки за печатење
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,Банкарство
@@ -2285,6 +2304,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Адресата за фактурирање е иста како адреса за испорака
 DocType: Account,Cash,Пари
 DocType: Employee,Leave Policy,Оставете политика
+DocType: Shift Type,Consequence,Последица
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,Адреса на студентот
 DocType: GST Account,CESS Account,Смет сметка
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Ценовен центар е потребен за сметка &quot;Профит и загуба&quot; {2}. Поставете стандарден Центар за трошоци за компанијата.
@@ -2349,6 +2369,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,Период за затворање на ваучерот
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 Име
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,Те молам внеси сметка за расходи
+DocType: Issue,Resolution By Variance,Резолуција со варијација
 DocType: Employee,Resignation Letter Date,Датум на оставка
 DocType: Soil Texture,Sandy Clay,Сенди Клеј
 DocType: Upload Attendance,Attendance To Date,Присуство до датум
@@ -2361,6 +2382,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,Види сега
 DocType: Item Price,Valid Upto,Валиден Upto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},Референтниот Doctype мора да биде еден од {0}
+DocType: Employee Checkin,Skip Auto Attendance,Прескокнете го автоматското присуство
 DocType: Payment Request,Transaction Currency,Валута на трансакција
 DocType: Loan,Repayment Schedule,Распоред за отплата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,Креирај запис за задржување на примерокот
@@ -2432,6 +2454,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,POS затворање на ваучерните такси
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,Акција иницијализирана
 DocType: POS Profile,Applicable for Users,Применливо за корисници
+,Delayed Order Report,Одложен извештај за нарачка
 DocType: Training Event,Exam,Испит
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Пронајден е неточен број на записи за Општи Книги. Можеби избравте погрешна сметка во трансакцијата.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,Продажен гасовод
@@ -2446,10 +2469,11 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,Условите ќе се применуваат на сите избрани предмети во комбинација.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,Конфигурирај
 DocType: Hotel Room,Capacity,Капацитет
+DocType: Employee Checkin,Shift End,Shift End
 DocType: Installation Note Item,Installed Qty,Инсталирана количина
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Batch {0} of Item {1} is disabled.,Пакетот {0} од точка {1} е оневозможен.
 DocType: Hotel Room Reservation,Hotel Reservation User,Корисник за хотелски резерви
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,Работен ден се повторува двапати
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Договор за ниво на услуга со тип на ентитет {0} и ентитет {1} веќе постои.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},Елемент Група која не е наведена во господар на ставка за ставка {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},Грешка во името: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,Територијата е потребна во POS профилот
@@ -2497,6 +2521,7 @@
 DocType: Depreciation Schedule,Schedule Date,Распоред на датум
 DocType: Packing Slip,Package Weight Details,Детали за тежина на пакетот
 DocType: Job Applicant,Job Opening,Отворена работа
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,Последна позната успешна синхронизација на проверка на вработените. Ресетирајте го ова само ако сте сигурни дека сите дневни записи се синхронизираат од сите локации. Немојте да го менувате ова ако не сте сигурни.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,Фактичка цена
 apps/erpnext/erpnext/controllers/accounts_controller.py,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Вкупниот напредок ({0}) против Нарачката {1} не може да биде поголем од Grand Total ({2})
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,Објекти Варијанти се ажурираат
@@ -2541,6 +2566,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,Земете Invocies
 DocType: Tally Migration,Is Day Book Data Imported,Увезени се дневни податоци
 ,Sales Partners Commission,Комисија за продажба на партнери
+DocType: Shift Type,Enable Different Consequence for Early Exit,Овозможи различна последица за почетокот на излезот
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,Правни
 DocType: Loan Application,Required by Date,Бара до датум
 DocType: Quiz Result,Quiz Result,Резултат од квиз
@@ -2600,7 +2626,6 @@
 DocType: Pricing Rule,Pricing Rule,Правило за цени
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},Изборна листа за одмор не е поставена за период на одмор {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,"Поставете го корисничкото поле User in Record of Employee, за да поставите Улогата на вработените"
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,Време да се реши
 DocType: Training Event,Training Event,Обука настан
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","Нормалниот крвен притисок за одмор кај возрасни е приближно 120 mmHg систолен и дијастолен 80 mmHg, со кратенка &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,Системот ќе ги преземе сите записи ако граничната вредност е нула.
@@ -2644,6 +2669,7 @@
 DocType: Student Applicant,Approved,Одобрено
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},Од датумот треба да биде во рамките на фискалната година. Претпоставувајќи од датумот = {0}
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,Те молам Поставете група на добавувачи во Поставките за купување.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} е неважечки статус на присуство.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,Привремена сметка за отворање
 DocType: Purchase Invoice,Cash/Bank Account,Готовина / банкарска сметка
 DocType: Quality Meeting Table,Quality Meeting Table,Табела за состаноци за квалитет
@@ -2679,6 +2705,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,Распоред на курсот
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Детална мудра даночна детали
+DocType: Shift Type,Attendance will be marked automatically only after this date.,Посетеноста ќе се означи автоматски само по овој датум.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,Снабдувања направени за носители на UIN
 apps/erpnext/erpnext/hooks.py,Request for Quotations,Барање за цитати
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,Валута не може да се промени по внесувањето на записи користејќи некоја друга валута
@@ -2727,7 +2754,6 @@
 DocType: Item,Is Item from Hub,Е предмет од Hub
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,Процедура за квалитет.
 DocType: Share Balance,No of Shares,Број на акции
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Кол не е достапен за {4} во магацин {1} при објавување на времето за внесување ({2} {3})
 DocType: Quality Action,Preventive,Превентивен
 DocType: Support Settings,Forum URL,URL на форумот
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,Вработен и присуство
@@ -2949,7 +2975,6 @@
 DocType: Hotel Settings,Default Taxes and Charges,Неподвижни даноци и надоместоци
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,Ова се базира на трансакции против овој Добавувач. Погледнете временска рамка подолу за детали
 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/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,Внесете датум за почеток и крај на договорот.
 DocType: Delivery Note Item,Against Sales Invoice,Против фактурата за продажба
 DocType: Loyalty Point Entry,Purchase Amount,Износ за набавка
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубен како што е нарачката за продажба.
@@ -2973,7 +2998,7 @@
 DocType: Lead,Organization Name,Името на организацијата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,Валидни и валидни до полиња се задолжителни за кумулативните
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде ист како {1} {2}
-DocType: Employee,Leave Details,Остави детали
+DocType: Employee Checkin,Shift Start,Shift Start
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,Пазарните трансакции пред {0} се замрзнати
 DocType: Driver,Issuing Date,Датум на издавање
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,Барател
@@ -3018,9 +3043,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,Детали за шаблони за мапирање на готовинскиот тек
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,Регрутирање и обука
 DocType: Drug Prescription,Interval UOM,Интервал UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,Подесувања за грејс период за автоматско присуство
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,Од валута и до валута не може да биде ист
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,Фармацевтски производи
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,Поддршка часа
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} е откажана или затворена
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ред {0}: Унапредување на клиентот мора да биде кредит
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),Група од ваучер (консолидирана)
@@ -3130,6 +3157,7 @@
 DocType: Territory,Territory Manager,Територија менаџер
 DocType: Lab Test,Sample ID,Примерок проект
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,Количката е празна
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,Посетеноста е означена како најава на вработените
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,Средство {0} мора да биде поднесено
 ,Absent Student Report,Отсутен студентски извештај
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,Вклучени во бруто добивката
@@ -3137,7 +3165,9 @@
 DocType: Travel Request Costing,Funded Amount,Финансиран износ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,"{0} {1} не е поднесено, па акцијата не може да се заврши"
 DocType: Subscription,Trial Period End Date,Датум на завршување на судечкиот период
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,Изменувачките записи како IN и OUT за време на иста смена
 DocType: BOM Update Tool,The new BOM after replacement,Новиот Бум по замена
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,Точка 5
 DocType: Employee,Passport Number,Број на пасош
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,Привремено отворање
@@ -3253,6 +3283,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,Можен снабдувач
 ,Issued Items Against Work Order,Издадени предмети против работниот налог
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Создавање {0} Фактура
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ве молиме поставете Систем за наведување на наставници во образованието&gt; Образование
 DocType: Student,Joining Date,Датум на пристапување
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,Барање на сајтот
 DocType: Purchase Invoice,Against Expense Account,Против сметка за расходи
@@ -3292,6 +3323,7 @@
 DocType: Landed Cost Item,Applicable Charges,Применливи трошоци
 ,Point of Sale,Точка на продажба
 DocType: Authorization Rule,Approving User  (above authorized value),Одобрувачки корисник (над дозволената вредност)
+DocType: Service Level Agreement,Entity,Субјект
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} префрлен од {2} до {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},Клиентот {0} не припаѓа на проект {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,Од партија име
@@ -3338,6 +3370,7 @@
 DocType: Soil Texture,Sand Composition (%),Композиција на песок (%)
 DocType: Production Plan,MFG-PP-.YYYY.-,MFG-PP-.YYYY.-
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.js,Import Day Book Data,Увези податоци за дневни книги
+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; Series за именување
 DocType: Asset,Asset Owner Company,Друштво за сопственост на средства
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Cost center is required to book an expense claim,Трошок центар е потребно да се резервира барање за трошоци
 apps/erpnext/erpnext/stock/utils.py,{0} valid serial nos for Item {1},{0} важечки сериски број за точка {1}
@@ -3398,7 +3431,6 @@
 DocType: Asset,Asset Owner,Сопственик на средства
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},Магацинот е задолжителен за акции Точка {0} во ред {1}
 DocType: Stock Entry,Total Additional Costs,Вкупно дополнителни трошоци
-DocType: Marketplace Settings,Last Sync On,Последно синхронизирање е вклучено
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,Ве молиме поставете барем еден ред во табелата за такси и такси
 DocType: Asset Maintenance Team,Maintenance Team Name,Име на тимот за одржување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,Табела на трошок центри
@@ -3414,12 +3446,12 @@
 DocType: Job Card,WIP Warehouse,WIP складиште
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ-.YYYY.-
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ИД на корисникот не е поставен за вработените {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","Достапна количина е {0}, потребна ви е {1}"
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,Создаден корисник {0}
 DocType: Stock Settings,Item Naming By,Именување на ставка од
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,Нареди
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ова е група корисници на root и не може да се уредува.
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,Барањето за материјал {0} е откажано или запрено
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,Строго се базира на тип на дневник во проверка на вработените
 DocType: Purchase Order Item Supplied,Supplied Qty,Испорачани количини
 DocType: Cash Flow Mapper,Cash Flow Mapper,Мапа на готовински тек
 DocType: Soil Texture,Sand,Песок
@@ -3478,6 +3510,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,Дупликат група на елементи пронајдени во групата табела на ставка
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,Годишна плата
 DocType: Supplier Scorecard,Weighting Function,Тежина на функција
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,Грешка во евалуацијата на формулата за критериуми
 ,Lab Test Report,Лабораториски тест извештај
 DocType: BOM,With Operations,Со операции
@@ -3491,6 +3524,7 @@
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,No repayments available for Journal Entry,Нема достапни отплати за внесување на весници
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,{0} - {1} is inactive student,{0} - {1} е неактивен студент
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Направете берзански запис
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {1},Бум рекурзија: {0} не може да биде родител или дете од {1}
 DocType: Employee Onboarding,Activities,Активности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Atleast one warehouse is mandatory,Само еден магацин е задолжителен
 ,Customer Credit Balance,Клиентски биланс
@@ -3503,9 +3537,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,Повеќекратна програма за лојалност е пронајдена за купувачот. Изберете рачно.
 DocType: Patient,Medication,Лекови
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,Изберете Програма за лојалност
+DocType: Employee Checkin,Attendance Marked,Обележан посетеност
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,Суровини
 DocType: Sales Order,Fully Billed,Целосно фактурирани
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Те молам постави стапка на хотелска соба на {
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,Изберете само еден Приоритет како стандарден.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},Ве молиме идентификувајте / креирајте Сметка (Леџер) за тип - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,Вкупниот износ на кредит / дебит треба да биде ист како поврзан весник
 DocType: Purchase Invoice Item,Is Fixed Asset,Е фиксен имот
@@ -3526,6 +3562,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,Потврда за назначување
 DocType: Shopping Cart Settings,Orders,Нарачки
 DocType: HR Settings,Retirement Age,Возраста за пензионирање
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,Проектирано количество
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},Бришењето не е дозволено за земјата {0}
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},Ред # {0}: Средство {1} е веќе {2}
@@ -3609,11 +3646,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Сметководител
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},POS затворање ваучер alreday постои за {0} помеѓу датумот {1} и {2}
 apps/erpnext/erpnext/config/help.py,Navigating,Навигација
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,Ниту една извонредна фактура не бара ревалоризација на девизниот курс
 DocType: Authorization Rule,Customer / Item Name,Име на клиент / предмет
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новиот сериски број не може да има Магацин. Магацинот мора да биде поставен преку влез или потврда за купување
 DocType: Issue,Via Customer Portal,Преку клиент портал
 DocType: Work Order Operation,Planned Start Time,Планирано време на започнување
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} е {2}
+DocType: Service Level Priority,Service Level Priority,Приоритет на ниво на услуга
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Бројот на резервирани амортизации не може да биде поголем од вкупниот број на амортизација
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,Сподели книга
 DocType: Journal Entry,Accounts Payable,Сметки се плаќаат
@@ -3724,7 +3763,6 @@
 DocType: Delivery Note,Delivery To,Испорака до
 DocType: Bank Statement Transaction Settings Item,Bank Data,Податоци за банка
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,Планиран Upto
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Одржувајте ги времето за наплата и работните часови исто на табелите
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,Следете ги главните извори на енергија.
 DocType: Clinical Procedure,Nursing User,Корисник на медицински сестри
 DocType: Support Settings,Response Key List,Листа со клучни зборови за одговор
@@ -3892,6 +3930,7 @@
 DocType: Work Order Operation,Actual Start Time,Реално време за почеток
 DocType: Antibiotic,Laboratory User,Лабораториски корисник
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,Онлајн аукции
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,Приоритет {0} се повторува.
 DocType: Fee Schedule,Fee Creation Status,Статус на креирање надоместоци
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,Софтвер
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,Нарачка за продажба до плаќање
@@ -3958,6 +3997,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,Не може да се добијат информации за {0}.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Монетарната валута мора да биде еднаква на валутата на валутата на девизната или партиската сметка на партијата
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработениот на ова продажно лице
+DocType: Shift Type,Early Exit Consequence after,Рано излез Последици по
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,Направете отворање на фактури за продажба и купување
 DocType: Disease,Treatment Period,Период на лекување
 apps/erpnext/erpnext/config/settings.py,Setting up Email,Поставување е-пошта
@@ -3975,7 +4015,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,Име на студентот:
 DocType: SMS Log,Sent On,Испратено на
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,Фактура за продажба
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,Времето на одговор не може да биде поголемо од времето на резолуција
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","За студентска група заснована на курсот, курсот ќе биде потврден за секој студент од запишаните курсеви во програмата за запишување."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,Внатрешни работи
 DocType: Employee,Create User Permission,Креирај дозвола за корисници
@@ -4014,6 +4053,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,Стандардни договорни услови за продажба или набавка.
 DocType: Sales Invoice,Customer PO Details,Детали на клиентот
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пациентот не е пронајден
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,Изберете стандарден приоритет.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,Отстранете ја ставката ако давачките не се применуваат за таа ставка
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група на клиенти постои со исто име, ве молиме да го промените името на клиентот или да ја преименувате Групата на клиенти"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -4053,6 +4093,7 @@
 DocType: Support Settings,Support Portal,Портал за поддршка
 apps/erpnext/erpnext/projects/doctype/project/project.py,End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>,Краен датум на задачата <b>{0} не</b> може да биде помал од <b>{1}</b> очекуваниот датум на почеток <b>{2}</b>
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},Вработениот {0} е на Остави на {1}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},Договорот за ниво на услуга е специфичен за клиентот {0}
 DocType: Employee,Held On,Одржана на
 DocType: Healthcare Practitioner,Practitioner Schedules,Распоред на лекари
 DocType: Project Template Task,Begin On (Days),Започнете на (дена)
@@ -4060,6 +4101,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},Работна нарачка е {0}
 DocType: Inpatient Record,Admission Schedule Date,Распоред на приемот Датум
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,Прилагодување на вредноста на средствата
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,Означи присуство врз основа на &quot;Employee Checkin&quot; за вработените доделени на оваа смена.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,Снабдувања направени за нерегистрирани лица
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,Сите работни места
 DocType: Appointment Type,Appointment Type,Тип на назначување
@@ -4173,7 +4215,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежината на пакетот. Обично нето тежина + тежина на материјалот за пакување. (за печатење)
 DocType: Plant Analysis,Laboratory Testing Datetime,Лабораториско тестирање на податоци
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,Точката {0} не може да има серија
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,Продажен гасовод по сцена
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,Студентска група Сила
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,Внес на трансакција на изјава за банка
 DocType: Purchase Order,Get Items from Open Material Requests,Добијте предмети од барања за отворен материјал
@@ -4255,7 +4296,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,Покажи магацин за складирање на стареење
 DocType: Sales Invoice,Write Off Outstanding Amount,Напиши исклучите износ
 DocType: Payroll Entry,Employee Details,Детали за вработените
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,Времето за започнување не може да биде поголемо од крајното време за {0}.
 DocType: Pricing Rule,Discount Amount,Износ на попуст
 DocType: Healthcare Service Unit Type,Item Details,Детали за точка
 apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_declaration/employee_tax_exemption_declaration.py,Duplicate Tax Declaration of {0} for period {1},Дупликат даночна декларација од {0} за период {1}
@@ -4308,7 +4348,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,Нето платата не може да биде негативна
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,Број на интеракции
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}# Item {1} cannot be transferred more than {2} against Purchase Order {3},Ред {0} # Точката {1} не може да се пренесе повеќе од {2} против нарачката {3}
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,Shift
+DocType: Attendance,Shift,Shift
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,Обработка на сметки и странки
 DocType: Stock Settings,Convert Item Description to Clean HTML,Конвертирај ставка за да го исчистите HTML
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,Сите групи на добавувачи
@@ -4378,6 +4418,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,Единица за родителска служба
 DocType: Sales Invoice,Include Payment (POS),Вклучете го Плаќањето (ПОС)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,Приватен капитал
+DocType: Shift Type,First Check-in and Last Check-out,Прва пријава и последна заминување
 DocType: Landed Cost Item,Receipt Document,Документ за прием
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,Период на оценување на добавувачи
 DocType: Employee Grade,Default Salary Structure,Стандардна структура на плата
@@ -4460,6 +4501,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,Креирај Нарачка за нарачка
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,Дефинирајте го буџетот за финансиска година.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,Табелата со сметки не може да биде празна.
+DocType: Employee Checkin,Entry Grace Period Consequence,Влегување во периодот на грејс период
 ,Payment Period Based On Invoice Date,Период на плаќање врз основа на датумот на фактурата
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},Датумот на инсталација не може да биде пред датумот на испорака за Точка {0}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,Линк до материјално барање
@@ -4468,6 +4510,7 @@
 apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: за овој склад веќе постои запис за преуредување {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,Док Датум
 DocType: Monthly Distribution,Distribution Name,Име на дистрибуцијата
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday {0} has been repeated.,Работен ден {0} се повторува.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,Група за не-група
 apps/erpnext/erpnext/setup/doctype/company/company.js,Update in progress. It might take a while.,Ажурирањето е во тек. Тоа може да потрае некое време.
 DocType: Item,"Example: ABCD.#####
@@ -4480,6 +4523,7 @@
 DocType: Vehicle Log,Fuel Qty,Количина гориво
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 Мобилен бр
 DocType: Invoice Discounting,Disbursed,Исплатени
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,Време по крајот на смената за време на кое се смета за одјавување за присуство.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,Нето промени во сметките што треба да се платат
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,Не е достапно
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,Скратено работно време
@@ -4493,7 +4537,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,Прикажи го PDC во Print
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,Купувај снабдувач
 DocType: POS Profile User,POS Profile User,ПОС профил корисникот
-DocType: Student,Middle Name,Средно име
 DocType: Sales Person,Sales Person Name,Име на продажно лице
 DocType: Packing Slip,Gross Weight,Бруто тежина
 DocType: Journal Entry,Bill No,Бил бр
@@ -4502,7 +4545,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG-.YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,Договор за ниво на услуга
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,Ве молиме одберете Employee and Date first
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,Стапката на проценка на ставката се пресметува со оглед на износот на ваучерот за изнајмување
 DocType: Timesheet,Employee Detail,Детали за вработените
 DocType: Tally Migration,Vouchers,Ваучери
@@ -4537,7 +4579,7 @@
 DocType: Additional Salary,Date on which this component is applied,Датум на кој се применува оваа компонента
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,Листа на достапни акционери со фолио броеви
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,Поставување на профили за почетници.
-DocType: Service Level,Response Time Period,Период на одговор на одговор
+DocType: Service Level Priority,Response Time Period,Период на одговор на одговор
 DocType: Purchase Invoice,Purchase Taxes and Charges,Набавка на даноци и надоместоци
 DocType: Course Activity,Activity Date,Датум на активност
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,Изберете или додадете нов клиент
@@ -4562,6 +4604,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,Финансиска година
 DocType: Sales Invoice Item,Deferred Revenue,Одложен приход
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,Најмалку еден од продажбата или купувањето мора да биде избран
+DocType: Shift Type,Working Hours Threshold for Half Day,Праг на работното време за половина ден
 ,Item-wise Purchase History,Историја на купување на предметите
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},Не може да се промени Датум за запирање на услуги за ставка во ред {0}
 DocType: Production Plan,Include Subcontracted Items,Вклучи ги предметите што се поддовршени
@@ -4594,6 +4637,7 @@
 DocType: BOM,Allow Same Item Multiple Times,Дозволи истата точка повеќе пати
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,Креирај BOM
 DocType: Healthcare Practitioner,Charges,Надоместоци
+DocType: Employee,Attendance and Leave Details,Посетеност и детали за напуштање
 DocType: Student,Personal Details,Лични податоци
 DocType: Sales Order,Billing and Delivery Status,Статус на фактурирање и испорака
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,Ред {0}: За добавувачот {0} Е-пошта е потребна за испраќање е-пошта
@@ -4645,7 +4689,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},Внесете вредност помеѓу {0} и {1}
 DocType: Purchase Order,Order Confirmation Date,Датум на потврдување на нарачката
 DocType: Delivery Trip,Calculate Estimated Arrival Times,Пресметајте ги проценетите времиња на пристигнување
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме подесете Систем за имиџ на вработените во човечки ресурси&gt; Поставувања за човечки ресурси
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Потрошена
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS-.YYYY.-
 DocType: Subscription,Subscription Start Date,Датум на почеток на претплата
@@ -4668,7 +4711,7 @@
 DocType: Journal Entry Account,Journal Entry Account,Сметка за внесување на весници
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,Варијанта
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,Форум активност
-DocType: Service Level,Resolution Time Period,Временски период на резолуција
+DocType: Service Level Priority,Resolution Time Period,Временски период на резолуција
 DocType: Request for Quotation,Supplier Detail,Детали за снабдувачот
 DocType: Project Task,View Task,Преглед на задачата
 DocType: Serial No,Purchase / Manufacture Details,Детали за купување / производство
@@ -4735,6 +4778,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Магацинот може да се менува само преку запис за запишување / испорака на берза
 DocType: Support Settings,Close Issue After Days,Затвори прашање по деновите
 DocType: Payment Schedule,Payment Schedule,Распоред на исплата
+DocType: Shift Type,Enable Entry Grace Period,Овозможи Период за Грејс период
 DocType: Patient Relation,Spouse,Сопруг
 DocType: Purchase Invoice,Reason For Putting On Hold,Причина за ставање на чекање
 DocType: Item Attribute,Increment,Прирачник
@@ -4874,6 +4918,7 @@
 DocType: Vehicle Log,Invoice Ref,Фактура Реф
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-образецот не е применлив за фактура: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,Создадена е фактура
+DocType: Shift Type,Early Exit Grace Period,Рано излегување од грејс период
 DocType: Patient Encounter,Review Details,Детали за преглед
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,Ред {0}: вредноста на часовникот мора да биде поголема од нула.
 DocType: Account,Account Number,Број на сметка
@@ -4885,7 +4930,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","Применливи ако компанијата е SpA, SApa или SRL"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,Преклопување услови пронајдени помеѓу:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,Платени и не доставени
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,Код на предметот е задолжителен бидејќи ставката не е автоматски нумерирана
 DocType: GST HSN Code,HSN Code,ХСН код
 DocType: GSTR 3B Report,September,Септември
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,Административни трошоци
@@ -4921,6 +4965,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,CWIP Account,Сметка за CWIP
 DocType: SMS Log,Sender Name,Име на испраќачот
 DocType: Pricing Rule,Supplier Group,Група на снабдувачи
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Set Start Time and End Time for  \
+					Support Day {0} at index {1}.",Поставете го почетното време и крајот на времето за \ Поддршка на денот {0} со индекс {1}.
 DocType: Employee,Date of Issue,Датум на издавање
 ,Requested Items To Be Transferred,Бараните предмети да бидат пренесени
 DocType: Employee,Contract End Date,Датум за завршување на договорот
@@ -4931,6 +4977,7 @@
 DocType: Opportunity,Sales Stage,Продажната фаза
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Во Зборови ќе биде видливо откако ќе го зачувате Нарачката за продажба.
 DocType: Item Reorder,Re-order Level,Ниво на повторување
+DocType: Shift Type,Enable Auto Attendance,Овозможи автоматско присуство
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,Предност
 ,Department Analytics,Одделот за анализи
 DocType: Crop,Scientific Name,Научно име
@@ -4943,6 +4990,7 @@
 DocType: Quiz Activity,Quiz Activity,Квиз активност
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} не е во валиден Период на платен список
 DocType: Timesheet,Billed,Платена
+apps/erpnext/erpnext/config/support.py,Issue Type.,Тип на проблем.
 DocType: Restaurant Order Entry,Last Sales Invoice,Последна продажби фактура
 DocType: Payment Terms Template,Payment Terms,Услови на плаќање
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","Резервирано Количина: нарачана за продажба, но не е испорачана."
@@ -5038,6 +5086,7 @@
 DocType: Account,Asset,Средство
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} нема распоред за здравствени работници. Додади го во господар на здравствените работници
 DocType: Vehicle,Chassis No,Шасија бр
+DocType: Employee,Default Shift,Стандарден Shift
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,Кратенка на компанијата
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,Дрво на Бил Материјали
 DocType: Article,LMS User,Корисник на LMS
@@ -5086,6 +5135,7 @@
 DocType: Sales Person,Parent Sales Person,Родител Продај лице
 DocType: Student Group Creation Tool,Get Courses,Земете курсеви
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол мора да биде 1, бидејќи ставката е основно средство. Ве молам користете го посебниот ред за повеќе количини."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),Работното време под кое не е означено Отсуството. (Нула за оневозможување)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Само лист јазли се дозволени во трансакцијата
 DocType: Grant Application,Organization,Организација
 DocType: Fee Category,Fee Category,Категорија на надоместоци
@@ -5098,6 +5148,7 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,Ве молиме да го ажурирате вашиот статус за овој тренинг настан
 DocType: Volunteer,Morning,Утро
 DocType: Quotation Item,Quotation Item,Предмет на понуда
+apps/erpnext/erpnext/config/support.py,Issue Priority.,Приоритет на прашање.
 DocType: Journal Entry,Credit Card Entry,Внесување на кредитни картички
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","Временскиот отвор е прескокнат, слотот {0} до {1} се преклопува со постоечкиот слот {2} до {3}"
 DocType: Journal Entry Account,If Income or Expense,Ако приходи или расходи
@@ -5148,11 +5199,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,Увоз и поставки на податоци
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","Ако се провери автоматското вклучување, корисниците ќе бидат автоматски врзани со соодветната Програма за лојалност (при заштеда)"
 DocType: Account,Expense Account,Сметка за расходи
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,Времето пред почетокот на смената започнува за време на кое се пријавува пријава за вработување за присуство.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,Однос со Гардијан1
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,Креирај фактура
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},Барањето за исплата веќе постои {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',Вработените ослободени на {0} мора да бидат поставени како &#39;Лево&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},Плаќаат {0} {1}
+DocType: Company,Sales Settings,Поставки за продажба
 DocType: Sales Order Item,Produced Quantity,Произведена количина
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,Барањето за понуда може да се пристапи со кликнување на следниов линк
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечната дистрибуција
@@ -5231,6 +5284,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,Основни даночни шаблони за продажба и купување се создаваат.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Оставете Тип {0} не може да се пренасочат
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,Дебит На сметка мора да биде сметка за побарувања
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,Крајниот датум на договорот не може да биде помал од денес.
 apps/erpnext/erpnext/stock/__init__.py,Please set Account in Warehouse {0} or Default Inventory Account in Company {1},Поставете профил во Магацин {0} или Стандардна инвентарна сметка во компанијата {1}
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,Поставени како основни
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Нето тежината на овој пакет. (автоматски се пресметува како збир на нето-тежина на ставки)
@@ -5257,8 +5311,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,Истечени серии
 DocType: Shipping Rule,Shipping Rule Type,Тип на правила за испорака
 DocType: Job Offer,Accepted,Прифатено
-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> \ за да го откажете овој документ"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Веќе сте оценети за критериумите за оценување {}.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,Изберете сериски броеви
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),Возраст (денови)
@@ -5285,6 +5337,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,Изберете ги вашите домени
 DocType: Agriculture Task,Task Name,Име на задачата
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,Записи на акции веќе креирани за работна нарачка
+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> \ за да го откажете овој документ"
 ,Amount to Deliver,Износ да се испорача
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,Компанијата {0} не постои
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Не се очекуваат материјални барања што се очекуваат за да се поврзат за дадени предмети.
@@ -5334,6 +5388,7 @@
 DocType: Lab Prescription,Test Code,Тест законик
 DocType: Purchase Taxes and Charges,On Previous Row Total,На претходниот ред вкупно
 DocType: Student,Student Email Address,Студентски е-мејл адреса
+,Delayed Item Report,Извештај за одложена ставка
 DocType: Academic Term,Education,Образование
 DocType: Supplier Quotation,Supplier Address,Адреса на добавувачот
 DocType: Salary Detail,Do not include in total,Не вклучувајте вкупно
@@ -5341,7 +5396,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} не постои
 DocType: Purchase Receipt Item,Rejected Quantity,Отфрлена количина
 DocType: Cashier Closing,To TIme,За ТИМ
-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: Daily Work Summary Group User,Daily Work Summary Group User,Корисник на дневна работа
 DocType: Fiscal Year Company,Fiscal Year Company,Фискална година Компанијата
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,Алтернативната ставка не смее да биде иста како код на ставка
@@ -5393,6 +5447,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,Одлагање помеѓу прекин на испорака
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Замрзнување акции постари од [дена]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,Попуст на промотивната шема на производи
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,Приоритет за издавање веќе постои
 DocType: Account,Asset Received But Not Billed,"Средствата добиени, но не се наплаќаат"
 DocType: POS Closing Voucher,Total Collected Amount,Вкупно собраниот износ
 DocType: Course,Default Grading Scale,Стандардна скала за оценување
@@ -5435,6 +5490,7 @@
 DocType: Contract,Fulfilment Terms,Условите за исполнување
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Не-група до група
 DocType: Student Guardian,Mother,Мајка
+DocType: Issue,Service Level Agreement Fulfilled,Исполнет е договор за ниво на услуга
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,Данок на доход за непризнаени придобивки од вработените
 DocType: Travel Request,Travel Funding,Патничко финансирање
 DocType: Shipping Rule,Fixed,Фиксна
@@ -5464,10 +5520,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Нема пронајдени предмети.
 DocType: Item Attribute,From Range,Од опсег
 DocType: Clinical Procedure,Consumables,Потрошни материјали
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,потребни се &#39;employee_field_value&#39; и &#39;timestamp&#39;.
 DocType: Purchase Taxes and Charges,Reference Row #,Референтна линија #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},Ве молиме поставете &quot;Центар за трошоци за амортизација&quot; во компанијата {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,Ред # {0}: Потребна е документација за плаќање за да се заврши трасата
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,Кликнете на ова копче за да ги повлечете податоците за продажниот налог од MWS на Amazon.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),Работно време под кое се означува Половина ден. (Нула за оневозможување)
 ,Assessment Plan Status,Статус на планот за проценка
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,Изберете {0} прво
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Поднесете го ова за да креирате запис за вработените
@@ -5538,6 +5596,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,Поставете го отворен
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,Вклучи филтри
 DocType: Production Plan,Material Request Detail,Детална информација за материјалот
+DocType: Shift Type,Process Attendance After,Постапка за процесот после
 DocType: Material Request Item,Quantity and Warehouse,Количина и складиште
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,Одете во Програми
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},Ред # {0}: Дупликат внес во Референци {1} {2}
@@ -5595,6 +5654,7 @@
 DocType: Pricing Rule,Party Information,Информации за партијата
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),Должници ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,До денес не може да биде поголем од датумот на ослободување на вработениот
+DocType: Shift Type,Enable Exit Grace Period,Овозможи Период на Излез Грејс
 DocType: Expense Claim,Employees Email Id,Id на персоналот за е-пошта
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Ажурирај цена од Shopify до ERPNext ценовник
 DocType: Healthcare Settings,Default Medical Code Standard,Стандарден стандарден медицински код
@@ -5625,7 +5685,6 @@
 DocType: Budget,Applicable on Material Request,Применливо за материјално барање
 DocType: Support Settings,Search APIs,API за пребарување
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,Процент на прекумерно производство за нарачка за продажба
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,Спецификации
 DocType: Purchase Invoice,Supplied Items,Испорачани предмети
 DocType: Leave Control Panel,Select Employees,Изберете вработени
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},Изберете сметка за приход од камата во заем {0}
@@ -5651,7 +5710,7 @@
 ,Supplier-Wise Sales Analytics,Добавувач-мудар Продај анализи
 DocType: GSTR 3B Report,February,Февруари
 DocType: Appraisal,For Employee,За вработените
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,Вистински датум на испорака
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,Вистински датум на испорака
 DocType: Sales Partner,Sales Partner Name,Име на партнер за продажба
 DocType: GST HSN Code,Regional,Регионален
 DocType: Lead,Lead is an Organization,Олово е организација
@@ -5689,6 +5748,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,Оценка на добавувачи
 DocType: Travel Itinerary,Travel To,Патувај до
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,Означи присуство
+DocType: Shift Type,Determine Check-in and Check-out,Одредување на пријавување и заминување
 DocType: POS Closing Voucher,Difference,Разликата
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,Мали
 DocType: Work Order Item,Work Order Item,Точка за работа
@@ -5722,6 +5782,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,Дрога
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} е затворен
 DocType: Patient,Medical History,Медицинска историја
+DocType: Expense Claim,Expense Taxes and Charges,Даноци на трошоци и надоместоци
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,Бројот на денови по датумот на фактурата поминал пред да се откаже претплатата или да се обележи претплатата како неплатена
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,Инсталационата белешка {0} веќе е поднесена
 DocType: Patient Relation,Family,Семејство
@@ -5754,7 +5815,6 @@
 DocType: Dosage Strength,Strength,Сила
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни во {2} за да ја завршите оваа трансакција.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,Backflush суровини на Субконтракт Врз основа
-DocType: Bank Guarantee,Customer,Клиент
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","Ако е овозможено, полето Академски термин ќе биде задолжително во алатката за запишување на програмата."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","За групна студентска група, Студентската група ќе биде потврдена за секој ученик од програмата за запишување."
 DocType: Course,Topics,Теми
@@ -5834,6 +5894,7 @@
 DocType: Chapter,Chapter Members,Членови на глава
 DocType: Warranty Claim,Service Address,Адреса на сервисот
 DocType: Journal Entry,Remark,Забелешка
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количината не е достапна за {4} во магацин {1} при објавување на времето за внесување ({2} {3})
 DocType: Patient Encounter,Encounter Time,Средба време
 DocType: Serial No,Invoice Details,Детали за фактурата
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дополнителни групи можат да се направат под Групи, но записите може да се направат против не-Групи"
@@ -5914,6 +5975,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),Затворање (отворање + вкупно)
 DocType: Supplier Scorecard Criteria,Criteria Formula,Критериум Формула
 apps/erpnext/erpnext/config/support.py,Support Analytics,Поддршка за Анализа
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Идентификациски уред за посетување (биометриски / RF идентификациски број)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,Преглед и акција
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замрзната, записите им се дозволени на ограничени корисници."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,Износ по амортизација
@@ -5935,6 +5997,7 @@
 DocType: Salary Slip,Loan Repayment,Отплата на заем
 DocType: Employee Education,Major/Optional Subjects,Големи / изборни предмети
 DocType: Soil Texture,Silt,Silt
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,Адреси на адреси и контакти
 DocType: Bank Guarantee,Bank Guarantee Type,Тип на банкарска гаранција
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Ако се оневозможи, полето &quot;Заокружено вкупно&quot; нема да биде видливо во ниедна трансакција"
 DocType: Pricing Rule,Min Amt,Min Amt
@@ -5973,6 +6036,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,Отворање инструмент за создавање фактура
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,Вклучете POS-трансакции
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},Ниту еден вработен не е пронајден за дадената вредност на полето на вработените. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),Добиен износ (Валута на компанијата)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","Локалната меморија е полна, не спаси"
 DocType: Chapter Member,Chapter Member,Главен член
@@ -6005,6 +6069,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,Не создадени студентски групи.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},Дупликат ред {0} со ист {1}
 DocType: Employee,Salary Details,Детали за плата
+DocType: Employee Checkin,Exit Grace Period Consequence,Излез од последица на грејс период
 DocType: Bank Statement Transaction Invoice Item,Invoice,Фактура
 DocType: Special Test Items,Particulars,Спецификации
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,Ве молиме поставете филтер врз основа на ставка или складиште
@@ -6106,6 +6171,7 @@
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на работа, потребни квалификации итн."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,Брод до држава
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,Дали сакате да го доставите материјалното барање
 DocType: Opportunity Item,Basic Rate,Основна стапка
 DocType: Compensatory Leave Request,Work End Date,Датум на работа
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,Барање за сурови материјали
@@ -6291,6 +6357,7 @@
 DocType: Sales Order Item,Gross Profit,Бруто добивка
 DocType: Quality Inspection,Item Serial No,Сериски број на предмет
 DocType: Asset,Insurer,Осигурувач
+DocType: Employee Checkin,OUT,OUT
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,Купување износ
 DocType: Asset Maintenance Task,Certificate Required,Потребен сертификат
 DocType: Retention Bonus,Retention Bonus,Бонус за задржување
@@ -6406,6 +6473,8 @@
 DocType: Invoice Discounting,Sanctioned,Санкционирани
 DocType: Course Enrollment,Course Enrollment,Упис на курсот
 DocType: Item,Supplier Items,Добавувачот предмети
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,"Start Time can't be greater than or equal to End Time \
+					for {0}.",Времето за започнување не може да биде поголемо или еднакво на End Time \ for {0}.
 DocType: Sales Order,Not Applicable,Не е применливо
 DocType: Support Search Source,Response Options,Опции за одговор
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,{0} should be a value between 0 and 100,{0} треба да биде вредност помеѓу 0 и 100
@@ -6491,7 +6560,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,Фиксни средства
 DocType: Purchase Order,Ref SQ,Реф. SQ
 DocType: Salary Structure,Total Earning,Вкупно заработка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Share Balance,From No,Од бр
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Уплата за помирување на плаќањата
 DocType: Purchase Invoice,Taxes and Charges Added,Даноци и такси Додадено
@@ -6599,6 +6667,7 @@
 DocType: POS Profile,Ignore Pricing Rule,Игнорирај го правилото за цени
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,Храна
 DocType: Lost Reason Detail,Lost Reason Detail,Детали за изгубени причини
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},Се креираа следниве сериски броеви: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,Поврат на клиенти
 DocType: Serial No,Warranty / AMC Details,Гаранција / AMC детали
 DocType: Issue,Opening Time,Време на отворање
@@ -6648,6 +6717,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,Името на компанијата не е исто
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,Промоцијата на вработените не може да се поднесе пред Датум на промоција
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},Не е дозволено да се ажурираат берзански трансакции постари од {0}
+DocType: Employee Checkin,Employee Checkin,Проверка на вработените
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Почетниот датум треба да биде помал од крајниот датум за Точка {0}
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Направете цитати на клиенти
 DocType: Buying Settings,Buying Settings,Подесувања за купување
@@ -6669,6 +6739,7 @@
 DocType: Patient,Patient Demographics,Демографија на пациентот
 DocType: Share Transfer,To Folio No,На фолио бр
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,Паричен тек од работењето
+DocType: Employee Checkin,Log Type,Тип на дневникот
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативен фонд
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,Ниту една од предметите нема промени во количината или вредноста.
 DocType: Asset,Purchase Date,Датум на купување
@@ -6713,6 +6784,7 @@
 DocType: Vital Signs,Very Hyper,Многу хипер
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,Изберете ја природата на вашиот бизнис.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,Изберете месец и година
+DocType: Service Level,Default Priority,Стандарден приоритет
 DocType: Student Log,Student Log,Студентски дневник
 DocType: Shopping Cart Settings,Enable Checkout,Овозможи проверка
 apps/erpnext/erpnext/config/settings.py,Human Resources,Човечки ресурси
@@ -6741,7 +6813,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,Поврзете го Shopify со ERPNext
 DocType: Homepage Section Card,Subtitle,Превод
 DocType: Soil Texture,Loam,Loam
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувачот&gt; Тип на добавувач
 DocType: BOM,Scrap Material Cost(Company Currency),Трошок за отпадна материја (Валута на компанијата)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,Забелешка за испорака {0} не смее да се поднесе
 DocType: Task,Actual Start Date (via Time Sheet),Датум на фактички почеток (преку временски лист)
@@ -6797,6 +6868,7 @@
 DocType: Drug Prescription,Dosage,Дозирање
 DocType: Cheque Print Template,Starting position from top edge,Стартна позиција од горниот раб
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),Времетраење на назначување (мин.)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},Овој вработен веќе има дневник со ист временски ознака. {0}
 DocType: Accounting Dimension,Disable,Оневозможи
 DocType: Email Digest,Purchase Orders to Receive,Нарачка за набавка
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,Нарачки за производство не може да се подигнат за:
@@ -6812,7 +6884,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,Пренесен материјал за поддоговор
 DocType: Job Card,Timing Detail,Детали за времето
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,Потребна е
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},Внесување на {0} на {1}
 DocType: Job Offer Term,Job Offer Term,Рок за понуда за работа
 DocType: SMS Center,All Contact,Сите контакти
 DocType: Project Task,Project Task,Проектна задача
@@ -6863,7 +6934,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,Елементот {0} не е поставен за сериски броеви
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,Од држава
 DocType: Leave Type,Maximum Continuous Days Applicable,Применливи се максималните континуирани денови
-apps/erpnext/erpnext/config/support.py,Support Team.,Тим за поддршка.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,Внесете го името на компанијата прво
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,Увозот е успешен
 DocType: Guardian,Alternate Number,Алтернативен број
@@ -6955,6 +7025,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,Ред # {0}: ставката е додадена
 DocType: Student Admission,Eligibility and Details,Подобност и детали
 DocType: Staffing Plan,Staffing Plan Detail,Детален план за персонал
+DocType: Shift Type,Late Entry Grace Period,Краен период на грејс период
 DocType: Email Digest,Annual Income,Годишен приход
 DocType: Journal Entry,Subscription Section,Секција за претплата
 DocType: Salary Slip,Payment Days,Денови на исплата
@@ -7005,6 +7076,7 @@
 DocType: Journal Entry Account,Account Balance,Состојба на сметката
 DocType: Asset Maintenance Log,Periodicity,Периодичност
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,Медицински рекорд
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,Тип на дневник е потребен за проверки што паѓаат во смената: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,Извршување
 DocType: Item,Valuation Method,Метод на вреднување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},{0} против продажната фактура {1}
@@ -7089,6 +7161,7 @@
 DocType: Loan Type,Loan Name,Име на заем
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,Поставете стандардниот начин на плаќање
 DocType: Quality Goal,Revision,Ревизија
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,Времето пред крајот на смената кога се одјавува се смета за рано (во минути).
 DocType: Healthcare Service Unit,Service Unit Type,Тип на единица за сервисирање
 DocType: Purchase Invoice,Return Against Purchase Invoice,Врати се против фактура за набавка
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,Генерирање на тајната
@@ -7244,12 +7317,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,Козметика
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Проверете го ова ако сакате да го натерате корисникот да избере серија пред да ја зачува. Нема да има стандардно ако го проверите ова.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,На корисниците со оваа улога им е дозволено да поставуваат замрзнати сметки и да креираат / менуваат сметководствени записи против замрзнати сметки
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на производ&gt; Група на производи&gt; Бренд
 DocType: Expense Claim,Total Claimed Amount,Вкупно задржан износ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се пронајде временски слот во следните {0} дена за работа {1}
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,Завиткување
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,Можете да обнови само ако вашето членство истекува во рок од 30 дена
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},Вредноста мора да биде помеѓу {0} и {1}
 DocType: Quality Feedback,Parameters,Параметри
+DocType: Shift Type,Auto Attendance Settings,Поставки за автоматско следење
 ,Sales Partner Transaction Summary,Резиме на трансакцијата на партнерот за продажба
 DocType: Asset Maintenance,Maintenance Manager Name,Име на менаџментот за одржување
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,Потребно е да дознаете Детали за ставката.
@@ -7341,10 +7416,10 @@
 DocType: Pricing Rule,Validate Applied Rule,Потврдете го применетото правило
 DocType: Job Card Item,Job Card Item,Елемент за картичка за работа
 DocType: Homepage,Company Tagline for website homepage,Компанија Tagline за почетната страница на веб страната
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Set Response Time and Resolution for Priority {0} at index {1}.,Поставете време на одговор и резолуција за приоритет {0} со индекс {1}.
 DocType: Company,Round Off Cost Center,Центар за заокружување на цената
 DocType: Supplier Scorecard Criteria,Criteria Weight,Тежина на критериумите
 DocType: Asset,Depreciation Schedules,Распоред за амортизација
-DocType: Expense Claim Detail,Claim Amount,Износ на побарување
 DocType: Subscription,Discounts,Попусти
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака
 DocType: Subscription,Cancelation Date,Датум на откажување
@@ -7372,7 +7447,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,Прикажи нулта вредности
 DocType: Employee Onboarding,Employee Onboarding,Вработените
 DocType: POS Closing Voucher,Period End Date,Датум на завршување на периодот
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,Можности за продажба по извор
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,Првиот одобрение за напуштање на списокот ќе биде поставен како стандарден Оставете го одобрувачот.
 DocType: POS Settings,POS Settings,POS Settings
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,Сите сметки
@@ -7393,7 +7467,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Ред # {0}: Стапката мора да биде иста како {1}: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR-.YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,Теми за здравствена заштита
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,Не се пронајдени записи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,Стареење опсег 3
 DocType: Vital Signs,Blood Pressure,Крвен притисок
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,Целна на
@@ -7440,6 +7513,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,Серии
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,Одбрана
 DocType: Item,Has Batch No,Има серија бр
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,Одложени денови
 DocType: Lead,Person Name,Име на лице
 DocType: Item Variant,Item Variant,Ставка Варијанта
 DocType: Training Event Employee,Invited,Поканети
@@ -7461,7 +7535,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","Датумот на почеток и крај не е во валиден перолошки период, не може да се пресмета {0}."
 DocType: POS Profile,Only show Customer of these Customer Groups,Прикажи само купувач на овие групи корисници
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,Изберете предмети за да ја зачувате фактурата
-DocType: Service Level,Resolution Time,Време на резолуција
+DocType: Service Level Priority,Resolution Time,Време на резолуција
 DocType: Grading Scale Interval,Grade Description,Опис на оценката
 DocType: Homepage Section,Cards,Картички
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Квалитетни состаноци
@@ -7488,6 +7562,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Bank Statement balance as per General Ledger,Извештај за банкарска изјава во согласност со главната книга
 apps/erpnext/erpnext/public/js/setup_wizard.js,Healthcare (beta),Здравство (бета)
 DocType: Shopify Settings,Default Warehouse to to create Sales Order and Delivery Note,Стандардна магацин за да креирате белешка за нарачки и испорака
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time for {0} at index {1} can't be greater than Resolution Time.,Времето на одзив за {0} со индекс {1} не може да биде поголемо од времето за резолуција.
 DocType: Opportunity,Customer / Lead Name,Клиент / Водечко име
 DocType: Student,EDU-STU-.YYYY.-,EDU-STU-.YYYY.-
 DocType: Expense Claim Advance,Unclaimed amount,Неизвесен износ
@@ -7534,7 +7609,6 @@
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Importing Parties and Addresses,Увезување странки и адреси
 DocType: Item,List this Item in multiple groups on the website.,Листа на оваа ставка во повеќе групи на веб-страницата.
 DocType: Request for Quotation,Message for Supplier,Порака за добавувачот
-apps/erpnext/erpnext/stock/doctype/item/item.py,Cannot change {0} as Stock Transaction for Item {1} exist.,"Не може да се промени {0}, бидејќи постои трансакција на акција за точка {1}."
 DocType: Healthcare Practitioner,Phone (R),Телефон (R)
 DocType: Maintenance Team Member,Team Member,Член на тимот
 DocType: Asset Category Account,Asset Category Account,Сметка за категорија на средства
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index e1bb2e1..648274f 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -75,7 +75,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,Appointment {0} and Sales Invoice {1} cancelled,അപ്പോയിന്റ്മെന്റ് {0} കൂടാതെ വിൽപ്പന ഇൻവോയ്സ് {1} റദ്ദാക്കപ്പെട്ടു
 DocType: Purchase Receipt,Vehicle Number,വാഹന നമ്പർ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html,Your email address...,നിങ്ങളുടെ ഇമെയിൽ വിലാസം...
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js,Include Default Book Entries,Default Book Entries ഉള്പ്പെടുത്തുക
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js,Include Default Book Entries,Default Book Entries ഉള്പ്പെടുത്തുക
 DocType: Activity Cost,Activity Type,പ്രവർത്തന തരം
 DocType: Purchase Invoice,Get Advances Paid,പണമടയ്ക്കൽ മുൻകൂർ നേടുക
 DocType: Company,Gain/Loss Account on Asset Disposal,അസറ്റ് തീർപ്പുകൽപ്പിക്കുന്നതിൽ നഷ്ടം / നഷ്ടം അക്കൗണ്ട്
@@ -197,6 +197,7 @@
 DocType: BOM Scrap Item,Basic Amount (Company Currency),അടിസ്ഥാന തുക (കമ്പനി കറൻസി)
 DocType: Selling Settings,Selling Settings,സെറ്റിംഗ്സ് സെറ്റിംഗ്സ്
 apps/erpnext/erpnext/education/doctype/question/question.py,A question must have more than one options,ഒരു ചോദ്യത്തിന് ഒന്നിൽ കൂടുതൽ ഓപ്ഷനുകൾ ഉണ്ടായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ജീവനക്കാരനായി ചേരുന്ന തീയതി ദയവായി സജ്ജമാക്കുക {0}
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your company,നിങ്ങളുടെ കമ്പനിയെക്കുറിച്ച്
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Fiscal Year {0} does not exist,ധനകാര്യ വർഷം {0} നിലവിലില്ല
 DocType: Attendance,Leave Application,അപ്ലിക്കേഷൻ വിടുക
@@ -218,7 +219,9 @@
 DocType: Bank Reconciliation,Payment Entries,പേയ്മെന്റ് എൻട്രികൾ
 DocType: Employee Education,Class / Percentage,ക്ലാസ് / ശതമാനം
 ,Electronic Invoice Register,ഇലക്ട്രോണിക് ഇൻവോയ്സ് രജിസ്റ്റർ
+DocType: Shift Type,The number of occurrence after which the consequence is executed.,പരിണതഫലങ്ങൾ നടപ്പിലാക്കിയ സംഭവങ്ങളുടെ എണ്ണം.
 DocType: Sales Invoice,Is Return (Credit Note),മടങ്ങാണ് (ക്രെഡിറ്റ് നോട്ട്)
+DocType: Price List,Price Not UOM Dependent,വില UOM ആശ്രിതമല്ല
 DocType: Lab Test Sample,Lab Test Sample,ലാബ് ടെസ്റ്റ് സാമ്പിൾ
 DocType: Shopify Settings,status html,സ്റ്റാറ്റസ് html
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","ഉദാഹരണത്തിന് 2012, 2012-13"
@@ -317,6 +320,7 @@
 DocType: Salary Slip,Net Pay,അറ്റ വേതനം
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py,Total Invoiced Amt,മൊത്തം ഇൻവോയ്ഡ് ആറ്റ്
 DocType: Clinical Procedure,Consumables Invoice Separately,പ്രത്യേകം പ്രത്യേകം ഇൻവോയ്സ്
+DocType: Shift Type,Working Hours Threshold for Absent,ഇല്ലാത്തവർക്കുള്ള പ്രവർത്തന സമയം പരിധി
 DocType: Appraisal,HR-APR-.YY.-.MM.,HR-APR-.YY.-.MM.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py,Budget cannot be assigned against Group Account {0},ഗ്രൂപ്പ് അക്കൗണ്ട് {0}
 DocType: Purchase Receipt Item,Rate and Amount,"നിരക്ക്, തുക"
@@ -372,7 +376,6 @@
 DocType: Healthcare Settings,Out Patient Settings,രോഗിയുടെ സജ്ജീകരണങ്ങൾ
 DocType: Asset,Insurance End Date,ഇൻഷുറൻസ് അവസാനിക്കുന്ന തീയതി
 DocType: Bank Account,Branch Code,ബ്രാഞ്ച് കോഡ്
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Respond,പ്രതികരിക്കാനുള്ള സമയം
 apps/erpnext/erpnext/public/js/conf.js,User Forum,ഉപയോക്തൃ ഫോറം
 DocType: Landed Cost Item,Landed Cost Item,ചെലവില്ലാത്ത ഇനം
 apps/erpnext/erpnext/accounts/doctype/share_transfer/share_transfer.py,The seller and the buyer cannot be the same,വിൽപ്പനക്കാരനും വാങ്ങുന്നവനും ഒന്നു തന്നെ
@@ -587,6 +590,7 @@
 DocType: Share Transfer,Transfer,കൈമാറുക
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Search Item (Ctrl + i),ഇനം തിരയുക (Ctrl + i)
 apps/erpnext/erpnext/education/doctype/assessment_result_tool/assessment_result_tool.js,{0} Result submittted,{0} ഫലം സമർപ്പിച്ചു
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,തീയതി മുതൽ ഇന്നത്തേതിനേക്കാൾ വലുതായിരിക്കരുത്
 DocType: Supplier,Supplier of Goods or Services.,ഗുഡ്സ് അല്ലെങ്കിൽ സേവനങ്ങളുടെ വിതരണക്കാരൻ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,പുതിയ അക്കൌണ്ടിന്റെ പേര്. കുറിപ്പ്: ഉപഭോക്താക്കൾക്കും വിതരണക്കാർക്കുമായി അക്കൌണ്ടുകൾ സൃഷ്ടിക്കാൻ പാടില്ല
 apps/erpnext/erpnext/education/doctype/student_attendance/student_attendance.py,Student Group or Course Schedule is mandatory,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് അല്ലെങ്കിൽ കോഴ്സ് ഷെഡ്യൂൾ നിർബന്ധമാണ്
@@ -695,6 +699,7 @@
 apps/erpnext/erpnext/templates/pages/demo.html,ERPNext Demo,ERPNext ഡെമോ
 DocType: Patient,Other Risk Factors,മറ്റ് റിസ്ക് ഘടകങ്ങൾ
 DocType: Item Attribute,To Range,പരിധിയിലേക്കു
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,{0} applicable after {1} working days,{1} പ്രവൃത്തി ദിവസത്തിന് ശേഷം {0} ബാധകമാണ്
 DocType: Task,Task Description,ടാസ്ക് വിവരണം
 DocType: Bank Account,SWIFT Number,SWIFT നമ്പർ
 DocType: Accounts Settings,Show Payment Schedule in Print,അച്ചടിക്കുള്ള പേയ്മെന്റ് ഷെഡ്യൂൾ കാണിക്കുക
@@ -859,7 +864,6 @@
 DocType: Skill,Skill Name,കഴിവുള്ള പേര്
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.js,Print Report Card,റിപ്പോർട്ട് റിപ്പോർട്ട് പ്രിന്റ് ചെയ്യുക
 DocType: Soil Texture,Ternary Plot,ടെർണറി പ്ലോട്ട്
-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} നാമത്തിനായുള്ള പരമ്പര സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Support Tickets,പിന്തുണ ടിക്കറ്റ്
 DocType: Asset Category Account,Fixed Asset Account,അസറ്റ് അക്കൗണ്ട് ഫിക്സ് ചെയ്തിരിക്കുന്നു
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Latest,ഏറ്റവും പുതിയ
@@ -872,6 +876,7 @@
 DocType: Accounting Dimension,Mandatory For Balance Sheet,ബാലൻസ് ഷീറ്റിന് നിർബന്ധമാണ്
 DocType: Payment Entry,Total Allocated Amount,മൊത്തം അനുവദിച്ച തുക
 DocType: Sales Invoice,Get Advances Received,പുരോഗതി പ്രാപിക്കുക
+DocType: Shift Type,Last Sync of Checkin,ചെക്കിന്റെ അവസാന സമന്വയം
 DocType: Student,B-,ബി-
 DocType: Purchase Invoice Item,Item Tax Amount Included in Value,മൂല്യത്തിൽ അടങ്ങിയിരിക്കുന്ന ഇനം ടാക്സ് തുക
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
@@ -880,7 +885,9 @@
 DocType: Student,Blood Group,ബ്ലഡ് ഗ്രൂപ്പ്
 apps/erpnext/erpnext/config/healthcare.py,Masters,മാസ്റ്റേഴ്സ്
 DocType: Crop,Crop Spacing UOM,വലുപ്പം മാറ്റൽ UOM
+DocType: Shift Type,The time after the shift start time when check-in is considered as late (in minutes).,ചെക്ക്-ഇൻ വൈകിയതായി കണക്കാക്കുമ്പോൾ ഷിഫ്റ്റ് ആരംഭിക്കുന്ന സമയത്തിന് ശേഷമുള്ള സമയം (മിനിറ്റിനുള്ളിൽ).
 apps/erpnext/erpnext/templates/pages/home.html,Explore,പര്യവേക്ഷണം ചെയ്യുക
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,മികച്ച ഇൻവോയ്സുകളൊന്നും കണ്ടെത്തിയില്ല
 DocType: Promotional Scheme,Product Discount Slabs,പ്രൊഡക്ട് ഡിസ്കൗണ്ട് സ്ലാബുകൾ
 DocType: Hotel Room Package,Amenities,സൌകര്യങ്ങൾ
 DocType: Lab Test Groups,Add Test,ടെസ്റ്റ് ചേർക്കുക
@@ -976,6 +983,7 @@
 DocType: Item,Moving Average,മാറുന്ന ശരാശരി
 DocType: Employee Attendance Tool,Unmarked Attendance,അടയാളപ്പെടുത്താത്ത അറ്റൻഡൻസ്
 DocType: Homepage Section,Number of Columns,നിരകളുടെ എണ്ണം
+DocType: Issue Priority,Issue Priority,മുൻ‌ഗണന നൽകുക
 DocType: Holiday List,Add Weekly Holidays,പ്രതിവാര അവധിദിനങ്ങൾ ചേർക്കുക
 DocType: Shopify Log,Shopify Log,ലോഗ് ഷോപ്പ് ചെയ്യൂ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Salary Slip,ശമ്പളം സ്ലിപ്പ് സൃഷ്ടിക്കുക
@@ -984,6 +992,7 @@
 DocType: Warranty Claim,Issue Date,പുറപ്പെടുവിക്കുന്ന തീയതി
 apps/erpnext/erpnext/stock/doctype/batch/batch.py,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനത്തിനായുള്ള ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക {0}. ഈ ആവശ്യകത നിറവേറ്റുന്ന ഒരു ബാച്ച് കണ്ടെത്താനായില്ല
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Cannot create Retention Bonus for left Employees,ഇടതു ജീവനക്കാർക്ക് വേണ്ടി നിലനിർത്തൽ ബോണസ് സൃഷ്ടിക്കാൻ കഴിയില്ല
+DocType: Employee Checkin,Location / Device ID,സ്ഥാനം / ഉപകരണ ഐഡി
 DocType: Purchase Order,To Receive,സ്വീകരിക്കാൻ
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾക്ക് നെറ്റ്വർക്ക് ഉണ്ടെങ്കിൽ നിങ്ങൾക്ക് വീണ്ടും ലോഡുചെയ്യാനാകില്ല.
 DocType: Course Activity,Enrollment,എൻറോൾമെന്റ്
@@ -992,7 +1001,6 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Max: {0},പരമാവധി: {0}
 apps/erpnext/erpnext/regional/italy/utils.py,E-Invoicing Information Missing,ഇ-ഇൻവോയിംഗ് വിവരം നഷ്ടപ്പെട്ടു
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ഭൌതിക അഭ്യർത്ഥനയൊന്നും സൃഷ്ടിച്ചിട്ടില്ല
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Loan,Total Amount Paid,പണമടച്ച തുക
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,ഈ ഇനങ്ങൾ എല്ലാം ഇതിനകം തന്നെ വിളിക്കപ്പെട്ടിരിക്കുന്നു
 DocType: Training Event,Trainer Name,പരിശീലകന്റെ പേര്
@@ -1099,6 +1107,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Posting timestamp must be after {0},ടൈംസ്റ്റാമ്പ് പോസ്റ്റുചെയ്യൽ {0}
 DocType: Employee,You can enter any date manually,ഏതെങ്കിലും തീയതി സ്വയം നിങ്ങൾക്ക് സ്വയം നൽകാം
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജന ഇനം
+DocType: Shift Type,Early Exit Consequence,നേരത്തെയുള്ള എക്സിറ്റ് പരിണതഫലങ്ങൾ
 DocType: Item Group,General Settings,പൊതുവായ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/party.py,Due Date cannot be before Posting / Supplier Invoice Date,അവസാന തീയതി പോസ്റ്റുചെയ്യൽ / വിതരണക്കാരൻ ഇൻവോയ്സ് തീയതിക്ക് മുമ്പായിരിക്കരുത്
 apps/erpnext/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py,Enter the name of the Beneficiary before submittting.,സമർപ്പിക്കുന്നതിനുമുമ്പ് ബെനിഫിഷ്യന്റെ പേര് നൽകുക.
@@ -1135,6 +1144,7 @@
 DocType: Account,Auditor,ഓഡിറ്റർ
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_confirmation.html,Payment Confirmation,പണമടച്ചതിന്റെ സ്ഥിരീകരണം
 ,Available Stock for Packing Items,ഇനങ്ങൾ പാക്ക് ചെയ്യാൻ ലഭ്യമായ സ്റ്റോക്ക്
+DocType: Shift Type,Every Valid Check-in and Check-out,"ഓരോ സാധുവായ ചെക്ക്-ഇൻ, ചെക്ക് .ട്ട്"
 DocType: Support Search Source,Query Route String,ചോദ്യ റൂട്ട് സ്ട്രിംഗ്
 DocType: Customer Feedback Template,Customer Feedback Template,ഉപഭോക്താവിന്റെ ഫീഡ്ബാക്ക് ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/config/selling.py,Quotes to Leads or Customers.,ലീഡ്സ് അല്ലെങ്കിൽ കസ്റ്റമർമാർക്കുള്ള ഉദ്ധരണികൾ.
@@ -1168,6 +1178,7 @@
 DocType: Authorization Control,Authorization Control,അധികാരപ്പെടുത്തൽ നിയന്ത്രണം
 ,Daily Work Summary Replies,ദിവസേനയുള്ള ജോലി സംഗ്രഹം മറുപടികൾ
 apps/erpnext/erpnext/projects/doctype/project/project.py,You have been invited to collaborate on the project: {0},പ്രോജക്റ്റിൽ സഹകരിക്കാൻ നിങ്ങളെ ക്ഷണിച്ചിരിക്കുന്നു: {0}
+DocType: Issue,Response By Variance,വേരിയൻസ് പ്രതികരണം
 DocType: Item,Sales Details,വിൽപ്പന വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,അച്ചടി ടെംപ്ലേറ്റുകൾക്കുള്ള കത്ത് തലക്കെട്ടുകൾ.
 DocType: Salary Detail,Tax on additional salary,അധിക ശമ്പളത്തിന് നികുതി
@@ -1289,6 +1300,7 @@
 DocType: Project,Task Progress,ടാസ്ക് പുരോഗതി
 DocType: Journal Entry,Opening Entry,എൻട്രി തുറക്കുന്നു
 DocType: Bank Guarantee,Charges Incurred,ചാർജ് തന്നു
+DocType: Shift Type,Working Hours Calculation Based On,പ്രവൃത്തി സമയ കണക്കുകൂട്ടൽ അടിസ്ഥാനമാക്കി
 DocType: Work Order,Material Transferred for Manufacturing,നിർമ്മാണത്തിനായി വസ്തുക്കൾ കൈമാറ്റം ചെയ്യുന്നു
 DocType: Products Settings,Hide Variants,വേരിയന്റുകൾ മറയ്ക്കുക
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,ശേഷി ആസൂത്രണവും സമയ ട്രാക്കിംഗും അപ്രാപ്തമാക്കുക
@@ -1316,6 +1328,7 @@
 DocType: Guardian,Interests,താൽപ്പര്യങ്ങൾ
 DocType: Purchase Receipt Item Supplied,Consumed Qty,ഉപഭോഗം Qty
 DocType: Education Settings,Education Manager,വിദ്യാഭ്യാസ മാനേജർ
+DocType: Employee Checkin,Shift Actual Start,യഥാർത്ഥ ആരംഭം മാറ്റുക
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,വർക്ക്സ്റ്റേഷൻ പ്രവർത്തി സമയം പുറത്ത് പ്ലാൻ ടൈം ലോഗുകൾ.
 apps/erpnext/erpnext/public/js/utils.js,Loyalty Points: {0},ലോയൽറ്റി പോയിന്റുകൾ: {0}
 DocType: Healthcare Settings,Registration Message,രജിസ്ട്രേഷൻ സന്ദേശം
@@ -1341,7 +1354,6 @@
 DocType: Purchase Invoice,Pricing Rules,വിലനിയന്ത്രണ ചട്ടങ്ങൾ
 DocType: Hub Tracked Item,Image List,ഇമേജ് ലിസ്റ്റ്
 DocType: Item Variant Settings,Allow Rename Attribute Value,ഗുണനാമത്തിന്റെ പ്രതീക മൂല്യം അനുവദിക്കുക
-DocType: Price List,Price Not UOM Dependant,വിലയല്ല UOM ആശ്രയിച്ചത്
 apps/erpnext/erpnext/templates/generators/bom.html,Time(in mins),സമയം (മിനിറ്റിൽ)
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Basic,അടിസ്ഥാന
 DocType: Loan,Interest Income Account,പലിശ വരുമാന അക്കൌണ്ട്
@@ -1351,6 +1363,7 @@
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Select POS Profile,POS പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക
 DocType: Support Settings,Get Latest Query,ഏറ്റവും പുതിയ അന്വേഷണം നേടുക
 DocType: Employee Incentive,Employee Incentive,ജീവനക്കാരുടെ ഇൻസെന്റീവ്
+DocType: Service Level,Priorities,മുൻ‌ഗണനകൾ
 apps/erpnext/erpnext/config/website.py,Add cards or custom sections on homepage,കാർഡുകളോ ഇച്ഛാനുസൃത വിഭാഗങ്ങളോ ഹോംപേജിൽ ചേർക്കുക
 DocType: Homepage,Hero Section Based On,ഹീറോ സെക്ഷന് അടിസ്ഥാനമാക്കിയുള്ളതാണ്
 DocType: Project,Total Purchase Cost (via Purchase Invoice),മൊത്തം വാങ്ങൽ ചെലവ് (വാങ്ങൽ ഇൻവോയ്സ് വഴി)
@@ -1408,8 +1421,9 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Production Order cannot be raised against a Item Template,ഒരു ഇനം ടെംപ്ലേറ്റിനെതിരെ പ്രൊഡക്ഷൻ ഓർഡർ ഉയർത്താൻ കഴിയില്ല
 DocType: Work Order,Manufacture against Material Request,വസ്തു അഭ്യർത്ഥനയ്ക്കെതിരെയുള്ള നിർമ്മാണം
 DocType: Blanket Order Item,Ordered Quantity,കൃത്യമായ അളവ്
+apps/erpnext/erpnext/controllers/buying_controller.py,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ച ഇനത്തിനെതിരെ നിരസിച്ച വെയർഹ house സ് നിർബന്ധമാണ് {1}
 ,Received Items To Be Billed,ബിൽ ചെയ്യേണ്ട ഇനങ്ങൾ
-DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
+DocType: Attendance,Working Hours,ജോലിചെയ്യുന്ന സമയം
 apps/erpnext/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py,Payment Mode,പേയ്മെന്റ് മോഡ്
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html,Purchase Order Items not received on time,കൃത്യസമയത്ത് ഓർഡർ ഇനങ്ങൾ വാങ്ങരുത്
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,Duration in Days,ദിവസത്തിൽ ദൈർഘ്യം
@@ -1424,6 +1438,7 @@
 DocType: Work Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Purchase Invoice Item,Net Rate,നെറ്റ് നിരക്ക്
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Cash,ക്യാഷ് നെറ്റ് മാറ്റം
+apps/erpnext/erpnext/healthcare/doctype/clinical_procedure/clinical_procedure.py,Set warehouse for Procedure {0} ,നടപടിക്രമത്തിനായി വെയർഹ house സ് സജ്ജമാക്കുക {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Block Invoice,ബ്ലോക്ക് ഇൻവോയ്സ്
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: Parent account {1} does not exist,അക്കൗണ്ട് {0}: പാരന്റ് അക്കൗണ്ട് {1} നിലവിലില്ല
 DocType: HR Settings,Encrypt Salary Slips in Emails,ഇമെയിലുകളിൽ ശമ്പളം എൻക്രിപ്റ്റ് ചെയ്യുക
@@ -1528,7 +1543,6 @@
 DocType: Supplier,Statutory info and other general information about your Supplier,നിയമാനുസൃത വിവരവും വിതരണക്കാരനെക്കുറിച്ചുള്ള മറ്റ് പൊതു വിവരങ്ങളും
 DocType: Item Default,Default Selling Cost Center,സെറ്റ് സെറ്റിങ്ങ് കോസ്റ്റ് സെന്റർ
 DocType: Sales Partner,Address & Contacts,വിലാസവും കോൺടാക്റ്റുകളും
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി അറ്റൻഡൻസിനായി നമ്പറിംഗ് സീരീസ് സജ്ജമാക്കുക
 DocType: Subscriber,Subscriber,സബ്സ്ക്രൈബർ
 apps/erpnext/erpnext/utilities/bot.py,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ഫോം / ഇനം / {0}) സ്റ്റോക്കില്ല
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Posting Date first,ദയവായി പോസ്റ്റിങ്ങ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
@@ -1539,7 +1553,7 @@
 DocType: Detected Disease,Tasks Created,ചുമതലകൾ സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/stock/doctype/item/item.py,Default BOM ({0}) must be active for this item or its template,ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റിനായി Default BOM ({0}) സജീവമായിരിക്കണം
 apps/erpnext/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py,Commission Rate %,കമ്മീഷൻ നിരക്ക്%
-DocType: Service Level,Response Time,പ്രതികരണ സമയം
+DocType: Service Level Priority,Response Time,പ്രതികരണ സമയം
 DocType: Woocommerce Settings,Woocommerce Settings,Woocommerce ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Quantity must be positive,അളവ് പോസിറ്റീവ് ആയിരിക്കണം
 DocType: Contract,CRM,CRM
@@ -1556,7 +1570,6 @@
 DocType: Bank Statement Settings,Transaction Data Mapping,ഇടപാട് ഡാറ്റ മാപ്പിംഗ്
 apps/erpnext/erpnext/crm/doctype/lead/lead.py,A Lead requires either a person's name or an organization's name,ഒരു ലീഡിന് ഒരു വ്യക്തിയുടെ പേര് അല്ലെങ്കിൽ സ്ഥാപനത്തിന്റെ പേര് ആവശ്യമാണ്
 DocType: Student,Guardians,ഗാർഡിയൻ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ദയവായി വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ സജ്ജീകരണങ്ങളിൽ സജ്ജീകരണ അധ്യാപിക നാമനിർദേശം ചെയ്യുന്ന സംവിധാനം
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ബ്രാൻഡ് തിരഞ്ഞെടുക്കുക ...
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Middle Income,മധ്യവരുമാനം
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനമാക്കിയുള്ളത് കണക്കാക്കുക
@@ -1657,7 +1670,6 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,അസംസ്കൃത വസ്തുവിന്റെ ഇനം കോഡ്
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയ്സ് {0} ഇതിനകം സമർപ്പിച്ചു
 DocType: Fees,Student Email,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,BOM recursion: {0} cannot be parent or child of {2},BOM Recursion: {0} {2} ന്റെ രക്ഷകർത്താക്കളോ കുട്ടിയോ ആകരുത്
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Get Items from Healthcare Services,ഹെൽത്ത് സർവീസിൽ നിന്ന് ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Stock Entry {0} is not submitted,സ്റ്റോക്ക് എൻട്രി {0} സമർപ്പിക്കപ്പെടുന്നില്ല
 DocType: Item Attribute Value,Item Attribute Value,ആട്രിബ്യൂട്ട് മൂല്യം
@@ -1681,7 +1693,6 @@
 DocType: Production Plan,Select Items to Manufacture,നിർമ്മാണത്തിനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Leave Application,Leave Approver Name,അനുവന്ധ നാമം ഉപേക്ഷിക്കുക
 DocType: Shareholder,Shareholder,ഓഹരി ഉടമ
-DocType: Issue,Agreement Status,ഉടമ്പടി നില
 apps/erpnext/erpnext/config/selling.py,Default settings for selling transactions.,ഇടപാടുകൾ വിൽക്കുന്നതിനുള്ള സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 apps/erpnext/erpnext/education/doctype/student_applicant/student_applicant.py,Please select Student Admission which is mandatory for the paid student applicant,വിദ്യാർത്ഥി അപേക്ഷകന് നിർബന്ധിതമായ വിദ്യാർത്ഥി അഡ്മിഷൻ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Select BOM,BOM തിരഞ്ഞെടുക്കുക
@@ -1936,6 +1947,7 @@
 DocType: Account,Income Account,വരുമാന അക്കൌണ്ട്
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py,All Warehouses,എല്ലാ ഗാർഡ്യൂട്ടുകളും
 DocType: Contract,Signee Details,സൂചന വിശദാംശങ്ങൾ
+DocType: Shift Type,Allow check-out after shift end time (in minutes),ഷിഫ്റ്റ് അവസാന സമയത്തിന് ശേഷം (മിനിറ്റിനുള്ളിൽ) ചെക്ക് out ട്ട് അനുവദിക്കുക
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,Procurement,സംഭരണം
 DocType: Item Group,Check this if you want to show in website,നിങ്ങൾ വെബ്സൈറ്റിൽ കാണിക്കാൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ ഇത് ചെക്ക് ചെയ്യുക
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Fiscal Year {0} not found,ധനകാര്യ വർഷം {0} കണ്ടെത്തിയില്ല
@@ -1998,6 +2010,7 @@
 DocType: Asset Finance Book,Depreciation Start Date,ഡിസ്രിരിസേഷൻ ആരംഭ തീയതി
 DocType: Activity Cost,Billing Rate,ബില്ലിംഗ് നിരക്ക്
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,Please enable Google Maps Settings to estimate and optimize routes,വഴികൾ കണക്കാക്കാനും ഒപ്റ്റിമൈസുചെയ്യാനും ദയവായി Google മാപ്സ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കുക
+DocType: Purchase Invoice Item,Page Break,പേജ് ബ്രേക്ക്
 DocType: Supplier Scorecard Criteria,Max Score,പരമാവധി സ്കോർ
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Repayment Start Date cannot be before Disbursement Date.,തിരിച്ചടവ് ആരംഭ തീയതി തിയതി നിശ്ചിത തീയതിക്ക് മുമ്പായിരിക്കരുത്.
 DocType: Support Search Source,Support Search Source,തിരയൽ സ്രോതസ്സുകളെ പിന്തുണയ്ക്കുക
@@ -2061,6 +2074,7 @@
 DocType: Employee Transfer,Employee Transfer,എംപ്ലോയീസ് ട്രാൻസ്ഫർ
 ,Sales Funnel,സെയിൽസ് ഫണൽ
 DocType: Agriculture Analysis Criteria,Water Analysis,ജല വിശകലനം
+DocType: Shift Type,Begin check-in before shift start time (in minutes),ഷിഫ്റ്റ് ആരംഭ സമയത്തിന് മുമ്പ് ചെക്ക്-ഇൻ ആരംഭിക്കുക (മിനിറ്റിനുള്ളിൽ)
 DocType: Accounts Settings,Accounts Frozen Upto,അക്കൌണ്ടുകൾ അപ്രാപ്തമാക്കി
 apps/erpnext/erpnext/setup/doctype/supplier_group/supplier_group.js,There is nothing to edit.,എഡിറ്റുചെയ്യാൻ ഒന്നുമില്ല.
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","വർക്ക്സ്റ്റേഷനിൽ {0} വർക്ക്സ്റ്റേഷനിൽ ലഭ്യമായ പ്രവർത്തന സമയത്തേക്കാൾ ഓപ്പറേറ്റർ {0}, പ്രവർത്തനം ഒന്നിലധികം ഓപ്പറേഷനുകളാക്കി മാറ്റും"
@@ -2071,9 +2085,12 @@
 apps/erpnext/erpnext/utilities/user_progress.py,"Add users to your organization, other than yourself.","നിങ്ങളെക്കാളുപരി, നിങ്ങളുടെ ഓർഗനൈസേഷനിൽ ഉപയോക്താക്കളെ ചേർക്കുക."
 DocType: Global Defaults,Default Company,സ്ഥിര കമ്പനി
 DocType: Shopify Settings,Cash Account will used for Sales Invoice creation,സെയിൽ ഇൻവോയ്സ് സൃഷ്ടിക്കുന്നതിന് പണ അക്കൗണ്ട് ഉപയോഗിക്കുന്നു
+apps/erpnext/erpnext/controllers/selling_controller.py,Sales Order {0} is {1},വിൽപ്പന ഓർഡർ {0} {1} ആണ്
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),പണമടയ്ക്കൽ കാലതാമസം (ദിവസം)
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Enter depreciation details,വിലയിരുത്തൽ വിശദാംശങ്ങൾ നൽകുക
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Customer PO,കസ്റ്റമർ പി.ഒ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Expected Delivery Date should be after Sales Order Date,പ്രതീക്ഷിക്കുന്ന ഡെലിവറി തീയതി സെയിൽസ് ഓർഡർ തീയതിക്ക് ശേഷം ആയിരിക്കണം
+apps/erpnext/erpnext/controllers/accounts_controller.py,Item quantity can not be zero,ഇനത്തിന്റെ അളവ് പൂജ്യമാകരുത്
 apps/erpnext/erpnext/controllers/item_variant.py,Invalid Attribute,ആട്രിബ്യൂട്ട് അസാധുവാണ്
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ഇൻവോയ്സ് തരം
 DocType: Price List,Price List Master,വില ലിസ്റ്റ് മാസ്റ്റർ
@@ -2082,6 +2099,7 @@
 DocType: Volunteer,Afternoon,ഉച്ചകഴിഞ്ഞ്
 DocType: Vital Signs,Nutrition Values,പോഷകാഹാര മൂല്യങ്ങൾ
 DocType: Vital Signs,Presence of a fever (temp &gt; 38.5 °C/101.3 °F or sustained temp &gt; 38 °C/100.4 °F),പനിവിന്റെ സാന്നിധ്യം (താൽക്കാലിക&gt; 38.5 ° C / 101.3 ° F അല്ലെങ്കിൽ സുസ്ഥിരമായ താപനില&gt; 38 ° C / 100.4 ° F)
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,ITC Reversed,ഐടിസി റിവൈഡ് ചെയ്തു
 DocType: Project,Collect Progress,ശേഖര പുരോഗതി
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Energy,ഊർജ്ജം
@@ -2131,6 +2149,7 @@
 ,Ordered Items To Be Billed,ബിൽ ചെയ്യേണ്ട ഓർഡറുകൾ
 DocType: Taxable Salary Slab,To Amount,തുക
 DocType: Purchase Invoice,Is Return (Debit Note),റിട്ടേൺ (ഡെബിറ്റ് നോട്ട്)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/config/desktop.py,Getting Started,ആമുഖം
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ലയിപ്പിക്കുക
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,ധനന വർഷം ആയിരിയ്ക്കുന്ന തീയതിയും ഫിസ്കൽ വർഷം അവസാന തീയതിയും മാറ്റാൻ കഴിയില്ല.
@@ -2149,6 +2168,7 @@
 DocType: Purchase Invoice,Select Supplier Address,വിതരണക്കാരൻ വിലാസം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py,Please enter API Consumer Secret,ദയവായി API കൺസ്യൂമർ സീക്രട്ട് നൽകുക
 DocType: Program Enrollment Fee,Program Enrollment Fee,പ്രോഗ്രാം എൻറോൾമെന്റ് ഫീസ്
+DocType: Employee Checkin,Shift Actual End,യഥാർത്ഥ അവസാനം ഷിഫ്റ്റ് ചെയ്യുക
 DocType: Serial No,Warranty Expiry Date,വാറന്റി കാലഹരണ തീയതി
 DocType: Hotel Room Pricing,Hotel Room Pricing,ഹോട്ടൽ മുറികൾ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,"Outward taxable supplies(other than zero rated, nil rated and exempted","പുറമേയുള്ള നികുതിവിധേയമായ സപ്ലൈസ് (പൂജ്യമായി റേറ്റുചെയ്തിട്ടുള്ള മറ്റ് വിലകൾ, വിലക്കുറവുള്ളതും ഒഴിവാക്കാവുന്നതുമായവ"
@@ -2158,6 +2178,7 @@
 DocType: Timesheet,Total Billed Hours,ആകെ ബില്ലും സമയം
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Current invoice {0} is missing,നിലവിലെ ഇൻവോയ്സ് {0} കാണുന്നില്ല
 DocType: Healthcare Settings,Patient Registration,രോഗി രജിസ്ട്രേഷൻ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Supplier Invoice No exists in Purchase Invoice {0},വാങ്ങൽ ഇൻവോയ്സിൽ വിതരണ ഇൻവോയ്സ് ഇല്ല {0}
 DocType: Service Day,Workday,തൊഴിൽദിനം
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,No Items added to cart,കാർട്ടിൽ ഇനങ്ങളൊന്നും ചേർത്തിട്ടില്ല
 DocType: Target Detail,Target Qty,ടാർഗെറ്റ് ക്വാണ്ടി
@@ -2205,6 +2226,7 @@
 DocType: Quality Inspection Reading,Reading 5,വായന 5
 DocType: Shopping Cart Settings,Display Settings,ഡിസ്പ്ലേ സെറ്റിംഗ്സ്
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Please set Number of Depreciations Booked,ബുക്കഷോകളുടെ എണ്ണം ക്രമീകരിക്കുക
+DocType: Shift Type,Consequence after,പരിണതഫലങ്ങൾ
 apps/erpnext/erpnext/templates/pages/help.html,What do you need help with?,നിങ്ങൾക്ക് എന്തു സഹായം ആവശ്യമാണ്?
 DocType: Journal Entry,Printing Settings,അച്ചടി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,ബാങ്കിംഗ്
@@ -2214,6 +2236,7 @@
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ഷിപ്പിംഗ് വിലാസം പോലെ ബില്ലിംഗ് വിലാസം സമാനമാണ്
 DocType: Account,Cash,ക്യാഷ്
 DocType: Employee,Leave Policy,നയം ഉപേക്ഷിക്കുക
+DocType: Shift Type,Consequence,പരിണതഫലങ്ങൾ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Address,വിദ്യാർത്ഥി വിലാസം
 DocType: GST Account,CESS Account,അക്കൗണ്ട് കുറവ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: &#39;ലാഭം-നഷ്ടം&#39; അക്കൗണ്ടിനായുള്ള കോസ്റ്റ് സെന്റർ ആവശ്യമാണ് {2}. കമ്പനിയ്ക്കായി ഒരു സ്ഥിര കോസ്റ്റ് സെന്റർ സജ്ജീകരിക്കുക.
@@ -2277,6 +2300,7 @@
 DocType: Period Closing Voucher,Period Closing Voucher,കാലാവധി പൂർത്തിയാക്കുന്ന വൗച്ചർ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Name,Guardian2 പേര്
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Please enter Expense Account,ചെലവ് അക്കൗണ്ട് നൽകുക
+DocType: Issue,Resolution By Variance,വേരിയൻസ് പ്രമേയം
 DocType: Employee,Resignation Letter Date,രാജിവെയ്ക്കൽ കത്ത് തീയതി
 DocType: Soil Texture,Sandy Clay,സാൻഡി ക്ലേ
 DocType: Upload Attendance,Attendance To Date,തീയതിയിലേക്കുള്ള സമ്മേളനം
@@ -2289,6 +2313,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js,View Now,ഇപ്പോൾ കാണുക
 DocType: Item Price,Valid Upto,സാധുവാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Reference Doctype must be one of {0},റഫറൻസ് ഡോക്റ്റൈപ്പ് {0}
+DocType: Employee Checkin,Skip Auto Attendance,യാന്ത്രിക ഹാജർ ഒഴിവാക്കുക
 DocType: Payment Request,Transaction Currency,ഇടപാട് കറൻസി
 DocType: Loan,Repayment Schedule,തിരിച്ചടവ് ഷെഡ്യൂൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Create Sample Retention Stock Entry,സാമ്പിൾ നിലനിർത്തൽ സ്റ്റോക്ക് എൻട്രി സൃഷ്ടിക്കുക
@@ -2360,6 +2385,7 @@
 DocType: POS Closing Voucher Taxes,POS Closing Voucher Taxes,പിഒസ് അടച്ച വൗച്ചർ നികുതി
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,Action Initialised,പ്രവർത്തനം സമാരംഭിച്ചു
 DocType: POS Profile,Applicable for Users,ഉപയോക്താക്കൾക്ക് ബാധകമാണ്
+,Delayed Order Report,ഓർഡർ റിപ്പോർട്ട് വൈകി
 DocType: Training Event,Exam,പരീക്ഷ
 apps/erpnext/erpnext/accounts/general_ledger.py,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,പൊതുവായ ലെഡ്ജർ എൻട്രികളുടെ തെറ്റായ എണ്ണം കണ്ടെത്തി. ഇടപാടിന് നിങ്ങൾ ഒരു തെറ്റായ അക്കൗണ്ട് തിരഞ്ഞെടുത്തിരിക്കാം.
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline,സെയിൽസ് പൈപ്പ്ലൈൻ
@@ -2374,9 +2400,9 @@
 DocType: Pricing Rule,Conditions will be applied on all the selected items combined. ,തിരഞ്ഞെടുത്ത എല്ലാ ഇനങ്ങൾക്കും വ്യവസ്ഥകൾ പ്രയോഗിക്കപ്പെടും.
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Configure,ക്രമീകരിക്കുക
 DocType: Hotel Room,Capacity,ശേഷി
+DocType: Employee Checkin,Shift End,ഷിഫ്റ്റ് അവസാനം
 DocType: Installation Note Item,Installed Qty,ഇൻസ്റ്റാൾ ചെയ്ത ക്യൂട്ടി
 DocType: Hotel Room Reservation,Hotel Reservation User,ഹോട്ടൽ റിസർവേഷൻ ഉപയോക്താവ്
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Workday has been repeated twice,ജോലി സമയം രണ്ടു തവണ ആവർത്തിച്ചു
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Item Group not mentioned in item master for item {0},ഇനം {0} ഇനത്തിനായി ഇനം മാസ്റ്റർയിൽ ഇനം പട്ടിക പരാമർശിച്ചിട്ടില്ല
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Name error: {0},പേര് പിശക്: {0}
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Territory is Required in POS Profile,POS പ്രൊഫൈലിൽ പ്രദേശം ആവശ്യമാണ്
@@ -2423,6 +2449,7 @@
 DocType: Depreciation Schedule,Schedule Date,ഷെഡ്യൂൾ തീയതി
 DocType: Packing Slip,Package Weight Details,പാക്കേജ് ഭാരം സംബന്ധിച്ച വിശദാംശങ്ങൾ
 DocType: Job Applicant,Job Opening,തൊഴിൽ അവസരങ്ങൾ
+DocType: Shift Type,Last Known Successful Sync of Employee Checkin. Reset this only if you are sure that all Logs are synced from all the locations. Please don't modify this if you are unsure.,ജീവനക്കാരുടെ ചെക്കിന്റെ അവസാനത്തെ അറിയപ്പെടുന്ന വിജയകരമായ സമന്വയം. എല്ലാ ലോഗുകളും എല്ലാ ലൊക്കേഷനുകളിൽ നിന്നും സമന്വയിപ്പിച്ചുവെന്ന് നിങ്ങൾക്ക് ഉറപ്പുണ്ടെങ്കിൽ മാത്രം ഇത് പുന reset സജ്ജമാക്കുക. നിങ്ങൾക്ക് ഉറപ്പില്ലെങ്കിൽ ഇത് പരിഷ്‌ക്കരിക്കരുത്.
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Cost,യഥാർത്ഥ ചെലവ്
 apps/erpnext/erpnext/stock/doctype/item/item.py,Item Variants updated,ഇനം വകഭേദങ്ങൾ അപ്ഡേറ്റുചെയ്തു
 DocType: Item,Batch Number Series,ബാച്ച് നമ്പർ സീരീസ്
@@ -2437,6 +2464,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,സന്ദേശം അയച്ചു
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Same item has been entered multiple times. {0},ഇതേ ഇനം ഒന്നിലധികം തവണ നൽകി. {0}
 DocType: Pricing Rule,Margin,മാർജിൻ
+apps/erpnext/erpnext/accounts/utils.py,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; സാമ്പത്തിക വർഷത്തിലല്ല {2}
 DocType: Fee Schedule,Fee Structure,ഫീസ് ഘടന
 apps/erpnext/erpnext/public/js/templates/item_quick_entry.html,Variant Attributes,വേരിയന്റ് ആട്രിബ്യൂട്ടുകൾ
 DocType: Employee,Confirmation Date,സ്ഥിരീകരണ തീയതി
@@ -2454,6 +2482,7 @@
 apps/erpnext/erpnext/stock/utils.py,Item {0} ignored since it is not a stock item,ഒരു സ്റ്റോക്ക് ഇനം അല്ലാത്തതിനാൽ ഇനം {0} അവഗണിക്കപ്പെട്ടു
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot have Valuation Rate",&quot;കസ്റ്റമർ നൽകിയ ഇനം&quot; എന്നതിന് മൂല്യനിർണയ നിരക്ക് ഇല്ല
 DocType: Soil Texture,Clay,കളിമണ്ണ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,"{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution.","{0} ന് നിലവിൽ {1} വിതരണ സ്‌കോർകാർഡ് നിലയുണ്ട്, ഈ വിതരണക്കാരന് വാങ്ങൽ ഓർഡറുകൾ ജാഗ്രതയോടെ നൽകണം."
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ഇനം മറ്റൊരു ഇനത്തിന്റെ ഒരു വകഭേദമാണെങ്കിൽ വ്യക്തമായും വ്യക്തമാക്കിയിട്ടില്ലെങ്കിൽ വിവരണം, ഇമേജ്, വിലനിർണ്ണയം, നികുതികൾ എന്നിവ ടെംപ്ലേറ്റിൽ നിന്നും സജ്ജമാക്കിയിരിക്കും."
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py,Total Target,ആകെ ലക്ഷ്യം
 DocType: Location,Longitude,രേഖാംശം
@@ -2463,6 +2492,7 @@
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invocies,ഇൻവോകികൾ നേടുക
 DocType: Tally Migration,Is Day Book Data Imported,ഡേ ബുക്ക് പുസ്തകം ഡാറ്റ ഇറക്കുമതി ചെയ്തു
 ,Sales Partners Commission,സെയിൽസ് പാർട്ട്ണേഴ്സ് കമ്മീഷൻ
+DocType: Shift Type,Enable Different Consequence for Early Exit,നേരത്തെയുള്ള എക്സിറ്റിന് വ്യത്യസ്ത പരിണതഫലങ്ങൾ പ്രാപ്തമാക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Legal,നിയമപരമായ
 DocType: Loan Application,Required by Date,തീയതി പ്രകാരം ആവശ്യമാണ്
 DocType: Quiz Result,Quiz Result,ക്വിസ് ഫലം
@@ -2518,8 +2548,8 @@
 DocType: C-Form,Received Date,ലഭിച്ച തീയതി
 apps/erpnext/erpnext/config/accounting.py,Financial / accounting year.,സാമ്പത്തിക / അക്കൌണ്ടിംഗ് വർഷം.
 DocType: Pricing Rule,Pricing Rule,വിലനിയന്ത്രണം
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},അവധിക്കാല കാലയളവിനായി ഓപ്ഷണൽ ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കിയിട്ടില്ല {0}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please set User ID field in an Employee record to set Employee Role,തൊഴിലുടമ റോൾ സജ്ജമാക്കാൻ ഒരു എംപ്ലോയർ റെക്കോർഡിൽ ഉപയോക്തൃ ഐഡി ഫീല്ഡ് സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/support/doctype/issue/issue.js,Time To Resolve,പരിഹരിക്കാൻ സമയം
 DocType: Training Event,Training Event,പരിശീലന ഇവന്റ്
 DocType: Vital Signs,"Normal resting blood pressure in an adult is approximately 120 mmHg systolic, and 80 mmHg diastolic, abbreviated ""120/80 mmHg""","മുതിർന്നവരിൽ സാധാരണ രക്തസമ്മർദ്ദം 120 mmHg സിസോളിക്, 80 mmHg ഡയസ്റ്റോളിക്, ചുരുക്കി &quot;120/80 mmHg&quot;"
 DocType: Payment Reconciliation,System will fetch all the entries if limit value is zero.,ലിമിറ്റ് മൂല്യം പൂജ്യമാണെങ്കിൽ സിസ്റ്റം എല്ലാ എൻട്രികളും ലഭ്യമാക്കും.
@@ -2563,9 +2593,11 @@
 DocType: Student Applicant,Approved,അംഗീകരിച്ചു
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,From Date should be within the Fiscal Year. Assuming From Date = {0},തീയതി മുതൽ ഫിഷ് വർഷത്തിനുള്ളിൽ ആയിരിക്കണം. തീയതി മുതൽ {0} മുതൽ അനുഗമിക്കുന്നു
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Please Set Supplier Group in Buying Settings.,വാങ്ങൽ ക്രമീകരണങ്ങളിൽ വിതരണ ഗ്രൂപ്പ് സജ്ജീകരിക്കുക.
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,{} is an invalid Attendance Status.,{} അസാധുവായ ഹാജർ നിലയാണ്.
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,താൽക്കാലിക തുറക്കൽ അക്കൗണ്ട്
 DocType: Purchase Invoice,Cash/Bank Account,ക്യാഷ് / ബാങ്ക് അക്കൗണ്ട്
 DocType: Quality Meeting Table,Quality Meeting Table,ക്വാളിറ്റി മീറ്റിംഗ് ടേബിൾ
+apps/erpnext/erpnext/education/doctype/academic_term/academic_term.py,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"ടേം ആരംഭിക്കുന്ന തീയതി, പദം ബന്ധിപ്പിച്ച അക്കാദമിക് വർഷത്തിന്റെ ആരംഭ തീയതിക്ക് മുമ്പുള്ളതായിരിക്കരുത് (അക്കാദമിക് വർഷം {}). തീയതികൾ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക."
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 1,പ്രാധാന്യം അർജം 1
 DocType: Employee Tax Exemption Proof Submission,Tax Exemption Proofs,ടാക്സ് എക്സംപ്ഷൻ പ്രൂഫ്സ്
 DocType: Purchase Invoice,Price List Currency,വില ലിസ്റ്റ് കറൻസി
@@ -2597,6 +2629,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ഭക്ഷണം, ബീവറേജ്, ടുബാക്കോ"
 apps/erpnext/erpnext/education/doctype/course/course.js,Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ഇനം തരം ടാക്സ് വിശദാംശം
+DocType: Shift Type,Attendance will be marked automatically only after this date.,ഈ തീയതിക്ക് ശേഷം മാത്രമേ ഹാജർ സ്വപ്രേരിതമായി അടയാളപ്പെടുത്തൂ.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to UIN holders,UIN ഉടമസ്ഥർക്ക് നൽകുന്ന സപ്ലൈസ്
 apps/erpnext/erpnext/hooks.py,Request for Quotations,ഉദ്ധരണികൾക്കുള്ള അഭ്യർത്ഥന
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Currency can not be changed after making entries using some other currency,മറ്റ് കറൻസി ഉപയോഗിച്ച് എൻട്രികൾ വരുത്തിയ ശേഷം നാണയത്തെ മാറ്റാൻ കഴിയില്ല
@@ -2644,7 +2677,6 @@
 DocType: Item,Is Item from Hub,ഇനം ഹബ് ആണ്
 apps/erpnext/erpnext/config/quality_management.py,Quality Procedure.,ഗുണ നിലവാരം.
 DocType: Share Balance,No of Shares,ഷെയറുകളുടെ എണ്ണം
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),വരി {0}: പ്രവേശന സമയം ({2} {3}) പോസ്റ്റിങ്ങിൽ {1} വെയർഹൌസിലുള്ള {4}
 DocType: Quality Action,Preventive,പ്രിവന്റീവ്
 DocType: Support Settings,Forum URL,ഫോറം URL
 apps/erpnext/erpnext/config/hr.py,Employee and Attendance,ജീവനക്കാരനും പങ്കെടുക്കും
@@ -2860,7 +2892,6 @@
 DocType: Promotional Scheme Price Discount,Discount Type,കിഴിവ് തരം
 DocType: Hotel Settings,Default Taxes and Charges,സ്ഥിര നികുതികളും നിരക്കുകളും
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py,This is based on transactions against this Supplier. See timeline below for details,ഈ വിതരണക്കാരനെതിരായ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്കായി താഴെയുള്ള ടൈംലൈൻ കാണുക
-apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Enter Start and End Date for the Agreement.,ഉടമ്പടിക്ക് ആരംഭവും അവസാന സമയവും നൽകുക.
 DocType: Delivery Note Item,Against Sales Invoice,വിൽപ്പനവിവരം എതിരെ
 DocType: Loyalty Point Entry,Purchase Amount,വാങ്ങൽ തുക
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py,Cannot set as Lost as Sales Order is made.,സെൽ ഓർഡർ നിർമ്മിക്കപ്പെടുമ്പോൾ തന്നെ നഷ്ടപ്പെടാൻ കഴിയില്ല.
@@ -2884,7 +2915,7 @@
 DocType: Lead,Organization Name,സംഘടനയുടെ പേര്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,ഫീൽഡുകൾ വരെ സാധുതയുള്ളതും സാധുതയുള്ളതുമാണ് സംഖ്യാടിസ്ഥാനത്തിലുള്ള അവശ്യമായത്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2}
-DocType: Employee,Leave Details,വിശദാംശങ്ങൾ വിടുക
+DocType: Employee Checkin,Shift Start,ആരംഭം മാറ്റുക
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Stock transactions before {0} are frozen,{0} മുമ്പ് ഓഹരി ഇടപാടുകൾ ഫ്രീസുചെയ്തു
 DocType: Driver,Issuing Date,വിതരണം ചെയ്യുന്ന തീയതി
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requestor,അഭ്യർത്ഥകൻ
@@ -2928,9 +2959,11 @@
 DocType: Cash Flow Mapping Template Details,Cash Flow Mapping Template Details,ക്യാഷ് ഫ്ലോ മാപ്പിംഗ് ടെംപ്ലേറ്റ് വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/config/hr.py,Recruitment and Training,റിക്രൂട്ട്മെന്റും പരിശീലനവും
 DocType: Drug Prescription,Interval UOM,ഇടവേള UOM
+DocType: Shift Type,Grace Period Settings For Auto Attendance,യാന്ത്രിക ഹാജർനിലയ്ക്കുള്ള ഗ്രേസ് പിരീഡ് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py,From Currency and To Currency cannot be same,കറൻസിയിൽ നിന്നും കറൻസിയിൽ നിന്നും ഒന്നായിരിക്കില്ല
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Pharmaceuticals,ഫാർമസ്യൂട്ടിക്കൽസ്
 DocType: Employee,HR-EMP-,HR-EMP-
+DocType: Service Level,Support Hours,പിന്തുണാ സമയം
 apps/erpnext/erpnext/controllers/selling_controller.py,{0} {1} is cancelled or closed,{0} {1} റദ്ദാക്കപ്പെട്ടു അല്ലെങ്കിൽ അടച്ചു
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,വരി {0}: ഉപഭോക്താവിനോടുള്ള മുൻകൂർ വായ്പയായിരിക്കണം
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Group by Voucher (Consolidated),വൗച്ചർ വഴി ഗ്രൂപ്പ് (കൺസോളിഡേറ്റഡ്)
@@ -3039,6 +3072,7 @@
 DocType: Territory,Territory Manager,ടെറിട്ടറി മാനേജർ
 DocType: Lab Test,Sample ID,മാതൃകാ ഐഡി
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
+apps/erpnext/erpnext/hr/doctype/shift_type/shift_type.js,Attendance has been marked as per employee check-ins,ജീവനക്കാരുടെ ചെക്ക്-ഇന്നുകൾ പ്രകാരം ഹാജർ അടയാളപ്പെടുത്തി
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Asset {0} must be submitted,അസറ്റ് {0} സമർപ്പിക്കേണ്ടതാണ്
 ,Absent Student Report,സ്റ്റാൻഡേർഡ് റിപ്പോർട്ട് റിപ്പോർട്ടു ചെയ്തു
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Included in Gross Profit,മൊത്തം ലാഭത്തിൽ ഉൾപ്പെടുത്തിയിരിക്കുന്നു
@@ -3046,7 +3080,9 @@
 DocType: Travel Request Costing,Funded Amount,ഫണ്ടഡ് തുക
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,{0} {1} has not been submitted so the action cannot be completed,{0} {1} സമർപ്പിച്ചു കൂടാതെ പ്രവർത്തനം പൂർത്തിയായില്ല
 DocType: Subscription,Trial Period End Date,ട്രയൽ കാലയളവ് അവസാനിക്കുന്ന തീയതി
+DocType: Shift Type,Alternating entries as IN and OUT during the same shift,"ഒരേ ഷിഫ്റ്റിൽ‌ IN, OUT എന്നിങ്ങനെ ഇതര എൻ‌ട്രികൾ‌"
 DocType: BOM Update Tool,The new BOM after replacement,പകരം പുതിയ ബോം
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 5,ഇനം 5
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Temporary Opening,താൽക്കാലിക തുറക്കൽ
@@ -3148,6 +3184,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,എല്ലാ വിതരണക്കാരെയും ചേർക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},വരി {0}: BOM # {1} എന്ന നാണയം തിരഞ്ഞെടുത്ത കറൻസിക്ക് തുല്യമായിരിക്കണം {2}
 DocType: Pricing Rule,Product,ഉൽപ്പന്നം
+apps/erpnext/erpnext/utilities/bot.py,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),[{1}] (# ഫോം / ഇനം / {1}) ന്റെ {0} യൂണിറ്റുകൾ [{2}] (# ഫോം / വെയർഹ house സ് / {2})
 DocType: Vital Signs,Weight (In Kilogram),ഭാരം (കിലൊഗ്രാമിൽ)
 DocType: Department,Leave Approver,Approver വിടുക
 apps/erpnext/erpnext/hr/doctype/leave_period/leave_period_dashboard.py,Transactions,ഇടപാടുകൾ
@@ -3159,6 +3196,7 @@
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
 ,Issued Items Against Work Order,വർക്ക് ഓർഡർക്കെതിരെയുള്ള ഇഷ്യു ചെയ്ത ഇനങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,ഇൻവോയ്സ് {0} സൃഷ്ടിക്കുന്നു
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 DocType: Student,Joining Date,തീയതിയിൽ ചേരുന്നു
 apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Requesting Site,സൈറ്റ് അഭ്യർത്ഥിക്കുന്നു
 DocType: Purchase Invoice,Against Expense Account,എക്സ്ട്രീം എക്സസ് അക്കൗണ്ട്
@@ -3198,6 +3236,7 @@
 DocType: Landed Cost Item,Applicable Charges,ബാധകമായ നിരക്കുകൾ
 ,Point of Sale,പോയിന്റ് ഓഫ് സെയിൽ
 DocType: Authorization Rule,Approving User  (above authorized value),ഉപയോക്താവിനെ അംഗീകരിക്കുന്നു (അംഗീകൃത മൂല്യത്തിന് മുകളിൽ)
+DocType: Service Level Agreement,Entity,എന്റിറ്റി
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Amount {0} {1} transferred from {2} to {3},{0} {1} തുക {2} മുതൽ {3}
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Customer {0} does not belong to project {1},{1} ഉപഭോക്താവ് {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From Party Name,പാർട്ടി നാമത്തിൽ നിന്ന്
@@ -3299,7 +3338,6 @@
 DocType: Asset,Asset Owner,അസറ്റ് ഉടമസ്ഥൻ
 apps/erpnext/erpnext/buying/utils.py,Warehouse is mandatory for stock Item {0} in row {1},സ്റ്റോക്ക് ഇനം {0} നിരയിൽ {1} വെയർഹൌസ് നിർബന്ധമാണ്
 DocType: Stock Entry,Total Additional Costs,ആകെ അധിക ചെലവ്
-DocType: Marketplace Settings,Last Sync On,അവസാനം സമന്വയിപ്പിക്കൽ ഓണാണ്
 apps/erpnext/erpnext/regional/italy/utils.py,Please set at least one row in the Taxes and Charges Table,നികുതികളും ചാർജുകളും പട്ടികയിൽ കുറഞ്ഞത് ഒരു വരിയെങ്കിലും ക്രമീകരിക്കുക
 DocType: Asset Maintenance Team,Maintenance Team Name,മെയിൻറനൻസ് ടീം പേര്
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Chart of Cost Centers,ചെലവ് കേന്ദ്രങ്ങളുടെ ചാർട്ട്
@@ -3313,12 +3351,13 @@
 DocType: Sales Order Item,Work Order Qty,വർക്ക് ഓർഡർ Qty
 DocType: Job Card,WIP Warehouse,WIP വെയർഹൗസ്
 DocType: Payment Request,ACC-PRQ-.YYYY.-,ACC-PRQ -YYYY.-
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available qty is {0}, you need {1}","{0} കിറ്റ് ലഭ്യം, നിങ്ങൾക്ക് {1}"
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,User ID not set for Employee {0},ജീവനക്കാരനായി ഉപയോക്തൃ ഐഡി സജ്ജമാക്കിയിട്ടില്ല {0}
 apps/erpnext/erpnext/education/doctype/guardian/guardian.py,User {0} created,ഉപയോക്താവ് {0} സൃഷ്ടിച്ചു
 DocType: Stock Settings,Item Naming By,ഇനം പേരുനൽകിയത്
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js,Ordered,ക്രമീകരിച്ചു
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"ഇത് ഒരു റൂട്ട് കസ്റ്റമർ ഗ്രൂപ്പാണ്, എഡിറ്റുചെയ്യാൻ കഴിയില്ല."
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py,Material Request {0} is cancelled or stopped,മെറ്റീരിയൽ അഭ്യർത്ഥന {0} റദ്ദാക്കി അല്ലെങ്കിൽ നിർത്തുക
+DocType: Shift Type,Strictly based on Log Type in Employee Checkin,ജീവനക്കാരുടെ ചെക്ക്ഇനിലെ ലോഗ് തരം കർശനമായി അടിസ്ഥാനമാക്കിയുള്ളതാണ്
 DocType: Purchase Order Item Supplied,Supplied Qty,നൽകിയത് Qty
 DocType: Cash Flow Mapper,Cash Flow Mapper,ക്യാഷ് ഫ്ലോ മാപ്പർ
 DocType: Soil Texture,Sand,മണല്
@@ -3377,6 +3416,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Duplicate item group found in the item group table,ഇനം ഗ്രൂപ്പ് പട്ടികയിൽ തനിപ്പകർപ്പ് ഇനം ഗ്രൂപ്പ് കണ്ടെത്തി
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Annual Salary,വാർഷിക ശമ്പളം
 DocType: Supplier Scorecard,Weighting Function,തൂക്കമുള്ള പ്രവർത്തനം
+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}
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py,Error evaluating the criteria formula,മാനദണ്ഡ ഫോർമുല മൂല്യനിർണ്ണയിക്കുന്നതിൽ പിശക്
 ,Lab Test Report,ലാബ് ടെസ്റ്റ് റിപ്പോർട്ട്
 DocType: BOM,With Operations,പ്രവർത്തനങ്ങൾ
@@ -3401,9 +3441,11 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Multiple Loyalty Program found for the Customer. Please select manually.,ഉപഭോക്താവിനായി ഒന്നിലധികം ലോയൽറ്റി പ്രോഗ്രാം കണ്ടെത്തി. ദയവായി സ്വമേധയാ തിരഞ്ഞെടുക്കുക.
 DocType: Patient,Medication,മരുന്നുകൾ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Select Loyalty Program,ലോയൽറ്റി പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
+DocType: Employee Checkin,Attendance Marked,ഹാജർ അടയാളപ്പെടുത്തി
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Raw Materials,അസംസ്കൃത വസ്തുക്കൾ
 DocType: Sales Order,Fully Billed,പൂർണ്ണമായും ബിൽ ചെയ്തു
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{@} ഹോട്ടലിൽ ഹോട്ടൽ റൂട്ട് റേറ്റുചെയ്യുക
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select only one Priority as Default.,സ്ഥിരസ്ഥിതിയായി ഒരു മുൻ‌ഗണന മാത്രം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py,Please identify/create Account (Ledger) for type - {0},ദയവായി ടൈപ്പ് ചെയ്യാനായി അക്കൗണ്ട് (ലഡ്ജർ) ദയവായി തിരിച്ചറിയുക / സൃഷ്ടിക്കുക - {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Total Credit/ Debit Amount should be same as linked Journal Entry,മൊത്തം ക്രെഡിറ്റ് / ഡെബിറ്റ് തുക ലിങ്ക്ഡ് ജേർണൽ എൻട്രി ആയിരിക്കണം
 DocType: Purchase Invoice Item,Is Fixed Asset,അസറ്റ് സ്ഥിരീകരിച്ചു
@@ -3424,6 +3466,7 @@
 DocType: Healthcare Settings,Appointment Confirmation,അപ്പോയിന്റ്മെന്റ് സ്ഥിരീകരണം
 DocType: Shopping Cart Settings,Orders,ഓർഡറുകൾ
 DocType: HR Settings,Retirement Age,വിരമിക്കൽ പ്രായം
+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/stock/page/stock_balance/stock_balance.js,Projected Qty,പ്രൊജക്റ്റ് ചെയ്ത Qty
 apps/erpnext/erpnext/regional/__init__.py,Deletion is not permitted for country {0},രാജ്യം {0} എന്നതിനായി ഇല്ലാതാക്കൽ അനുവദനീയമല്ല
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} ഇതിനകം തന്നെ {2}
@@ -3504,11 +3547,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,അക്കൗണ്ടന്റ്
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/pos_closing_voucher.py,POS Closing Voucher alreday exists for {0} between date {1} and {2},{0} തീയതിയ്ക്കും {2} തീയതിയ്ക്കും ഇടയ്ക്ക് {0}
 apps/erpnext/erpnext/config/help.py,Navigating,നാവിഗേറ്റുചെയ്യുന്നു
+apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices require exchange rate revaluation,കുടിശ്ശികയുള്ള ഇൻവോയ്സുകൾക്ക് വിനിമയ നിരക്ക് പുനർമൂല്യനിർണ്ണയം ആവശ്യമില്ല
 DocType: Authorization Rule,Customer / Item Name,ഉപഭോക്താവ് / ഇനം നാമം
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,പുതിയ സീരിയൽ ഒന്നും വെയർഹൌസ് ഇല്ല. സ്റ്റോക്ക് എൻട്രി അല്ലെങ്കിൽ വാങ്ങൽ രസീത് വഴി വെയർഹൗസ് നിശ്ചയിക്കണം
 DocType: Issue,Via Customer Portal,കസ്റ്റമർ പോർട്ടൽ വഴി
 DocType: Work Order Operation,Planned Start Time,ആസൂത്രണം ആരംഭിക്കുന്ന സമയം
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ആണ് {2}
+DocType: Service Level Priority,Service Level Priority,സേവന നില മുൻ‌ഗണന
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,മൊത്തം അപകീർത്തികൾ മൊത്തം ബുക്കുകളുടെ എണ്ണം ആയിരിക്കരുത്
 apps/erpnext/erpnext/accounts/doctype/shareholder/shareholder.js,Share Ledger,ലഡ്ജർ പങ്കിടുക
 DocType: Journal Entry,Accounts Payable,നൽകാനുള്ള പണം
@@ -3618,7 +3663,6 @@
 DocType: Delivery Note,Delivery To,സ്വീകര്ത്താവ്
 DocType: Bank Statement Transaction Settings Item,Bank Data,ബാങ്ക് ഡാറ്റ
 apps/erpnext/erpnext/education/report/assessment_plan_status/assessment_plan_status.js,Scheduled Upto,ഷെഡ്യൂൾ ചെയ്തു
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,"ബില്ലിംഗ് സമയം, പ്രവർത്തി സമയം എന്നിവ കൈകാര്യം ചെയ്യുക"
 apps/erpnext/erpnext/config/crm.py,Track Leads by Lead Source.,ലീഡ് ഉറവിടം ലീഡ് നയിക്കുന്നു.
 DocType: Clinical Procedure,Nursing User,നഴ്സിംഗ് ഉപയോക്താവ്
 DocType: Support Settings,Response Key List,പ്രതികരണ കീ ലിസ്റ്റ്
@@ -3646,6 +3690,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,{0} items produced,{0} ഉൽപന്നങ്ങൾ സൃഷ്ടിച്ചവ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request for {0},{0} എന്നതിനുള്ള പേയ്മെന്റ് അഭ്യർത്ഥന
 apps/erpnext/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.js,Days Since Last Order,അവസാന ഉത്തരവ് മുതൽ ദിനങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Please set default Cash or Bank account in Mode of Payment {0},പേയ്‌മെന്റ് മോഡിൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജമാക്കുക {0}
 DocType: Student Group,Instructors,അദ്ധ്യാപകർ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js,Mark Present,അടയാളപ്പെടുത്തുക
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","ഉപഭോക്താക്കൾക്ക് സൗകര്യപ്രദമായി, ഈ കോഡുകൾ ഇൻവോയിസ്, ഡെലിവറി നോട്ട്സ് പോലുള്ള പ്രിന്റ് ഫോർമാറ്റുകളിൽ ഉപയോഗിക്കാവുന്നതാണ്"
@@ -3693,6 +3738,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Entertainment & Leisure,വിനോദം &amp; വിനോദം
 DocType: Email Digest,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
 apps/erpnext/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py,Net Profit,മൊത്ത ലാഭം
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py,Another Sales Person {0} exists with the same Employee id,അതേ എംപ്ലോയി ഐഡിയിൽ മറ്റൊരു സെയിൽസ് പേഴ്‌സൺ {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py,Closing (Dr),അടയ്ക്കുന്നു (ഡോ)
 DocType: Loyalty Point Entry,Loyalty Program Tier,ലോയൽറ്റി പ്രോഗ്രാം ടയർ
 DocType: Purchase Invoice,Total Taxes and Charges,ആകെ നികുതികളും നിരക്കുകളും
@@ -3782,6 +3828,7 @@
 DocType: Work Order Operation,Actual Start Time,യഥാർത്ഥ ആരംഭ സമയം
 DocType: Antibiotic,Laboratory User,ലബോറട്ടറി ഉപയോക്താവ്
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Online Auctions,ഓൺലൈൻ ലേലങ്ങൾ
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Priority {0} has been repeated.,മുൻ‌ഗണന {0} ആവർത്തിച്ചു.
 DocType: Fee Schedule,Fee Creation Status,ഫീ ക്രിയേഷൻ നില
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Softwares,സോഫ്റ്റ് വെയറുകൾ
 apps/erpnext/erpnext/config/help.py,Sales Order to Payment,സെയിൽസ് ഓർഡർ പേയ്മെന്റ്
@@ -3843,6 +3890,7 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.py,Could not retrieve information for {0}.,{0} എന്നതിനായുള്ള വിവരം വീണ്ടെടുക്കാൻ കഴിഞ്ഞില്ല.
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ബില്ലിംഗ് കറൻസി സ്ഥിര കമ്പനിയുടെ കറൻസി അല്ലെങ്കിൽ കക്ഷി അക്കൗണ്ട് കറൻസിക്ക് തുല്യമാണ്
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js,Please enter Employee Id of this sales person,ഈ വിൽപ്പന വ്യക്തിയുടെ ജീവനക്കാരുടെ ഐഡി നൽകുക
+DocType: Shift Type,Early Exit Consequence after,ആദ്യകാല എക്സിറ്റ് പരിണതഫലങ്ങൾ
 apps/erpnext/erpnext/config/accounting.py,Create Opening Sales and Purchase Invoices,തുറക്കുന്ന സെയിൽസും പർച്ചേസ് ഇൻവോയിസുകളും സൃഷ്ടിക്കുക
 DocType: Disease,Treatment Period,ചികിത്സ കാലയളവ്
 apps/erpnext/erpnext/config/settings.py,Setting up Email,ഇമെയിൽ സജ്ജീകരിക്കുന്നു
@@ -3860,7 +3908,6 @@
 apps/erpnext/erpnext/education/doctype/student_report_generation_tool/student_report_generation_tool.html,Student Name: ,വിദ്യാർഥിയുടെ പേര്:
 DocType: SMS Log,Sent On,അയച്ചു
 DocType: Bank Statement Transaction Invoice Item,Sales Invoice,വിൽപ്പന ഇൻവോയ്സ്
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Response Time can't be greater than Resolution Time,"റെസല്യൂഷൻ സമയം, റെസല്യൂഷൻ സമയത്തേക്കാൾ വലുതായിരിക്കരുത്"
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.","കോഴ്സ് അടിസ്ഥാനത്തിലുള്ള വിദ്യാർത്ഥി ഗ്രൂപ്പിനായി, പ്രോഗ്രാം എൻറോൾമെൻറിൽ എൻറോൾഡ് കോഴ്സുകളിൽ നിന്ന് ഓരോ വിദ്യാർത്ഥിക്കും പഠനവിധേയമാക്കും."
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Intra-State Supplies,ഇൻട്രാ സ്റ്റേറ്റ് സംവിധാനങ്ങൾ
 DocType: Employee,Create User Permission,ഉപയോക്തൃ അനുമതി സൃഷ്ടിക്കുക
@@ -3898,6 +3945,7 @@
 apps/erpnext/erpnext/config/settings.py,Standard contract terms for Sales or Purchase.,വിൽപ്പനയ്ക്കോ വാങ്ങുന്നതിനോ ഉള്ള സ്റ്റാൻഡേർഡ് കരാർ നിബന്ധനകൾ.
 DocType: Sales Invoice,Customer PO Details,കസ്റ്റമർ പി.ഒ.
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,രോഗി കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Select a Default Priority.,ഒരു സ്ഥിര മുൻ‌ഗണന തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Remove item if charges is not applicable to that item,ആ ഇനത്തിന് നിരക്കുകൾ ബാധകമല്ലെങ്കിൽ ഇനം നീക്കം ചെയ്യുക
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ഒരു കസ്റ്റമർ ഗ്രൂപ്പിന് ഇതേ പേരിൽ തന്നെ നിലനിൽക്കുന്നു, ദയവായി കസ്റ്റമറിന്റെ പേര് മാറ്റുക അല്ലെങ്കിൽ ഉപഭോക്താവിന്റെ ഗ്രൂപ്പിന്റെ പേരുമാറ്റുക"
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
@@ -3936,6 +3984,7 @@
 DocType: Quality Goal,Quality Goal,ഗുണനിലവാര ലക്ഷ്യം
 DocType: Support Settings,Support Portal,പിന്തുണാ പോർട്ടൽ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py,Employee {0} is on Leave on {1},{1} ജീവനക്കാരൻ {0}
+apps/erpnext/erpnext/support/doctype/issue/issue.py,This Service Level Agreement is specific to Customer {0},ഈ സേവന നില ഉടമ്പടി ഉപഭോക്താവിന് മാത്രമുള്ളതാണ് {0}
 DocType: Employee,Held On,നടന്നത്
 DocType: Healthcare Practitioner,Practitioner Schedules,പ്രാക്ടീഷണർ ഷെഡ്യൂളുകൾ
 DocType: Project Template Task,Begin On (Days),ആരംഭിക്കുക (ദിവസങ്ങൾ)
@@ -3943,6 +3992,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Work Order has been {0},വർക്ക് ഓർഡർ {0}
 DocType: Inpatient Record,Admission Schedule Date,പ്രവേശന ഷെഡ്യൂൾ തീയതി
 apps/erpnext/erpnext/assets/doctype/asset/asset.js,Asset Value Adjustment,അസറ്റ് മൂല്യം അഡ്ജസ്റ്റ്മെന്റ്
+DocType: Shift Type,Mark attendance based on 'Employee Checkin' for Employees assigned to this shift.,ഈ ഷിഫ്റ്റിലേക്ക് നിയോഗിച്ചിട്ടുള്ള ജീവനക്കാർക്കായി &#39;എംപ്ലോയി ചെക്കിൻ&#39; അടിസ്ഥാനമാക്കി ഹാജർ അടയാളപ്പെടുത്തുക.
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Supplies made to Unregistered Persons,രജിസ്ടർ ചെയ്യാത്ത വ്യക്തികൾക്ക് നൽകുന്ന സപ്ലയർ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py,All Jobs,എല്ലാ ജോലികളും
 DocType: Appointment Type,Appointment Type,അപ്പോയിന്റ്മെന്റ് തരം
@@ -4054,7 +4104,6 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),പാക്കേജിന്റെ മൊത്തം ഭാരം. സാധാരണയായി ആകെ ഭാരം + പാക്കേജിംഗ് ഭാരം. (പ്രിന്റുചെയ്യുന്നതിന്)
 DocType: Plant Analysis,Laboratory Testing Datetime,ലാബറട്ടറി ടെസ്റ്റിംഗ് ഡേറ്റാ ടൈം
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് ഉണ്ടായിരിക്കാൻ പാടില്ല
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Pipeline by Stage,സെസ് പൈപ്പ്ലൈൻ മുഖേന സ്റ്റേജ്
 apps/erpnext/erpnext/education/report/student_batch_wise_attendance/student_batch_wise_attendance.py,Student Group Strength,വിദ്യാർത്ഥി സംഘശക്തി
 DocType: Bank Statement Transaction Entry,Bank Statement Transaction Entry,ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ട്രാൻസാക്ഷൻ എൻട്രി
 DocType: Purchase Order,Get Items from Open Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ തുറക്കുക
@@ -4135,7 +4184,6 @@
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.js,Show Ageing Warehouse-wise,ഏജിംഗ് വെയർഹൌസ് തിരിച്ചുള്ളവ കാണിക്കുക
 DocType: Sales Invoice,Write Off Outstanding Amount,മികച്ച തുക എഴുതി സൂക്ഷിക്കുക
 DocType: Payroll Entry,Employee Details,ജീവനക്കാരുടെ വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/support/doctype/service_level/service_level.py,Start Time can't be greater than End Time for {0}.,ആരംഭ സമയം {0} എന്നതിനായുള്ള അവസാനിക്കുന്ന സമയത്തേക്കാൾ വലുതായിരിക്കാൻ കഴിയില്ല.
 DocType: Pricing Rule,Discount Amount,ഡിസ്കൗണ്ട് തുക
 DocType: Healthcare Service Unit Type,Item Details,ഇനം വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js,From Delivery Note,ഡെലിവറി നോട്ടിൽ നിന്ന്
@@ -4186,7 +4234,7 @@
 DocType: Customer,CUST-.YYYY.-,CUST- .YYYY.-
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Net pay cannot be negative,നെറ്റ് പേയ്മെന്റ് നെഗറ്റീവ് ആയിരിക്കരുത്
 apps/erpnext/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py,No of Interactions,ഇടപെടലുകളുടെ എണ്ണം
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py,Shift,ഷിഫ്റ്റ്
+DocType: Attendance,Shift,ഷിഫ്റ്റ്
 apps/erpnext/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py,Processing Chart of Accounts and Parties,അക്കൗണ്ടുകളുടെയും പാര്ട്ടികളുടെയും പ്രവര്ത്തന ചാർട്ട്
 DocType: Stock Settings,Convert Item Description to Clean HTML,HTML നന്നാക്കുന്നതിന് ഇനത്തിന്റെ വിവരണം പരിവർത്തനം ചെയ്യുക
 apps/erpnext/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py,All Supplier Groups,എല്ലാ വിതരണ ഗ്രൂപ്പുകളും
@@ -4256,6 +4304,7 @@
 DocType: Healthcare Service Unit,Parent Service Unit,പാരന്റ് സേവന യൂണിറ്റ്
 DocType: Sales Invoice,Include Payment (POS),പേയ്മെന്റ് ഉൾപ്പെടുത്തുക (POS)
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Private Equity,സ്വകാര്യ ഓഹരി
+DocType: Shift Type,First Check-in and Last Check-out,"ആദ്യ ചെക്ക്-ഇൻ, അവസാന ചെക്ക് out ട്ട്"
 DocType: Landed Cost Item,Receipt Document,രസീത് പ്രമാണം
 DocType: Supplier Scorecard Period,Supplier Scorecard Period,വിതരണ സ്കോർകാർഡ് കാലയളവ്
 DocType: Employee Grade,Default Salary Structure,സ്ഥിര സാലറി ഘടന
@@ -4338,11 +4387,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/blanket_order/blanket_order.js,Create Purchase Order,വാങ്ങൽ ഓർഡർ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/config/accounting.py,Define budget for a financial year.,ഒരു സാമ്പത്തിക വർഷത്തേക്കുള്ള ബജറ്റ് നിർവ്വചിക്കുക.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Accounts table cannot be blank.,അക്കൗണ്ട്സ് പട്ടിക ശൂന്യമായിരിക്കരുത്.
+DocType: Employee Checkin,Entry Grace Period Consequence,എൻട്രി ഗ്രേസ് പിരീഡ് പരിണതഫലങ്ങൾ
 ,Payment Period Based On Invoice Date,ഇൻവോയ്സ് തീയതി അടിസ്ഥാനമാക്കിയുള്ള പേയ്മെന്റ് കാലയളവ്
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py,Installation date cannot be before delivery date for Item {0},ഇനം {0} എന്നതിനുള്ള ഡെലിവറി തീയതിക്ക് മുമ്പുള്ള ഇൻസ്റ്റാളേഷൻ തീയതി ആയിരിക്കരുത്
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Link to Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥനയുമായി ലിങ്ക്
 DocType: Warranty Claim,From Company,കമ്പനിയിൽ നിന്ന്
 DocType: Bank Statement Transaction Settings Item,Mapped Data Type,മാപ്പുചെയ്ത ഡാറ്റ തരം
+apps/erpnext/erpnext/stock/doctype/item/item.py,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഈ വെയർ‌ഹ house സിനായി ഒരു പുന order ക്രമീകരണ എൻ‌ട്രി ഇതിനകം നിലവിലുണ്ട് {1}
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Doc Date,പ്രമാണ തീയതി
 DocType: Monthly Distribution,Distribution Name,വിതരണ നാമം
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Group to Non-Group,നോൺ-ഗ്രൂപ്പിലേക്ക് ഗ്രൂപ്പുചെയ്യുക
@@ -4357,6 +4408,7 @@
 DocType: Vehicle Log,Fuel Qty,ഇന്ധനത്തിന്റെ അളവ്
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian1 Mobile No,Guardian1 മൊബൈൽ നമ്പർ ഇല്ല
 DocType: Invoice Discounting,Disbursed,വിതരണം ചെയ്തു
+DocType: Shift Type,Time after the end of shift during which check-out is considered for attendance.,"ഷിഫ്റ്റ് അവസാനിച്ച സമയം, ഹാജരാകുന്നതിന് ചെക്ക് out ട്ട് പരിഗണിക്കുന്ന സമയം."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Net Change in Accounts Payable,പണമടച്ച അക്കൗണ്ടുകളിലെ അറ്റ മൂല്യം
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Not Available,ലഭ്യമല്ല
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Part-time,ഭാഗിക സമയം
@@ -4370,7 +4422,6 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js,Show PDC in Print,പി.ഡി.സി അച്ചടിക്കുക
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py,Shopify Supplier,ഷോപ്ടിപ് വിതരണക്കാരൻ
 DocType: POS Profile User,POS Profile User,POS പ്രൊഫൈൽ ഉപയോക്താവ്
-DocType: Student,Middle Name,പേരിന്റെ മധ്യഭാഗം
 DocType: Sales Person,Sales Person Name,സെയിൽ വ്യക്തിയുടെ പേര്
 DocType: Packing Slip,Gross Weight,ആകെ ഭാരം
 DocType: Journal Entry,Bill No,ബിൽ നം
@@ -4379,7 +4430,6 @@
 DocType: Vehicle Log,HR-VLOG-.YYYY.-,HR-VLOG -YYYY.-
 DocType: Student,A+,A +
 DocType: Issue,Service Level Agreement,സേവന വ്യവസ്ഥ
-apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.js,Please select Employee and Date first,ആദ്യം ജീവനക്കാരനും തീയതിയും തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js,Item valuation rate is recalculated considering landed cost voucher amount,വസ്തുവിലയുടെ വൗച്ചർ തുക പരിഗണിക്കുമ്പോൾ ഇനം മൂല്യനിർണയ നിരക്ക് വീണ്ടും കണക്കാക്കുന്നു
 DocType: Timesheet,Employee Detail,തൊഴിലുടമ വിശദാംശം
 DocType: Tally Migration,Vouchers,വൗച്ചറുകൾ
@@ -4414,7 +4464,7 @@
 DocType: Additional Salary,Date on which this component is applied,ഈ ഘടകം പ്രയോഗിച്ച തീയതി
 apps/erpnext/erpnext/config/accounting.py,List of available Shareholders with folio numbers,ഫോളിയോ നമ്പറുകളുള്ള ഓഹരി ഉടമകളുടെ പട്ടിക
 apps/erpnext/erpnext/config/accounting.py,Setup Gateway accounts.,ഗേറ്റ്വേ അക്കൗണ്ടുകൾ സജ്ജമാക്കുക.
-DocType: Service Level,Response Time Period,പ്രതികരണ സമയം കാലാവധി
+DocType: Service Level Priority,Response Time Period,പ്രതികരണ സമയം കാലാവധി
 DocType: Purchase Invoice,Purchase Taxes and Charges,വാങ്ങൽ നികുതികളും ചാർജുകളും
 DocType: Course Activity,Activity Date,ആക്റ്റിവിറ്റി തീയതി
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select or add new customer,പുതിയ ഉപഭോക്താവിനെ തിരഞ്ഞെടുക്കുകയോ ചേർക്കുകയോ ചെയ്യുക
@@ -4439,6 +4489,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Financial Year,സാമ്പത്തിക വർഷം
 DocType: Sales Invoice Item,Deferred Revenue,വ്യതിരിക്തമായ വരുമാനം
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Atleast one of the Selling or Buying must be selected,വിൽക്കുന്നതിനോ വാങ്ങുന്നതിനോ കുറഞ്ഞത് ഒരെണ്ണം തിരഞ്ഞെടുത്തിരിക്കണം
+DocType: Shift Type,Working Hours Threshold for Half Day,അർദ്ധദിനത്തേക്കുള്ള പ്രവർത്തന സമയ പരിധി
 ,Item-wise Purchase History,ഇനം തിരിച്ചുള്ള ചരിത്രം
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Cannot change Service Stop Date for item in row {0},{0} നിരയിലെ ഇനത്തിനായി സേവനം നിർത്തൽ തീയതി മാറ്റാൻ കഴിയില്ല
 DocType: Production Plan,Include Subcontracted Items,സബ്കോൺട്രാക്റ്റഡ് ഇനങ്ങൾ ഉൾപ്പെടുത്തുക
@@ -4471,6 +4522,7 @@
 DocType: BOM,Allow Same Item Multiple Times,ഈ ഇനം ഒന്നിലധികം തവണ അനുവദിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,Create BOM,BOM സൃഷ്ടിക്കുക
 DocType: Healthcare Practitioner,Charges,നിരക്കുകൾ
+DocType: Employee,Attendance and Leave Details,ഹാജർനിലയും വിശദാംശങ്ങളും വിടുക
 DocType: Student,Personal Details,വ്യക്തിഗത വിശദാംശങ്ങൾ
 DocType: Sales Order,Billing and Delivery Status,ബില്ലിംഗും വിതരണ സ്റ്റാറ്റസും
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Row {0}: For supplier {0} Email Address is required to send email,വരി {0}: വിതരണക്കാരൻ {0} ഇമെയിൽ അയയ്ക്കാൻ ഇമെയിൽ വിലാസം ആവശ്യമാണ്
@@ -4521,7 +4573,6 @@
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Enter value betweeen {0} and {1},മൂല്യം നൽകുക {0} {1}
 DocType: Purchase Order,Order Confirmation Date,ഓർഡർ സ്ഥിരീകരണ തീയതി
 DocType: Delivery Trip,Calculate Estimated Arrival Times,കണക്കാക്കപ്പെട്ട വരവ് സമയം കണക്കാക്കുക
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,സാദ്ധ്യമായ
 DocType: Instructor,EDU-INS-.YYYY.-,EDU-INS -YYYY.-
 DocType: Subscription,Subscription Start Date,സബ്സ്ക്രിപ്ഷൻ ആരംഭ തീയതി
@@ -4542,7 +4593,7 @@
 DocType: Journal Entry Account,Journal Entry Account,ജേർണൽ എൻട്രി അക്കൗണ്ട്
 apps/erpnext/erpnext/stock/doctype/item/item.js,Variant,വേരിയന്റ്
 apps/erpnext/erpnext/templates/pages/help.html,Forum Activity,ഫോറം പ്രവർത്തനം
-DocType: Service Level,Resolution Time Period,റെസല്യൂഷൻ സമയം കാലയളവ്
+DocType: Service Level Priority,Resolution Time Period,റെസല്യൂഷൻ സമയം കാലയളവ്
 DocType: Request for Quotation,Supplier Detail,വിതരണക്കാരൻ വിശദാംശം
 DocType: Project Task,View Task,ടാസ്ക് കാണുക
 DocType: Serial No,Purchase / Manufacture Details,വാങ്ങൽ / ഉല്പാദന വിശദാംശങ്ങൾ
@@ -4608,6 +4659,7 @@
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,സ്റ്റോക്ക് എൻട്രി / ഡെലിവറി നോട്ട് / പർച്ചേസ് റെസിപ്റ്റ് വഴി മാത്രമേ വെയർഹൗസ് മാറ്റുവാൻ സാധിക്കൂ
 DocType: Support Settings,Close Issue After Days,ദിവസത്തിനുശേഷം പ്രശ്നം അടയ്ക്കുക
 DocType: Payment Schedule,Payment Schedule,തുക അടക്കേണ്ട തിയതികൾ
+DocType: Shift Type,Enable Entry Grace Period,എൻട്രി ഗ്രേസ് പിരീഡ് പ്രവർത്തനക്ഷമമാക്കുക
 DocType: Patient Relation,Spouse,ജീവിത പങ്കാളി
 DocType: Purchase Invoice,Reason For Putting On Hold,തുടരുന്നതിന് കാരണം
 DocType: Item Attribute,Increment,ഇൻക്രിമെന്റും
@@ -4741,6 +4793,7 @@
 DocType: Vehicle Log,Invoice Ref,ഇൻവോയ്സ് റഫർ
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-form ഇൻവോയ്സിന് ബാധകമല്ല: {0}
 apps/erpnext/erpnext/restaurant/doctype/restaurant_order_entry/restaurant_order_entry.py,Invoice Created,ഇൻവോയ്സ് സൃഷ്ടിച്ചു
+DocType: Shift Type,Early Exit Grace Period,ആദ്യകാല എക്സിറ്റ് ഗ്രേസ് പിരീഡ്
 DocType: Patient Encounter,Review Details,വിശദാംശങ്ങൾ അവലോകനം ചെയ്യുക
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
 DocType: Account,Account Number,അക്കൗണ്ട് നമ്പർ
@@ -4752,7 +4805,6 @@
 apps/erpnext/erpnext/regional/italy/setup.py,"Applicable if the company is SpA, SApA or SRL","കമ്പനി സ്പാ, SAAA അല്ലെങ്കിൽ SRL ആണെങ്കിൽ ബാധകമായിരിക്കും"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Overlapping conditions found between:,ഇനിപ്പറയുന്നതിൽ കണ്ടെത്തിയ ഓവർലാപ്പ് ചെയ്യൽ അവസ്ഥകൾ:
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Paid and Not Delivered,പണമടച്ചതല്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py,Item Code is mandatory because Item is not automatically numbered,ഇനം യാന്ത്രികമായി എണ്ണമറ്റാത്തതിനാൽ ഇനം കോഡ് നിർബന്ധമാണ്
 DocType: GST HSN Code,HSN Code,HSN കോഡ്
 DocType: GSTR 3B Report,September,സെപ്റ്റംബർ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Administrative Expenses,ഭരണച്ചിലവുകൾ
@@ -4798,6 +4850,7 @@
 DocType: Opportunity,Sales Stage,വിൽപ്പന സ്റ്റേജ്
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,നിങ്ങൾ സെയിൽസ് ഓർഡർ സംരക്ഷിക്കുമ്പോൾ വാക്കുകൾ വാക്കിൽ കാണാൻ കഴിയും.
 DocType: Item Reorder,Re-order Level,നില പുനഃരാരംഭിക്കുക
+DocType: Shift Type,Enable Auto Attendance,യാന്ത്രിക ഹാജർ പ്രാപ്‌തമാക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Preference,മുൻഗണന
 ,Department Analytics,ഡിപ്പാർട്ട്മെൻറ് അനലിറ്റിക്സ്
 DocType: Crop,Scientific Name,ശാസ്ത്രീയ നാമം
@@ -4810,6 +4863,7 @@
 DocType: Quiz Activity,Quiz Activity,ക്വിസ് പ്രവർത്തനം
 apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,{0} is not in a valid Payroll Period,{0} സാധുതയുള്ള പേരോൾ കാലയളവിൽ അല്ല
 DocType: Timesheet,Billed,ബിൽ ചെയ്തു
+apps/erpnext/erpnext/config/support.py,Issue Type.,ലക്കം തരം.
 DocType: Restaurant Order Entry,Last Sales Invoice,അവസാന സെയിൽസ് ഇൻവോയ്സ്
 DocType: Payment Terms Template,Payment Terms,പേയ്മെന്റ് നിബന്ധനകൾ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Reserved Qty: Quantity ordered for sale, but not delivered.","റിസർവ് ചെയ്ത ക്വാർട്ടി: ക്വാളിറ്റി ഓർഡർ ചെയ്ത ഓർഡർ, പക്ഷെ ഡെലിവർ ചെയ്തിട്ടില്ല."
@@ -4903,6 +4957,7 @@
 DocType: Account,Asset,അസറ്റ്
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,{0} does not have a Healthcare Practitioner Schedule. Add it in Healthcare Practitioner master,{0} ഒരു ഹെൽത്ത് ഇൻഷ്വറൻസ് ഷെഡ്യൂൾ ഇല്ല. ഇത് ഹെൽത്ത് ഇൻസ്ട്രുമെന്റ് മാസ്റ്റർയിൽ ചേർക്കുക
 DocType: Vehicle,Chassis No,ചേസിസ് നം
+DocType: Employee,Default Shift,സ്ഥിരസ്ഥിതി ഷിഫ്റ്റ്
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Abbreviation,കമ്പനി സംഗ്രഹം
 apps/erpnext/erpnext/config/manufacturing.py,Tree of Bill of Materials,ട്രീ ഓഫ് ബിൽ ഓഫ് മെറ്റീരിയൽസ്
 DocType: Article,LMS User,LMS ഉപയോക്താവ്
@@ -4933,6 +4988,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}","സാധുതയുള്ള ശീർഷ കാലയളവിൽ ആരംഭിക്കുന്നതും അവസാനിക്കുന്നതുമായ തീയതികൾ, {0}"
 DocType: Products Settings,Home Page is Products,ഹോം പേജ് പ്രോഡക്ട് ആണ്
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Calls,കോളുകൾ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Reference #{0} dated {1},റഫറൻസ് # {0} തീയതി {1}
 DocType: Guardian Interest,Guardian Interest,ഗാർഡിയൻ താൽപ്പര്യം
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,PO already created for all sales order items,എല്ലാ വിൽപന ഓർഡറുകൾക്കും PO ഇതിനകം സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Subscription,സബ്സ്ക്രിപ്ഷൻ
@@ -4950,6 +5006,7 @@
 DocType: Sales Person,Parent Sales Person,പേരന്റ് സെയിൽസ് പേഴ്സൺ
 DocType: Student Group Creation Tool,Get Courses,കോഴ്സുകൾ നേടുക
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: ഇനം ഒരു സ്ഥിര അസറ്റ് ആണെന്നതിനാൽ, Qty 1 ആയിരിക്കണം. ഒന്നിലധികം കെട്ടിക്ക് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
+DocType: Shift Type,Working hours below which Absent is marked. (Zero to disable),അഭാവം അടയാളപ്പെടുത്തിയിരിക്കുന്ന പ്രവൃത്തി സമയം. (പ്രവർത്തനരഹിതമാക്കാനുള്ള പൂജ്യം)
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ഇടപാടിയിൽ മാത്രമേ ലീഫ് നോഡുകൾ അനുവദിക്കപ്പെട്ടിട്ടുള്ളൂ
 DocType: Grant Application,Organization,സംഘടന
 DocType: Fee Category,Fee Category,ഫീസ് വിഭാഗം
@@ -4962,7 +5019,9 @@
 apps/erpnext/erpnext/templates/emails/training_event.html,Please update your status for this training event,ഈ പരിശീലന ഇവന്റിനായി നിങ്ങളുടെ സ്റ്റാറ്റസ് അപ്ഡേറ്റുചെയ്യുക
 DocType: Volunteer,Morning,രാവിലെ
 DocType: Quotation Item,Quotation Item,ഉദ്ധരണി ഇനം
+apps/erpnext/erpnext/config/support.py,Issue Priority.,മുൻ‌ഗണന നൽകുക.
 DocType: Journal Entry,Credit Card Entry,ക്രെഡിറ്റ് കാർഡ് എൻട്രി
+apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,"Time slot skiped, the slot {0} to {1} overlap exisiting slot {2} to {3}","സമയ സ്ലോട്ട് ഒഴിവാക്കി, സ്ലോട്ട് {0} മുതൽ {1} വരെ ഓവർലാപ്പ് ചെയ്യുന്ന സ്ലോട്ട് {2} മുതൽ {3} വരെ"
 DocType: Journal Entry Account,If Income or Expense,വരുമാനം അല്ലെങ്കിൽ ചെലവ് എങ്കിൽ
 DocType: Work Order Operation,Work Order Operation,വർക്ക് ഓർഡർ ഓപ്പറേഷൻ
 DocType: Accounts Settings,Address used to determine Tax Category in transactions.,ഇടപാടുകാരുടെ ടാക്സ് വിഭാഗം നിർണ്ണയിക്കുന്നതിന് ഉപയോഗിക്കുന്ന വിലാസം.
@@ -5011,11 +5070,13 @@
 apps/erpnext/erpnext/config/getting_started.py,Data Import and Settings,ഡാറ്റാ ഇറക്കുമതിയും ക്രമീകരണങ്ങളും
 apps/erpnext/erpnext/accounts/doctype/loyalty_program/loyalty_program.js,"If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)","ഓട്ടോ ഓപ്റ്റ് ഇൻ ചെക്ക് ചെയ്തിട്ടുണ്ടെങ്കിൽ, ഉപഭോക്താക്കൾക്ക് തപാലിൽ ബന്ധപ്പെട്ട ലോയൽറ്റി പ്രോഗ്രാം (സേവ് ഓൺ)"
 DocType: Account,Expense Account,ചെലവ് അക്കൗണ്ട്
+DocType: Shift Type,The time before the shift start time during which Employee Check-in is considered for attendance.,ജീവനക്കാരുടെ ചെക്ക്-ഇൻ ഹാജരാകാൻ പരിഗണിക്കുന്ന ഷിഫ്റ്റ് ആരംഭ സമയത്തിന് മുമ്പുള്ള സമയം.
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Relation with Guardian1,ഗാർഡിയൻ 1-നോട് ബന്ധം
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.js,Create Invoice,ഇൻവോയ്സ് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം നിലവിലുണ്ട് {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Employee relieved on {0} must be set as 'Left',{0} ൽ നിന്ന് ഒഴിവാക്കിയ തൊഴിലാളി &#39;ഇടത്&#39;
 apps/erpnext/erpnext/templates/pages/integrations/gocardless_checkout.py,Pay {0} {1},{0} {1} പണമടയ്ക്കുക
+DocType: Company,Sales Settings,വിൽപ്പന ക്രമീകരണങ്ങൾ
 DocType: Sales Order Item,Produced Quantity,ഉല്പാദിപ്പിച്ച അളവ്
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html,The request for quotation can be accessed by clicking on the following link,ഉദ്ധരണിക്കുള്ള അഭ്യർത്ഥന താഴെക്കാണുന്ന ലിങ്കിൽ ക്ലിക്കുചെയ്ത് ആക്സസ് ചെയ്യാൻ കഴിയും
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണത്തിന്റെ പേര്
@@ -5092,6 +5153,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Default tax templates for sales and purchase are created.,വിൽപ്പനയ്ക്കായി വാങ്ങുന്നതിനും വാങ്ങുന്നതിനുമുള്ള സ്ഥിര ടാക്സ് ടെംപ്ലേറ്റുകൾ സൃഷ്ടിക്കുന്നു.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,വിടുക ടൈപ്പ് {0} കൊണ്ടുപോകാൻ കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Debit To account must be a Receivable account,ഡെബിറ്റ് അക്കൌണ്ടിലേക്ക് സ്വീകാര്യമായ അക്കൌണ്ടായിരിക്കണം
+apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,End Date of Agreement can't be less than today.,കരാറിന്റെ അവസാന തീയതി ഇന്നത്തേതിനേക്കാൾ കുറവായിരിക്കരുത്.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Set as Default,സ്ഥിരസ്ഥിതിയായി സജ്ജമാക്കാൻ
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),ഈ പാക്കേജിന്റെ മൊത്തം ഭാരം. (ഇനങ്ങളുടെ മൊത്തം തൂക്കത്തിന്റെ ആകെത്തുക കണക്കാക്കി സ്വയം)
 apps/erpnext/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py,Cannot set the field <b>{0}</b> for copying in variants,രൂപഭേദങ്ങളിൽ പകർത്തുന്നതിന് വയലിൽ <b>{0}</b> സജ്ജമാക്കാൻ കഴിയില്ല
@@ -5117,8 +5179,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Expired Batches,കാലഹരണപ്പെട്ട തുലാസ്
 DocType: Shipping Rule,Shipping Rule Type,ഷിപ്പിംഗ് റൂൾ തരം
 DocType: Job Offer,Accepted,അംഗീകരിച്ചു
-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> ഇല്ലാതാക്കുക"
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,നിങ്ങൾ ഇതിനകം മൂല്യ നിർണ്ണയ മാനദണ്ഡത്തിനായി വിലയിരുത്തിയിട്ടുണ്ട്.
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Select Batch Numbers,ബാച്ച് നമ്പരുകൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py,Age (Days),പ്രായം (ദിവസം)
@@ -5144,6 +5204,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select your Domains,നിങ്ങളുടെ ഡൊമെയ്നുകൾ തിരഞ്ഞെടുക്കുക
 DocType: Agriculture Task,Task Name,ടാസ്ക് നാമം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Stock Entries already created for Work Order ,വർക്ക് ഓർഡറിന് സ്റ്റോക്ക് എൻട്രികൾ ഇതിനകം സൃഷ്ടിച്ചു
+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 ഇല്ലാതാക്കുക"
 ,Amount to Deliver,ഡെലിവർ തുക
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Company {0} does not exist,കമ്പനി {0} നിലവിലില്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,തന്നിരിക്കുന്ന ഇനങ്ങൾക്ക് ലിങ്കുചെയ്യുന്നതിന് തീർച്ചപ്പെടുത്താത്ത മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഒന്നും കണ്ടെത്തിയില്ല.
@@ -5191,6 +5253,7 @@
 DocType: Lab Prescription,Test Code,ടെസ്റ്റ് കോഡ്
 DocType: Purchase Taxes and Charges,On Previous Row Total,മുമ്പത്തെ നിര മൊത്തം
 DocType: Student,Student Email Address,വിദ്യാർത്ഥി ഇമെയിൽ വിലാസം
+,Delayed Item Report,ഇന റിപ്പോർട്ട് വൈകി
 DocType: Academic Term,Education,വിദ്യാഭ്യാസം
 DocType: Supplier Quotation,Supplier Address,വിതരണക്കാരൻ വിലാസം
 DocType: Salary Detail,Do not include in total,മൊത്തത്തിൽ ഉൾപ്പെടുത്തരുത്
@@ -5198,7 +5261,6 @@
 apps/erpnext/erpnext/accounts/party.py,{0}: {1} does not exists,{0}: {1} ഇല്ല
 DocType: Purchase Receipt Item,Rejected Quantity,നിരസിച്ചു അളവ്
 DocType: Cashier Closing,To TIme,TIme ലേക്ക്
-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: Daily Work Summary Group User,Daily Work Summary Group User,ദിവസേനയുള്ള ചുരുക്കം സംഗ്രഹ ഗ്രൂപ്പ് ഉപയോക്താവ്
 DocType: Fiscal Year Company,Fiscal Year Company,ഫിസ്കൽ ഇയർ കമ്പനി
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Alternative item must not be same as item code,ഇതര ഇനം ഇനം കോഡായിരിക്കാൻ പാടില്ല
@@ -5250,6 +5312,7 @@
 DocType: Delivery Settings,Delay between Delivery Stops,ഡെലിവറി സ്റ്റോപ്പുകൾക്കിടയിൽ കാലതാമസം
 DocType: Stock Settings,Freeze Stocks Older Than [Days],സ്റ്റോക്കുകൾ മരവിപ്പിക്കുക [ദിവസം]
 DocType: Promotional Scheme,Promotional Scheme Product Discount,പ്രൊമോഷണൽ സ്കീം പ്രൊഡക്ട് ഡിസ്കൌണ്ട്
+apps/erpnext/erpnext/support/doctype/issue_priority/issue_priority.py,Issue Priority Already Exists,ഇഷ്യു മുൻ‌ഗണന ഇതിനകം നിലവിലുണ്ട്
 DocType: Account,Asset Received But Not Billed,"അസറ്റ് ലഭിച്ചു, പക്ഷേ ബില്ലിങ്ങിയിട്ടില്ല"
 DocType: POS Closing Voucher,Total Collected Amount,മൊത്തം ശേഖരിച്ച തുക
 DocType: Course,Default Grading Scale,സ്ഥിരസ്ഥിതി ഗ്രേഡിംഗ് സ്കെയിൽ
@@ -5292,6 +5355,7 @@
 DocType: Contract,Fulfilment Terms,നിർവ്വഹണ നിബന്ധനകൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ഗ്രൂപ്പിലേക്ക് നോൺ-ഗ്രൂപ്പ്
 DocType: Student Guardian,Mother,അമ്മ
+DocType: Issue,Service Level Agreement Fulfilled,സേവന ലെവൽ കരാർ നിറഞ്ഞു
 DocType: Payroll Entry,Deduct Tax For Unclaimed Employee Benefits,ക്ലെയിം ചെയ്യാത്ത തൊഴിലുടമയുടെ ആനുകൂല്യങ്ങൾക്ക് നികുതി കിഴിവ് ചെയ്യുക
 DocType: Travel Request,Travel Funding,ട്രാവൽ ഫണ്ടിംഗ്
 DocType: Shipping Rule,Fixed,നിശ്ചിത
@@ -5320,10 +5384,12 @@
 apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ഇനങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
 DocType: Item Attribute,From Range,ശ്രേണിയിൽ നിന്ന്
 DocType: Clinical Procedure,Consumables,ഉപഭോഗം
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,'employee_field_value' and 'timestamp' are required.,"&#39;ജീവനക്കാരൻ_ഫീൽഡ്_മൂല്യം&#39;, &#39;ടൈംസ്റ്റാമ്പ്&#39; എന്നിവ ആവശ്യമാണ്."
 DocType: Purchase Taxes and Charges,Reference Row #,റഫറൻസ് വരി #
 apps/erpnext/erpnext/assets/doctype/asset/depreciation.py,Please set 'Asset Depreciation Cost Center' in Company {0},കമ്പനി {0} ൽ &#39;അസറ്റ് ഡിപ്രീസിയേഷൻ കോസ്റ്റ് സെന്റർ&#39; സജ്ജമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,Row #{0}: Payment document is required to complete the trasaction,വരി # {0}: ട്രാസേഷൻ പൂർത്തിയാക്കാൻ പേയ്മെന്റ് പ്രമാണം ആവശ്യമാണ്
 DocType: Amazon MWS Settings,Click this button to pull your Sales Order data from Amazon MWS.,ആമസോൺ MWS- ൽ നിന്ന് നിങ്ങളുടെ സെയിൽസ് ഓർഡർ ഡാറ്റ പിൻവലിക്കുന്നതിന് ഈ ബട്ടൺ ക്ലിക്കുചെയ്യുക.
+DocType: Shift Type,Working hours below which Half Day is marked. (Zero to disable),അർദ്ധദിനം അടയാളപ്പെടുത്തിയ പ്രവൃത്തി സമയം. (പ്രവർത്തനരഹിതമാക്കാനുള്ള പൂജ്യം)
 ,Assessment Plan Status,അസസ്സ്മെന്റ് പ്ലാൻ സ്റ്റാറ്റസ്
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,എംപ്ലോയർ റെക്കോർഡ് സൃഷ്ടിക്കാൻ ഇത് സമർപ്പിക്കുക
@@ -5393,6 +5459,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js,Set Open,ഓപ്പൺ സജ്ജമാക്കുക
 apps/erpnext/erpnext/www/all-products/index.html,Toggle Filters,ഫിൽട്ടറുകൾ ടോഗിൾ ചെയ്യുക
 DocType: Production Plan,Material Request Detail,മെറ്റീരിയൽ അഭ്യർത്ഥന വിശദാംശം
+DocType: Shift Type,Process Attendance After,പ്രോസസ് അറ്റൻഡൻസ് അതിനുശേഷം
 DocType: Material Request Item,Quantity and Warehouse,അളവും വെയർഹൗസും
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Programs,പ്രോഗ്രാമിലേക്ക് പോകുക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Duplicate entry in References {1} {2},വരി # {0}: റെഫറൻസുകൾ {1} {2} ലെ തനിപ്പകർപ്പ് എൻട്രി
@@ -5449,6 +5516,7 @@
 DocType: Pricing Rule,Party Information,പാർട്ടി വിവരം
 apps/erpnext/erpnext/shopping_cart/cart.py,Debtors ({0}),കടപ്പക്കാർ ({0})
 apps/erpnext/erpnext/hr/utils.py,To date can not greater than employee's relieving date,തൊഴിലുടമയുടെ റിലീനിംഗ് തീയതിയെക്കാൾ ഇന്നുവരേക്കാൾ വലുതാണ്
+DocType: Shift Type,Enable Exit Grace Period,എക്സിറ്റ് ഗ്രേസ് പിരീഡ് പ്രാപ്തമാക്കുക
 DocType: Expense Claim,Employees Email Id,ജീവനക്കാർ ഇമെയിൽ ഐഡി
 DocType: Shopify Settings,Update Price from Shopify To ERPNext Price List,Shopify നിന്ന് ERPNext വില ലിസ്റ്റിന്റെ വില അപ്ഡേറ്റ് ചെയ്യുക
 DocType: Healthcare Settings,Default Medical Code Standard,സ്ഥിരസ്ഥിതി മെഡിക്കൽ കോഡ് സ്റ്റാൻഡേർഡ്
@@ -5478,7 +5546,6 @@
 DocType: Budget,Applicable on Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ പ്രയോഗിക്കാം
 DocType: Support Settings,Search APIs,തിരയൽ API- കൾ
 DocType: Manufacturing Settings,Overproduction Percentage For Sales Order,വില്പന ക്രമത്തിനായി ഓവർപ്രൊഡ്ജന നിരക്ക്
-apps/erpnext/erpnext/templates/generators/item/item_specifications.html,Specifications,വ്യതിയാനങ്ങൾ
 DocType: Purchase Invoice,Supplied Items,വിതരണം ചെയ്ത ഇനങ്ങൾ
 DocType: Leave Control Panel,Select Employees,ജീവനക്കാരെ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.py,Select interest income account in loan {0},വായ്പയിൽ പലിശ വരുമാനമുള്ള അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക {0}
@@ -5493,6 +5560,7 @@
 apps/erpnext/erpnext/regional/italy/utils.py,Please set Fiscal Code for the customer '%s',ഉപയോക്താവിന് &#39;% s&#39; ഉപഭോക്താവിന് ഫിസ്കൽ കോഡ് സജ്ജീകരിക്കുക
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** നിങ്ങളുടെ ബിസിനസ്സിലെ സീസണാലിറ്റി ഉണ്ടെങ്കിൽ മാസത്തിലുടനീളം ബജറ്റ് / ടാർഗെറ്റ് വിതരണം ചെയ്യുന്നതിന് പ്രതിമാസ വിതരണക്കാരൻ ** സഹായിക്കുന്നു.
 DocType: Guardian,Students,വിദ്യാർത്ഥികൾ
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Expense Claim {0} already exists for the Vehicle Log,വെഹിക്കിൾ ലോഗിനായി ചെലവ് ക്ലെയിം {0} ഇതിനകം നിലവിലുണ്ട്
 DocType: Salary Component,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","തിരഞ്ഞെടുത്തിട്ടുണ്ടെങ്കിൽ, ഈ ഘടകത്തിൽ നിർദേശിച്ചതോ കണക്കാക്കിയതോ ആയ മൂല്യം, വരുമാനത്തിനോ അല്ലെങ്കിൽ കിഴിവ്ക്കോ സംഭാവന ചെയ്യില്ല. എന്നിരുന്നാലും, മൂല്യത്തെ കൂട്ടിച്ചേർക്കാവുന്ന അല്ലെങ്കിൽ ഒഴിവാക്കാവുന്ന മറ്റ് ഘടകങ്ങളെ സൂചിപ്പിക്കാൻ കഴിയും."
 apps/erpnext/erpnext/hr/doctype/loan/loan.py,Please enter repayment Amount,പണം തിരിച്ചടയ്ക്കൽ തുക നൽകുക
 DocType: Sales Invoice,Is Opening Entry,തുറക്കുന്നു എൻട്രി
@@ -5503,7 +5571,7 @@
 ,Supplier-Wise Sales Analytics,വിതരണക്കാരൻ-വൈസ് സെയിൽസ് അനലിറ്റിക്സ്
 DocType: GSTR 3B Report,February,ഫെബ്രുവരി
 DocType: Appraisal,For Employee,ജീവനക്കാരന്
-apps/erpnext/erpnext/buying/report/procurement_tracker/procurement_tracker.py,Actual Delivery Date,യഥാർത്ഥ ഡെലിവറി തീയതി
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Actual Delivery Date,യഥാർത്ഥ ഡെലിവറി തീയതി
 DocType: Sales Partner,Sales Partner Name,സെയിൽസ് പങ്കാളി പേര്
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Depreciation Start Date is entered as past date,മൂല്യത്തകർച്ച വരി {0}: മൂല്യത്തകർച്ച ആരംഭ തീയതി കഴിഞ്ഞ തീയതിയായി നൽകി
 DocType: GST HSN Code,Regional,റീജിയണൽ
@@ -5541,6 +5609,7 @@
 DocType: Supplier Scorecard,Supplier Scorecard,സപ്ലയർ സ്കോർകാർഡ്
 DocType: Travel Itinerary,Travel To,യാത്ര
 apps/erpnext/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js,Mark Attendance,മാർക്ക് അറ്റൻഡൻസ്
+DocType: Shift Type,Determine Check-in and Check-out,"ചെക്ക്-ഇൻ നിർണ്ണയിക്കുക, ചെക്ക് out ട്ട് ചെയ്യുക"
 DocType: POS Closing Voucher,Difference,വ്യത്യാസം
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Small,ചെറുത്
 DocType: Work Order Item,Work Order Item,വർക്ക് ഓർഡർ ഇനം
@@ -5574,6 +5643,7 @@
 apps/erpnext/erpnext/healthcare/setup.py,Drug,ഡ്രഗ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} അടച്ചു
 DocType: Patient,Medical History,ആരോഗ്യ ചരിത്രം
+DocType: Expense Claim,Expense Taxes and Charges,ചെലവ് നികുതികളും നിരക്കുകളും
 DocType: Subscription Settings,Number of days after invoice date has elapsed before canceling subscription or marking subscription as unpaid,"സബ്സ്ക്രിപ്ഷൻ റദ്ദാക്കുന്നതിന് മുമ്പായി ഇൻവോയ്സ് തീയതി കഴിഞ്ഞതിന് ശേഷമുള്ള ദിവസങ്ങൾ, അല്ലെങ്കിൽ പണമടച്ചതുപോലെ സബ്സ്ക്രിപ്ഷൻ അടയാളപ്പെടുത്തൽ"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,Installation Note {0} has already been submitted,ഇൻസ്റ്റാളേഷൻ കുറിപ്പ് {0} ഇതിനകം സമർപ്പിച്ചു
 DocType: Patient Relation,Family,കുടുംബം
@@ -5605,7 +5675,6 @@
 DocType: Dosage Strength,Strength,ശക്തി
 apps/erpnext/erpnext/stock/stock_ledger.py,{0} units of {1} needed in {2} to complete this transaction.,ഈ ഇടപാട് പൂർത്തിയാക്കാൻ {2} എന്നതിന്റെ {0} യൂണിറ്റുകൾ {2} ആവശ്യമാണ്.
 DocType: Buying Settings,Backflush Raw Materials of Subcontract Based On,ഉപഘടകത്തെ അടിസ്ഥാനമാക്കിയുള്ള Backflush അസംസ്കൃത വസ്തുക്കൾ
-DocType: Bank Guarantee,Customer,ഉപഭോക്താവ്
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","പ്രാപ്തമാക്കിയാൽ, പ്രോഗ്രാമിൽ എൻറോൾമെന്റ് ടൂളിൽ ഫീൽഡ് അക്കാദമിക് ടേം നിർബന്ധമാണ്."
 DocType: Education Settings,"For Batch based Student Group, the Student Batch will be validated for every Student from the Program Enrollment.","ബാച്ച് സ്റ്റുഡന്റ് സ്റ്റുഡന്റ് ഗ്രൂപ്പിനായി, സ്റ്റുഡന്റ് ബച്ച്, പ്രോഗ്രാം എൻറോൾമെൻറിൽ നിന്നും എല്ലാ വിദ്യാർത്ഥികൾക്കും മൂല്യനിർണ്ണയം നടത്തും."
 DocType: Course,Topics,വിഷയങ്ങൾ
@@ -5757,6 +5826,7 @@
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py,Closing (Opening + Total),അടച്ചു (മൊത്തം + എണ്ണം തുറക്കുക)
 DocType: Supplier Scorecard Criteria,Criteria Formula,മാനദണ്ഡ ഫോർമുല
 apps/erpnext/erpnext/config/support.py,Support Analytics,പിന്തുണ അനലിറ്റിക്സ്
+DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ഹാജർ ഉപകരണ ഐഡി (ബയോമെട്രിക് / ആർ‌എഫ് ടാഗ് ഐഡി)
 apps/erpnext/erpnext/config/quality_management.py,Review and Action,റിവ്യൂ ആൻഡ് ആക്ഷൻ
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",അക്കൌണ്ട് മരവിപ്പിച്ചതാണെങ്കിൽ നിയന്ത്രിത ഉപയോക്താക്കളെ അനുവദിയ്ക്കുന്നു.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Amount After Depreciation,മൂല്യശീലത്തിനു ശേഷം തുക
@@ -5778,6 +5848,7 @@
 DocType: Salary Slip,Loan Repayment,വായ്പ തിരിച്ചടവ്
 DocType: Employee Education,Major/Optional Subjects,പ്രധാന / ഓപ്ഷണൽ വിഷയങ്ങൾ
 DocType: Soil Texture,Silt,സിൽറ്റ്
+apps/erpnext/erpnext/config/buying.py,Supplier Addresses And Contacts,വിതരണക്കാരന്റെ വിലാസങ്ങളും കോൺ‌ടാക്റ്റുകളും
 DocType: Bank Guarantee,Bank Guarantee Type,ബാങ്ക് ഗ്യാരണ്ടി തരം
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","പ്രവർത്തനരഹിതമാക്കുകയാണെങ്കിൽ, &#39;റൌണ്ടഡ് ടോട്ടൽ&#39; ഫീൽഡ് ഒരു ഇടപാടിനും ദൃശ്യമാവുകയില്ല"
 DocType: Pricing Rule,Min Amt,മിനിറ്റ് ആം
@@ -5815,6 +5886,7 @@
 DocType: Opening Invoice Creation Tool Item,Opening Invoice Creation Tool Item,ഇൻവോയ്സ് ക്രിയേഷൻ ടൂൾ ഇനം തുറക്കുന്നു
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
 DocType: Bank Reconciliation,Include POS Transactions,POS ഇടപാടുകൾ ഉൾപ്പെടുത്തുക
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,No Employee found for the given employee field value. '{}': {},തന്നിരിക്കുന്ന ജീവനക്കാരുടെ ഫീൽഡ് മൂല്യത്തിനായി ഒരു ജീവനക്കാരനെയും കണ്ടെത്തിയില്ല. &#39;{}&#39;: {}
 DocType: Payment Entry,Received Amount (Company Currency),ലഭിച്ച തുക (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/page/pos/pos.js,"LocalStorage is full, did not save","LocalStorage നിറഞ്ഞു, സംരക്ഷിച്ചില്ല"
 DocType: Chapter Member,Chapter Member,ചാപ്റ്റർ അംഗം
@@ -5847,6 +5919,7 @@
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,No Student Groups created.,സ്റ്റുഡന്റ് ഗ്രൂപ്പുകളൊന്നും സൃഷ്ടിച്ചിട്ടില്ല.
 apps/erpnext/erpnext/utilities/transaction_base.py,Duplicate row {0} with same {1},ഒരേ {{1} ഉപയോഗിച്ച് തനിപ്പകർപ്പ് വരി {0}
 DocType: Employee,Salary Details,ശമ്പള വിശദാംശങ്ങൾ
+DocType: Employee Checkin,Exit Grace Period Consequence,ഗ്രേസ് പിരീഡ് പരിണതഫലത്തിൽ നിന്ന് പുറത്തുകടക്കുക
 DocType: Bank Statement Transaction Invoice Item,Invoice,ഇൻവോയ്സ്
 DocType: Special Test Items,Particulars,വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Please set filter based on Item or Warehouse,ഇനം അല്ലെങ്കിൽ വെയർഹൗസിനെ അടിസ്ഥാനമാക്കി ഫിൽട്ടർ സജ്ജീകരിക്കുക
@@ -5945,6 +6018,7 @@
 DocType: Serial No,Out of AMC,AMC യുടെ
 DocType: Job Opening,"Job profile, qualifications required etc.","ജോബ് പ്രൊഫൈൽ, യോഗ്യതകൾ തുടങ്ങിയവ."
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,Ship To State,ഷിപ്പിംഗ് സ്റ്റേറ്റ്
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Do you want to submit the material request,മെറ്റീരിയൽ അഭ്യർത്ഥന സമർപ്പിക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ
 DocType: Opportunity Item,Basic Rate,അടിസ്ഥാന നിരക്ക്
 DocType: Compensatory Leave Request,Work End Date,ജോലി അവസാനിക്കുന്ന തീയതി
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Request for Raw Materials,അസംസ്കൃത വസ്തുക്കൾക്കുള്ള അഭ്യർത്ഥന
@@ -5988,6 +6062,7 @@
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ ക്യൂട്ടി
 DocType: Stock Entry,Repack,റീപായ്ക്ക് ചെയ്യുക
 DocType: UOM,Must be Whole Number,മുഴുവൻ അക്കം ആയിരിക്കണം
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ഉപഭോക്താവിന് ക്രെഡിറ്റ് പരിധി മറികടന്നു {0} ({1} / {2})
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/hr/notification/training_feedback/training_feedback.html,Hello,ഹലോ
 DocType: Vehicle Service,Change,മാറ്റുക
@@ -6029,6 +6104,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please enter Maintaince Details first,ആദ്യം സൂക്ഷിക്കുക വിശദാംശങ്ങൾ നൽകുക
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Projected Quantity Formula,പ്രൊജക്റ്റഡ് ക്വാണ്ടിറ്റി ഫോർമുല
 DocType: Supplier Scorecard Scoring Standing,Supplier Scorecard Scoring Standing,വിതരണക്കാരൻ സ്കോര്കാര്ഡ് സ്കോറിംഗ് സ്റ്റാന്ഡിംഗ്
+apps/erpnext/erpnext/regional/italy/utils.py,Row {0}: Please set the correct code on Mode of Payment {1},വരി {0}: പേയ്‌മെന്റ് മോഡിൽ ശരിയായ കോഡ് ദയവായി സജ്ജമാക്കുക {1}
 apps/erpnext/erpnext/hr/doctype/employee/employee.py,Employee status cannot be set to 'Left' as following employees are currently reporting to this employee:&nbsp;,താഴെപ്പറയുന്ന ജീവനക്കാരെ നിലവിൽ ഈ ജീവനക്കാരന് റിപ്പോർട്ടുചെയ്തുകൊണ്ടിരിക്കുന്നതിനാൽ തൊഴിലാളി നില &#39;ഇടത്&#39; എന്നായി സജ്ജീകരിക്കാൻ കഴിയില്ല:
 DocType: BOM Explosion Item,Source Warehouse,ഉറവിട വെയർഹൗസ്
 apps/erpnext/erpnext/utilities/user_progress.py,Add Users,ഉപയോക്താക്കളെ ചേർക്കുക
@@ -6120,6 +6196,7 @@
 DocType: Sales Order Item,Gross Profit,മൊത്തം ലാഭം
 DocType: Quality Inspection,Item Serial No,ഇനം സീരിയൽ നം
 DocType: Asset,Insurer,ഇൻഷുറർ
+DocType: Employee Checkin,OUT,പുറത്ത്
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py,Buying Amount,വാങ്ങൽ തുക
 DocType: Asset Maintenance Task,Certificate Required,സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്
 DocType: Retention Bonus,Retention Bonus,നിലനിർത്തൽ ബോണസ്
@@ -6288,6 +6365,7 @@
 apps/erpnext/erpnext/controllers/status_updater.py,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,കുറിപ്പ്: ഇനം {0} അളവിലോ അല്ലെങ്കിൽ തുകയോ 0 ആയി ഡെലിവറിയും ഓവർ ബുക്കിംഗും പരിശോധിക്കില്ല
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Opening Balance,തുടക്ക സംഖ്യ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,'From Date' must be after 'To Date',&#39;തീയതി മുതൽ&#39; &#39;തീയതി വരെ&#39;
+apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Total Amount {0},ആകെ തുക {0}
 DocType: Employee Skill,Evaluation Date,വിലയിരുത്തൽ തീയതി
 apps/erpnext/erpnext/stock/doctype/item/item.py,"""Customer Provided Item"" cannot be Purchase Item also",&quot;കസ്റ്റമർ നൽകിയ ഇനം&quot; എന്നത് ഇനം വാങ്ങാൻ കഴിയില്ല
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
@@ -6312,7 +6390,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Fixed Assets,അസറ്റുകൾ സ്ഥിരമാണ്
 DocType: Purchase Order,Ref SQ,റഫറൻസ് സ്ക്വയർ
 DocType: Salary Structure,Total Earning,ആകെ സമ്പാദ്യം
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ഉപഭോക്താവ്&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Share Balance,From No,ഇല്ല
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,പേയ്മെന്റ് റീകോണ്ലിയേഷൻ ഇൻവോയ്സ്
 DocType: Purchase Invoice,Taxes and Charges Added,നികുതികളും ചാർജുകളും ചേർത്തു
@@ -6418,6 +6495,7 @@
 DocType: POS Profile,Ignore Pricing Rule,വിലനിയന്ത്രണം അവഗണിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Food,ഭക്ഷണം
 DocType: Lost Reason Detail,Lost Reason Detail,നഷ്ടമായ കാരണം വിശദാംശം
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,The following serial numbers were created: <br> {0},ഇനിപ്പറയുന്ന സീരിയൽ നമ്പറുകൾ സൃഷ്ടിച്ചു: <br> {0}
 DocType: Maintenance Visit,Customer Feedback,ഉപഭോക്താവിന്റെ ഫീഡ്ബാക്ക്
 DocType: Serial No,Warranty / AMC Details,വാറന്റി / എഎംസി വിശദാംശങ്ങൾ
 DocType: Issue,Opening Time,സമയം തുറക്കുന്നു
@@ -6465,6 +6543,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js,Company name not same,കമ്പനിയുടെ പേര് ഒന്നല്ല
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.py,Employee Promotion cannot be submitted before Promotion Date ,പ്രമോഷൻ തീയതിക്ക് മുമ്പായി ജീവനക്കാർ പ്രമോഷൻ സമർപ്പിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py,Not allowed to update stock transactions older than {0},{0} എന്നതിനേക്കാൾ പഴയ സ്റ്റോക്ക് ഇടപാടുകൾ അപ്ഡേറ്റ് ചെയ്യാൻ അനുവദിച്ചിട്ടില്ല
+DocType: Employee Checkin,Employee Checkin,ജീവനക്കാരുടെ ചെക്ക്ഇൻ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},ആരംഭ തീയതി {0} എന്നതിനായുള്ള അവസാന തിയതിയേക്കാൾ കുറവായിരിക്കണം
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ഉപഭോക്തൃ ഉദ്ധരണികൾ സൃഷ്ടിക്കുക
 DocType: Buying Settings,Buying Settings,വാങ്ങൽ ക്രമീകരണം
@@ -6484,6 +6563,7 @@
 DocType: Patient,Patient Demographics,രോഗിയുടെ ജനസംഖ്യ
 DocType: Share Transfer,To Folio No,ഫോളില്ല നമ്പറിലേക്ക്
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py,Cash Flow from Operations,ഓപ്പറേഷനിൽ നിന്നുള്ള ക്യാഷ് ഫ്ളോ
+DocType: Employee Checkin,Log Type,ലോഗ് തരം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,None of the items have any change in quantity or value.,ഈ ഇനങ്ങളിൽ ഏതെങ്കിലും അളവിലോ മൂല്യത്തിലോ എന്തെങ്കിലും മാറ്റമുണ്ടാകും.
 DocType: Asset,Purchase Date,വാങ്ങിയ തിയതി
@@ -6527,6 +6607,7 @@
 DocType: Vital Signs,Very Hyper,വളരെ ഹൈപ്പർ
 apps/erpnext/erpnext/public/js/setup_wizard.js,Select the nature of your business.,നിങ്ങളുടെ ബിസിനസിന്റെ സ്വഭാവം തിരഞ്ഞെടുക്കുക.
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py,Please select month and year,ദയവായി മാസവും വർഷവും തിരഞ്ഞെടുക്കുക
+DocType: Service Level,Default Priority,സ്ഥിരസ്ഥിതി മുൻ‌ഗണന
 DocType: Student Log,Student Log,വിദ്യാർത്ഥിയുടെ ലോഗ്
 DocType: Shopping Cart Settings,Enable Checkout,ചെക്ക്ഔട്ട് പ്രവർത്തനക്ഷമമാക്കുക
 apps/erpnext/erpnext/config/settings.py,Human Resources,ഹ്യൂമൻ റിസോഴ്സസ്
@@ -6555,7 +6636,6 @@
 apps/erpnext/erpnext/config/integrations.py,Connect Shopify with ERPNext,ERPNext ഉപയോഗിച്ച് Shopify കണക്റ്റുചെയ്യുക
 DocType: Homepage Section Card,Subtitle,ഉപശീർഷകം
 DocType: Soil Texture,Loam,ഹരം
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 DocType: BOM,Scrap Material Cost(Company Currency),സ്ക്രാപ്പ് മെറ്റീരിയൽ കോസ്റ്റ് (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Delivery Note {0} must not be submitted,ഡെലിവറി കുറിപ്പ് {0} സമർപ്പിക്കാൻ പാടില്ല
 DocType: Task,Actual Start Date (via Time Sheet),യഥാർത്ഥ ആരംഭ തീയതി (ടൈം ഷീറ്റിലൂടെ)
@@ -6609,6 +6689,7 @@
 DocType: Drug Prescription,Dosage,മരുന്നുകൾ
 DocType: Cheque Print Template,Starting position from top edge,മുകളിൽ അഗ്രം മുതൽ ആരംഭിക്കുന്നു
 apps/erpnext/erpnext/healthcare/doctype/practitioner_schedule/practitioner_schedule.js,Appointment Duration (mins),നിയമന സമയ ദൈർഘ്യം (മിനിറ്റ്)
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,This employee already has a log with the same timestamp.{0},ഈ ജീവനക്കാരന് ഇതിനകം സമാന ടൈംസ്റ്റാമ്പുള്ള ഒരു ലോഗ് ഉണ്ട്. {0}
 DocType: Accounting Dimension,Disable,അപ്രാപ്തമാക്കുക
 DocType: Email Digest,Purchase Orders to Receive,സ്വീകരിക്കുന്നതിനുള്ള ഓർഡറുകൾ വാങ്ങുക
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഉത്തരവുകൾക്ക് വേണ്ടി ഉയർത്താൻ കഴിയില്ല:
@@ -6624,7 +6705,6 @@
 DocType: Buying Settings,Material Transferred for Subcontract,ഉപഘടകത്തിൽ വസ്തുക്കള് കൈമാറി
 DocType: Job Card,Timing Detail,ടൈമിംഗ് വിശദാംശം
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html,Required On,ആവശ്യമാണ്
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Importing {0} of {1},{1} ന്റെ {0}
 DocType: Job Offer Term,Job Offer Term,ജോബ് ഓഫർ ടേം
 DocType: SMS Center,All Contact,എല്ലാ കോൺടാക്റ്റുകളും
 DocType: Project Task,Project Task,പ്രോജക്റ്റ് ടാസ്ക്
@@ -6673,7 +6753,6 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,Item {0} is not setup for Serial Nos. Check Item master,സീരിയൽ നോസ് എന്നതിനായി ഇനം {0} സെറ്റ് അപ് സെറ്റ് മാസ്റ്റർ പരിശോധിക്കുകയില്ല
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,From State,സംസ്ഥാനം
 DocType: Leave Type,Maximum Continuous Days Applicable,പരമാവധി നിരന്തരമായ ദിവസങ്ങൾ ബാധകം
-apps/erpnext/erpnext/config/support.py,Support Team.,പിന്തുണാ ടീം.
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js,Please enter company name first,ആദ്യം കമ്പനിയുടെ പേര് നൽകുക
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js,Import Successful,ഇമ്പോർട്ടുചെയ്യൽ വിജയകരം
 DocType: Guardian,Alternate Number,ഇതര നമ്പർ
@@ -6764,6 +6843,7 @@
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Row #{0}: Item added,വരി # {0}: ഇനം ചേർത്തു
 DocType: Student Admission,Eligibility and Details,യോഗ്യതയും വിശദാംശങ്ങളും
 DocType: Staffing Plan,Staffing Plan Detail,സ്റ്റാഫ് ചെയ്യുന്ന പ്ലാൻ വിശദാംശം
+DocType: Shift Type,Late Entry Grace Period,വൈകി എൻ‌ട്രി ഗ്രേസ് പിരീഡ്
 DocType: Email Digest,Annual Income,വാർഷിക വരുമാനം
 DocType: Journal Entry,Subscription Section,സബ്സ്ക്രിപ്ഷൻ വിഭാഗം
 DocType: Salary Slip,Payment Days,പണമടയ്ക്കൽ ദിവസങ്ങൾ
@@ -6812,6 +6892,7 @@
 DocType: Journal Entry Account,Account Balance,അക്കൗണ്ട് ബാലൻസ്
 DocType: Asset Maintenance Log,Periodicity,ആവർത്തനം
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.js,Medical Record,മെഡിക്കൽ റെക്കോർഡ്
+apps/erpnext/erpnext/hr/doctype/employee_checkin/employee_checkin.py,Log Type is required for check-ins falling in the shift: {0}.,ഷിഫ്റ്റിൽ വീഴുന്ന ചെക്ക്-ഇന്നുകൾക്ക് ലോഗ് തരം ആവശ്യമാണ്: {0}.
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Execution,വധശിക്ഷ
 DocType: Item,Valuation Method,മൂല്യനിർണ്ണയ രീതി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Sales Invoice {1},വിൽപ്പന സാമഗ്രികൾക്കെതിരായി {0} {0}
@@ -6896,6 +6977,7 @@
 DocType: Loan Type,Loan Name,വായ്പയുടെ പേര്
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,Set default mode of payment,പണമടയ്ക്കൽ സ്ഥിരസ്ഥിതി മോഡ് സജ്ജമാക്കുക
 DocType: Quality Goal,Revision,പുനരവലോകനം
+DocType: Shift Type,The time before the shift end time when check-out is considered as early (in minutes).,ചെക്ക്- out ട്ട് നേരത്തെ (മിനിറ്റിനുള്ളിൽ) കണക്കാക്കുമ്പോൾ ഷിഫ്റ്റ് അവസാനിക്കുന്ന സമയത്തിന് മുമ്പുള്ള സമയം.
 DocType: Healthcare Service Unit,Service Unit Type,സർവീസ് യൂണിറ്റ് തരം
 DocType: Purchase Invoice,Return Against Purchase Invoice,വാങ്ങൽ ഇൻവോയ്സിന് എതിരായി മടങ്ങുക
 apps/erpnext/erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.js,Generate Secret,രഹസ്യം സൃഷ്ടിക്കുക
@@ -7049,12 +7131,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Cosmetics,കോസ്മെറ്റിക്സ്
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,നിങ്ങൾ സേവ് ചെയ്യുന്നതിനുമുമ്പ് ഒരു പരമ്പര തിരഞ്ഞെടുക്കുന്നതിന് ഉപയോക്താവിനെ നിർബന്ധിക്കാൻ ആഗ്രഹിക്കുന്നുവെങ്കിൽ ഇത് ചെക്ക് ചെയ്യുക. നിങ്ങൾ ഇത് പരിശോധിച്ചാൽ സ്ഥിരസ്ഥിതിയായിരിക്കുകയില്ല.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ഈ പങ്കുള്ള ഉപയോക്താക്കളെ ഫ്രീസുചെയ്ത അക്കൗണ്ടുകൾ ക്രമീകരിക്കാനും ഫ്രോസൺ അക്കൗണ്ടുകൾ ഉപയോഗിച്ച് അക്കൗണ്ടിംഗ് എൻട്രികൾ സൃഷ്ടിക്കുക / പരിഷ്ക്കരിക്കാനും അനുവദിക്കുന്നു
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Expense Claim,Total Claimed Amount,മൊത്തം ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py,Unable to find Time Slot in the next {0} days for Operation {1},അടുത്ത {0} ദിവസത്തേക്കുള്ള ഓപ്പറേഷൻ {1} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താനായില്ല
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Wrapping up,പൊതിയുക
 apps/erpnext/erpnext/non_profit/doctype/membership/membership.py,You can only renew if your membership expires within 30 days,നിങ്ങളുടെ അംഗത്വം 30 ദിവസത്തിനുള്ളിൽ കാലഹരണപ്പെടുമ്പോൾ മാത്രമേ നിങ്ങൾക്ക് പുതുക്കാനാകൂ
 apps/erpnext/erpnext/templates/generators/item/item_configure.js,Value must be between {0} and {1},"മൂല്യം {0}, {1} എന്നിവയ്ക്കിടയിലുള്ളതായിരിക്കണം"
 DocType: Quality Feedback,Parameters,പാരാമീറ്ററുകൾ
+DocType: Shift Type,Auto Attendance Settings,യാന്ത്രിക ഹാജർ ക്രമീകരണങ്ങൾ
 ,Sales Partner Transaction Summary,സെയിൽസ് പങ്കാളി ട്രാൻസാക്ഷൻ സംഗ്രഹം
 DocType: Asset Maintenance,Maintenance Manager Name,മെയിന്റനൻസ് മാനേജർ നാമം
 apps/erpnext/erpnext/public/js/controllers/transaction.js,It is needed to fetch Item Details.,ഇനം വിവരങ്ങൾ ലഭ്യമാക്കേണ്ടത് ആവശ്യമാണ്.
@@ -7081,6 +7165,7 @@
 DocType: Homepage Section,Use this field to render any custom HTML in the section.,വിഭാഗത്തിൽ ഏതെങ്കിലും ഇഷ്ടാനുസൃത HTML റെൻഡർ ചെയ്യുന്നതിന് ഈ ഫീൽഡ് ഉപയോഗിക്കുക.
 apps/erpnext/erpnext/healthcare/doctype/patient_appointment/patient_appointment.py,"Appointment cancelled, Please review and cancel the invoice {0}","അപ്പോയിന്റ്മെന്റ് റദ്ദാക്കി, ഇൻവോയ്സ് അവലോകനം ചെയ്ത് റദ്ദാക്കുക {0}"
 DocType: Sales Invoice,Time Sheet List,ടൈം ഷീറ്റ് ലിസ്റ്റ്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} against Bill {1} dated {2},ഗൂഗിളിനെതിരെ {0} {2} തീയതി {2}
 DocType: Shopify Settings,For Company,കമ്പനിയ്ക്കായി
 DocType: Linked Soil Analysis,Linked Soil Analysis,ലിങ്ക്ഡ് മണ്ണ് അനാലിസിസ്
 DocType: Project,Day to Send,അയയ്ക്കാനുള്ള ദിവസം
@@ -7145,7 +7230,6 @@
 DocType: Company,Round Off Cost Center,കോസ്റ്റ് സെന്റർ റൌണ്ട് ഓഫാക്കുക
 DocType: Supplier Scorecard Criteria,Criteria Weight,മാനദണ്ഡം ഭാരം
 DocType: Asset,Depreciation Schedules,വിലനിയന്ത്രണ ഷെഡ്യൂളുകൾ
-DocType: Expense Claim Detail,Claim Amount,ക്ലെയിം തുക
 DocType: Subscription,Discounts,ഡിസ്കൗണ്ട്
 DocType: Shipping Rule,Shipping Rule Conditions,ഷിപ്പിംഗ് റൂൾ വ്യവസ്ഥകൾ
 DocType: Subscription,Cancelation Date,റദ്ദാക്കൽ തീയതി
@@ -7173,7 +7257,6 @@
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js,Show zero values,പൂജ്യ മൂല്യങ്ങൾ കാണിക്കുക
 DocType: Employee Onboarding,Employee Onboarding,ജീവനക്കാരന് ഓണ്ബോര്ഡിംഗ്
 DocType: POS Closing Voucher,Period End Date,കാലാവധി അവസാനിക്കുന്ന തീയതി
-apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.js,Sales Opportunities by Source,ഉറവിടത്തിലൂടെ സെയിൽസ് അവസരങ്ങൾ
 DocType: Department,The first Leave Approver in the list will be set as the default Leave Approver.,"ലിസ്റ്റിലെ ആദ്യ ലീവ് അംഗ്രോർട്ട്, സ്ഥിരസ്ഥിതി ലീവ് അംഗീകാരമായി സജ്ജമാക്കും."
 DocType: POS Settings,POS Settings,POS ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js,All Accounts,എല്ലാ അക്കൗണ്ടുകളും
@@ -7194,7 +7277,6 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,വരി # {0}: നിരക്ക് {1} എന്നതിന് സമാനമായിരിക്കണം: {2} ({3} / {4})
 DocType: Clinical Procedure,HLC-CPR-.YYYY.-,HLC-CPR- .YYYY.-
 DocType: Healthcare Settings,Healthcare Service Items,ഹെൽത്ത് സേവന ഇനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js,No records found,റെക്കോർഡുകൾ കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 3,പ്രാധാന്യം റേഞ്ച് 3
 DocType: Vital Signs,Blood Pressure,രക്തസമ്മര്ദ്ദം
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js,Target On,ടാർഗെറ്റ് ഓൺ ചെയ്യുക
@@ -7237,6 +7319,7 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Batches,ബാച്ചുകൾ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Defense,പ്രതിരോധം
 DocType: Item,Has Batch No,ബാച്ച് നുണ്ട്
+apps/erpnext/erpnext/stock/report/delayed_item_report/delayed_item_report.py,Delayed Days,വൈകിയ ദിവസങ്ങൾ
 DocType: Lead,Person Name,വ്യക്തിയുടെ പേര്
 DocType: Item Variant,Item Variant,ഇനം വേരിയന്റ്
 DocType: Training Event Employee,Invited,ക്ഷണിച്ചു
@@ -7257,7 +7340,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"Start and end dates not in a valid Payroll Period, cannot calculate {0}.","സാധുതയുള്ള ശീർഷ കാലയളവിൽ ആരംഭിക്കുന്നതും അവസാനിക്കുന്നതുമായ തീയതികൾ, {0} കണക്കാക്കാൻ കഴിയില്ല."
 DocType: POS Profile,Only show Customer of these Customer Groups,ഈ കസ്റ്റമർ ഗ്രൂപ്പുകളുടെ കസ്റ്റമർ മാത്രം കാണിക്കുക
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കുന്നതിന് ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
-DocType: Service Level,Resolution Time,റസല്യൂഷൻ സമയം
+DocType: Service Level Priority,Resolution Time,റസല്യൂഷൻ സമയം
 DocType: Grading Scale Interval,Grade Description,ഗ്രേഡ് വിവരണം
 DocType: Homepage Section,Cards,കാർഡുകൾ
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ഗുണനിലവാര മീറ്റിംഗ് മിനിറ്റ്