mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-06 06:58:27 +00:00
added new calendar and renamed holiday block list
This commit is contained in:
Rushabh Mehta
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-01-10 16:34:13",
|
||||
"creation": "2013-02-05 11:48:26",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-04 15:34:55",
|
||||
"modified": "2013-02-14 17:21:51",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -60,10 +60,10 @@
|
||||
{
|
||||
"description": "Days for which Holidays are blocked for this department.",
|
||||
"doctype": "DocField",
|
||||
"fieldname": "holiday_block_list",
|
||||
"fieldname": "leave_block_list",
|
||||
"fieldtype": "Link",
|
||||
"label": "Holiday Block List",
|
||||
"options": "Holiday Block List"
|
||||
"label": "Leave Block List",
|
||||
"options": "Leave Block List"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
test_records = [
|
||||
[{"doctype":"Department", "department_name":"_Test Department"}],
|
||||
[{"doctype":"Department", "department_name":"_Test Department with Block List",
|
||||
"holiday_block_list": "_Test Holiday Block List"}],
|
||||
"leave_block_list": "_Test Leave Block List"}],
|
||||
]
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
[
|
||||
"Allow Users",
|
||||
"Block Holidays on important days.",
|
||||
"Block Days",
|
||||
"HR",
|
||||
"Company",
|
||||
"Holiday Block List Allowed",
|
||||
"Holiday Block List Dates",
|
||||
"Holiday Block List",
|
||||
"Stop users from making Leave Applications on following days.",
|
||||
"Applies to Company",
|
||||
"Holiday Block List Name",
|
||||
"Year",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.",
|
||||
"Allow the following users to make Leave Applications for block days."
|
||||
]
|
||||
@@ -1 +0,0 @@
|
||||
[]
|
||||
@@ -1,4 +0,0 @@
|
||||
[
|
||||
"Date is repeated",
|
||||
"Block Date"
|
||||
]
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "\u0627\u0644\u0633\u0645\u0627\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646",
|
||||
"Allow the following users to make Leave Applications for block days.": "\u062a\u0633\u0645\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0627\u0644\u062a\u0627\u0644\u064a\u0629 \u0644\u062c\u0639\u0644 \u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0625\u062c\u0627\u0632\u0629 \u0644\u0639\u062f\u0629 \u0623\u064a\u0627\u0645 \u0643\u062a\u0644\u0629.",
|
||||
"Applies to Company": "\u064a\u0646\u0637\u0628\u0642 \u0639\u0644\u0649 \u0634\u0631\u0643\u0629",
|
||||
"Block Days": "\u0643\u062a\u0644\u0629 \u0623\u064a\u0627\u0645",
|
||||
"Block Holidays on important days.": "\u0645\u0646\u0639 \u0627\u0644\u0625\u062c\u0627\u0632\u0627\u062a \u0641\u064a \u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u0647\u0627\u0645\u0629.",
|
||||
"Company": "\u0634\u0631\u0643\u0629",
|
||||
"HR": "HR",
|
||||
"Holiday Block List": "\u0625\u0642\u0627\u0645\u0627\u062a \u0642\u0627\u0626\u0645\u0629",
|
||||
"Holiday Block List Allowed": "\u0639\u0637\u0644\u0629 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631 \u0645\u0633\u0645\u0648\u062d",
|
||||
"Holiday Block List Dates": "\u0645\u0648\u0627\u0639\u064a\u062f \u0625\u0642\u0627\u0645\u0627\u062a \u0642\u0627\u0626\u0645\u0629",
|
||||
"Holiday Block List Name": "\u0627\u0633\u0645 \u0625\u0642\u0627\u0645\u0627\u062a \u0642\u0627\u0626\u0645\u0629",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "\u0625\u0646 \u0644\u0645 \u064a\u0643\u0646 \u062a\u0645\u060c \u0633\u064a\u0643\u0648\u0646 \u0644\u062f\u064a\u0643 \u0642\u0627\u0626\u0645\u0629 \u062a\u0636\u0627\u0641 \u0625\u0644\u0649 \u0643\u0644 \u0642\u0633\u0645 \u062d\u064a\u062b \u0623\u0646\u0647 \u0644\u0627 \u0628\u062f \u0645\u0646 \u062a\u0637\u0628\u064a\u0642\u0647\u0627.",
|
||||
"Stop users from making Leave Applications on following days.": "\u0648\u0642\u0641 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645\u064a\u0646 \u0645\u0646 \u0625\u062c\u0631\u0627\u0621 \u062a\u0637\u0628\u064a\u0642\u0627\u062a \u0639\u0644\u0649 \u0625\u062c\u0627\u0632\u0629 \u0627\u0644\u0623\u064a\u0627\u0645 \u0627\u0644\u062a\u0627\u0644\u064a\u0629.",
|
||||
"Year": "\u0639\u0627\u0645"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "\u0645\u0646\u0639 \u062a\u0627\u0631\u064a\u062e",
|
||||
"Date is repeated": "\u0648\u064a\u062a\u0643\u0631\u0631 \u0627\u0644\u062a\u0627\u0631\u064a\u062e"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "Permitir que los usuarios",
|
||||
"Allow the following users to make Leave Applications for block days.": "Permitir a los usuarios realizar las siguientes aplicaciones dejan para los d\u00edas de bloque.",
|
||||
"Applies to Company": "Corresponde a la Empresa",
|
||||
"Block Days": "D\u00edas de bloque",
|
||||
"Block Holidays on important days.": "Bloque Vacaciones en d\u00edas importantes.",
|
||||
"Company": "Empresa",
|
||||
"HR": "HR",
|
||||
"Holiday Block List": "Holiday lista de bloqueo",
|
||||
"Holiday Block List Allowed": "Holiday Lista de bloqueo animales",
|
||||
"Holiday Block List Dates": "Las fechas de vacaciones de listas de bloqueo",
|
||||
"Holiday Block List Name": "Bloque de vacaciones Lista de Nombres",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "Si no est\u00e1 activada, la lista tendr\u00e1 que ser a\u00f1adido a cada Departamento donde se ha de aplicar.",
|
||||
"Stop users from making Leave Applications on following days.": "Deje que los usuarios realicen aplicaciones dejan en los d\u00edas siguientes.",
|
||||
"Year": "A\u00f1o"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "Bloque Fecha",
|
||||
"Date is repeated": "La fecha se repite"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "Autoriser les utilisateurs",
|
||||
"Allow the following users to make Leave Applications for block days.": "Autoriser les utilisateurs suivants pour faire demandes d'autorisation pour les jours de bloc.",
|
||||
"Applies to Company": "S'applique \u00e0 l'entreprise",
|
||||
"Block Days": "Bloquer les jours",
|
||||
"Block Holidays on important days.": "Bloquer les jours f\u00e9ri\u00e9s importants.",
|
||||
"Company": "Entreprise",
|
||||
"HR": "RH",
|
||||
"Holiday Block List": "Block List vacances",
|
||||
"Holiday Block List Allowed": "Block List vacances accept\u00e9s",
|
||||
"Holiday Block List Dates": "Dates de vacances de listes rouges d'",
|
||||
"Holiday Block List Name": "Nom de la liste de vacances Bloquer",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "Si ce n'est pas coch\u00e9e, la liste devra \u00eatre ajout\u00e9 \u00e0 chaque d\u00e9partement o\u00f9 il doit \u00eatre appliqu\u00e9.",
|
||||
"Stop users from making Leave Applications on following days.": "Emp\u00eacher les utilisateurs de faire des demandes d'autorisation, les jours suivants.",
|
||||
"Year": "Ann\u00e9e"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "Date de bloquer",
|
||||
"Date is repeated": "La date est r\u00e9p\u00e9t\u00e9e"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "\u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u094b \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902",
|
||||
"Allow the following users to make Leave Applications for block days.": "\u0928\u093f\u092e\u094d\u0928 \u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u094b \u092c\u094d\u0932\u0949\u0915 \u0926\u093f\u0928\u094b\u0902 \u0915\u0947 \u0932\u093f\u090f \u091b\u0941\u091f\u094d\u091f\u0940 \u0905\u0928\u0941\u092a\u094d\u0930\u092f\u094b\u0917 \u092c\u0928\u093e\u0928\u0947 \u0915\u0947 \u0932\u093f\u090f \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902.",
|
||||
"Applies to Company": "\u0915\u0902\u092a\u0928\u0940 \u0915\u0947 \u0932\u093f\u090f \u0932\u093e\u0917\u0942 \u0939\u094b\u0924\u093e \u0939\u0948",
|
||||
"Block Days": "\u092c\u094d\u0932\u0949\u0915 \u0926\u093f\u0928",
|
||||
"Block Holidays on important days.": "\u092e\u0939\u0924\u094d\u0935\u092a\u0942\u0930\u094d\u0923 \u0926\u093f\u0928 \u092a\u0930 \u091b\u0941\u091f\u094d\u091f\u093f\u092f\u093e\u0901 \u092e\u0948.",
|
||||
"Company": "\u0915\u0902\u092a\u0928\u0940",
|
||||
"HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928",
|
||||
"Holiday Block List": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940",
|
||||
"Holiday Block List Allowed": "\u0905\u0935\u0915\u093e\u0936 \u0938\u0942\u091a\u0940 \u092c\u094d\u0932\u0949\u0915 \u0930\u0916 \u0938\u0915\u0924\u0947 \u0939\u0948",
|
||||
"Holiday Block List Dates": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0924\u093f\u0925\u093f\u092f\u093e\u0902",
|
||||
"Holiday Block List Name": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u092e\u0947\u0902 \u0928\u093e\u092e",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "\u0905\u0917\u0930 \u091c\u093e\u0901\u091a \u0928\u0939\u0940\u0902 \u0915\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948, \u0907\u0938 \u0938\u0942\u091a\u0940 \u0915\u0947 \u0932\u093f\u090f \u092a\u094d\u0930\u0924\u094d\u092f\u0947\u0915 \u0935\u093f\u092d\u093e\u0917 \u0939\u0948 \u091c\u0939\u093e\u0902 \u0907\u0938\u0947 \u0932\u093e\u0917\u0942 \u0915\u093f\u092f\u093e \u0917\u092f\u093e \u0939\u0948 \u0915\u0947 \u0932\u093f\u090f \u091c\u094b\u0921\u093c\u093e \u091c\u093e \u0939\u094b\u0917\u093e.",
|
||||
"Stop users from making Leave Applications on following days.": "\u0928\u093f\u092e\u094d\u0928\u0932\u093f\u0916\u093f\u0924 \u0926\u093f\u0928 \u092a\u0930 \u091b\u0941\u091f\u094d\u091f\u0940 \u0905\u0928\u0941\u092a\u094d\u0930\u092f\u094b\u0917 \u092c\u0928\u093e\u0928\u0947 \u0938\u0947 \u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e\u0913\u0902 \u0915\u094b \u092c\u0902\u0926 \u0915\u0930\u094b.",
|
||||
"Year": "\u0935\u0930\u094d\u0937"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "\u0924\u093f\u0925\u093f \u092c\u094d\u0932\u0949\u0915",
|
||||
"Date is repeated": "\u0924\u093f\u0925\u093f \u0926\u094b\u0939\u0930\u093e\u092f\u093e \u0939\u0948"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "Omogu\u0107iti korisnicima",
|
||||
"Allow the following users to make Leave Applications for block days.": "Dopusti sljede\u0107i korisnicima da ostavite Prijave za blok dana.",
|
||||
"Applies to Company": "Odnosi se na Dru\u0161tvo",
|
||||
"Block Days": "Blok Dani",
|
||||
"Block Holidays on important days.": "Blok Odmor o va\u017enim dana.",
|
||||
"Company": "Dru\u0161tvo",
|
||||
"HR": "HR",
|
||||
"Holiday Block List": "Turisti\u010dka Blok Popis",
|
||||
"Holiday Block List Allowed": "Turisti\u010dka Blok Popis dopu\u0161tenih",
|
||||
"Holiday Block List Dates": "Holiday Block List datumi",
|
||||
"Holiday Block List Name": "Turisti\u010dka Blok Popis Ime",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "Ako nije ozna\u010deno, popis \u0107e biti dodan u svakom odjela gdje se mora primjenjivati.",
|
||||
"Stop users from making Leave Applications on following days.": "Prestani korisnike od izrade ostaviti aplikacija na sljede\u0107im danima.",
|
||||
"Year": "Godina"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "Blok Datum",
|
||||
"Date is repeated": "Datum se ponavlja"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "Gebruikers toestaan",
|
||||
"Allow the following users to make Leave Applications for block days.": "Laat de volgende gebruikers te vertrekken Toepassingen maken voor blok dagen.",
|
||||
"Applies to Company": "Geldt voor Bedrijf",
|
||||
"Block Days": "Blokkeren Dagen",
|
||||
"Block Holidays on important days.": "Blok Vakantie op belangrijke dagen.",
|
||||
"Company": "Vennootschap",
|
||||
"HR": "HR",
|
||||
"Holiday Block List": "Holiday Block List",
|
||||
"Holiday Block List Allowed": "Holiday toegestaan \u200b\u200bBlock List",
|
||||
"Holiday Block List Dates": "Holiday Block List Data",
|
||||
"Holiday Block List Name": "Holiday Block List Name",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "Indien niet gecontroleerd, wordt de lijst worden toegevoegd aan elk Department waar het moet worden toegepast.",
|
||||
"Stop users from making Leave Applications on following days.": "Stop gebruikers van het maken van verlofaanvragen op de volgende dagen.",
|
||||
"Year": "Jaar"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "Blokkeren Datum",
|
||||
"Date is repeated": "Datum wordt herhaald"
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"Allow Users": "Permitir que os usu\u00e1rios",
|
||||
"Allow the following users to make Leave Applications for block days.": "Permitir que os usu\u00e1rios a seguir para fazer aplica\u00e7\u00f5es deixam para os dias de bloco.",
|
||||
"Applies to Company": "Aplica-se a Empresa",
|
||||
"Block Days": "Dias bloco",
|
||||
"Block Holidays on important days.": "Bloquear feriados em dias importantes.",
|
||||
"Company": "Companhia",
|
||||
"HR": "HR",
|
||||
"Holiday Block List": "Lista de Bloqueios de f\u00e9rias",
|
||||
"Holiday Block List Allowed": "Lista de feriado Bloco admitidos",
|
||||
"Holiday Block List Dates": "Datas de f\u00e9rias Lista de Bloqueios",
|
||||
"Holiday Block List Name": "Nome de f\u00e9rias Lista de Bloqueios",
|
||||
"If not checked, the list will have to be added to each Department where it has to be applied.": "Se n\u00e3o for controlada, a lista dever\u00e1 ser adicionado a cada departamento onde tem de ser aplicado.",
|
||||
"Stop users from making Leave Applications on following days.": "Pare de usu\u00e1rios de fazer aplica\u00e7\u00f5es deixam nos dias seguintes.",
|
||||
"Year": "Ano"
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Block Date": "Bloquear Data",
|
||||
"Date is repeated": "Data \u00e9 repetido"
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
test_records = [[{
|
||||
"doctype":"Holiday Block List",
|
||||
"holiday_block_list_name": "_Test Holiday Block List",
|
||||
"year": "_Test Fiscal Year 2013",
|
||||
"company": "_Test Company"
|
||||
}, {
|
||||
"doctype": "Holiday Block List Date",
|
||||
"parent": "_Test Holiday Block List",
|
||||
"parenttype": "Holiday Block List",
|
||||
"parentfield": "holiday_block_list_dates",
|
||||
"block_date": "2013-01-02",
|
||||
"reason": "First work day"
|
||||
}, {
|
||||
"doctype": "Holiday Block List Allow",
|
||||
"parent": "_Test Holiday Block List",
|
||||
"parenttype": "Holiday Block List",
|
||||
"parentfield": "holiday_block_list_allowed",
|
||||
"allow_user": "test1@example.com",
|
||||
}
|
||||
]]
|
||||
@@ -1,5 +0,0 @@
|
||||
[
|
||||
"HR",
|
||||
"Allow User",
|
||||
"Holiday Block List Allow"
|
||||
]
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "\u062a\u0633\u0645\u062d \u0644\u0644\u0645\u0633\u062a\u062e\u062f\u0645",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Allow": "\u0639\u0637\u0644\u0629 \u0642\u0627\u0626\u0645\u0629 \u0627\u0644\u062d\u0638\u0631 \u0627\u0644\u0633\u0645\u0627\u062d"
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "Permitir al usuario",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Allow": "Lista Casas Bloquear Permitir"
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "Permettre \u00e0 l'utilisateur",
|
||||
"HR": "RH",
|
||||
"Holiday Block List Allow": "Block List vacances Permettez-"
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "\u0909\u092a\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0915\u0940 \u0905\u0928\u0941\u092e\u0924\u093f",
|
||||
"HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928",
|
||||
"Holiday Block List Allow": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0915\u0940 \u0905\u0928\u0941\u092e\u0924\u093f \u0926\u0947\u0902"
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "Dopusti korisnika",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Allow": "Turisti\u010dka Popis Blok Dopustite"
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "Door gebruiker toestaan",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Allow": "Holiday Block List Laat"
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"Allow User": "Permitir que o usu\u00e1rio",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Allow": "Lista de Bloqueios de f\u00e9rias Permitir"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
[
|
||||
"HR",
|
||||
"Reason",
|
||||
"Holiday Block List Date",
|
||||
"Block Date"
|
||||
]
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "\u0645\u0646\u0639 \u062a\u0627\u0631\u064a\u062e",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Date": "\u062a\u0627\u0631\u064a\u062e \u0625\u0642\u0627\u0645\u0627\u062a \u0642\u0627\u0626\u0645\u0629",
|
||||
"Reason": "\u0633\u0628\u0628"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "Bloque Fecha",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Date": "Bloque de vacaciones Lista Fecha",
|
||||
"Reason": "Raz\u00f3n"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "Date de bloquer",
|
||||
"HR": "RH",
|
||||
"Holiday Block List Date": "Liste Date vacances Bloquer",
|
||||
"Reason": "Raison"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "\u0924\u093f\u0925\u093f \u092c\u094d\u0932\u0949\u0915",
|
||||
"HR": "\u092e\u093e\u0928\u0935 \u0938\u0902\u0938\u093e\u0927\u0928",
|
||||
"Holiday Block List Date": "\u0905\u0935\u0915\u093e\u0936 \u092c\u094d\u0932\u0949\u0915 \u0938\u0942\u091a\u0940 \u0924\u093f\u0925\u093f",
|
||||
"Reason": "\u0915\u093e\u0930\u0923"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "Blok Datum",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Date": "Turisti\u010dka Blok Popis Datum",
|
||||
"Reason": "Razlog"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "Blokkeren Datum",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Date": "Holiday Block List Datum",
|
||||
"Reason": "Reden"
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"Block Date": "Bloquear Data",
|
||||
"HR": "HR",
|
||||
"Holiday Block List Date": "Data feriado Lista de Bloqueios",
|
||||
"Reason": "Raz\u00e3o"
|
||||
}
|
||||
@@ -59,11 +59,11 @@ class DocType:
|
||||
# per department
|
||||
department = webnotes.conn.get_value("Employee", self.doc.employee, "department")
|
||||
if department:
|
||||
block_list = webnotes.conn.get_value("Department", department, "holiday_block_list")
|
||||
block_list = webnotes.conn.get_value("Department", department, "leave_block_list")
|
||||
add_block_list(block_list)
|
||||
|
||||
# global
|
||||
for block_list in webnotes.conn.sql_list("""select name from `tabHoliday Block List`
|
||||
for block_list in webnotes.conn.sql_list("""select name from `tabLeave Block List`
|
||||
where ifnull(applies_to_all_departments,0)=1 and company=%s""", self.doc.company):
|
||||
add_block_list(block_list)
|
||||
|
||||
@@ -73,7 +73,7 @@ class DocType:
|
||||
from_date = getdate(self.doc.from_date)
|
||||
to_date = getdate(self.doc.to_date)
|
||||
for d in webnotes.conn.sql("""select block_date, reason from
|
||||
`tabHoliday Block List Date` where parent=%s""", block_list, as_dict=1):
|
||||
`tabLeave Block List Date` where parent=%s""", block_list, as_dict=1):
|
||||
block_date = getdate(d.block_date)
|
||||
if block_date > from_date and block_date < to_date:
|
||||
webnotes.msgprint(_("You cannot apply for a leave on the following date because it is blocked")
|
||||
@@ -84,7 +84,7 @@ class DocType:
|
||||
|
||||
def is_user_in_allow_list(self, block_list):
|
||||
return webnotes.session.user in webnotes.conn.sql_list("""select allow_user
|
||||
from `tabHoliday Block List Allow` where parent=%s""", block_list)
|
||||
from `tabLeave Block List Allow` where parent=%s""", block_list)
|
||||
|
||||
def get_holidays(self):
|
||||
tot_hol = webnotes.conn.sql("""select count(*) from `tabHoliday` h1, `tabHoliday List` h2, `tabEmployee` e1
|
||||
|
||||
@@ -30,7 +30,7 @@ class TestLeaveApplication(unittest.TestCase):
|
||||
def test_global_block_list(self):
|
||||
application = self.get_application(test_records[3])
|
||||
application.doc.leave_approver = "test@example.com"
|
||||
webnotes.conn.set_value("Holiday Block List", "_Test Holiday Block List",
|
||||
webnotes.conn.set_value("Leave Block List", "_Test Leave Block List",
|
||||
"applies_to_all_departments", 1)
|
||||
webnotes.conn.set_value("Employee", "_T-Employee-0002", "department",
|
||||
"_Test Department")
|
||||
|
||||
@@ -11,7 +11,7 @@ class DocType:
|
||||
|
||||
def validate(self):
|
||||
dates = []
|
||||
for d in self.doclist.get({"doctype":"Holiday Block List Date"}):
|
||||
for d in self.doclist.get({"doctype":"Leave Block List Date"}):
|
||||
# validate fiscal year
|
||||
validate_fiscal_year(d.block_date, self.doc.year, _("Block Date"))
|
||||
|
||||
@@ -19,4 +19,3 @@ class DocType:
|
||||
if d.block_date in dates:
|
||||
webnotes.msgprint(_("Date is repeated") + ":" + d.block_date, raise_exception=1)
|
||||
dates.append(d.block_date)
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-02-04 15:31:29",
|
||||
"creation": "2013-02-08 15:13:29",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-08 11:36:20",
|
||||
"modified": "2013-02-14 17:15:32",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
{
|
||||
"autoname": "field:holiday_block_list_name",
|
||||
"autoname": "field:leave_block_list_name",
|
||||
"description": "Block Holidays on important days.",
|
||||
"doctype": "DocType",
|
||||
"document_type": "Master",
|
||||
@@ -17,7 +17,7 @@
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"name": "__common__",
|
||||
"parent": "Holiday Block List",
|
||||
"parent": "Leave Block List",
|
||||
"parentfield": "fields",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0
|
||||
@@ -26,7 +26,7 @@
|
||||
"create": 1,
|
||||
"doctype": "DocPerm",
|
||||
"name": "__common__",
|
||||
"parent": "Holiday Block List",
|
||||
"parent": "Leave Block List",
|
||||
"parentfield": "permissions",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
@@ -36,13 +36,13 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Holiday Block List"
|
||||
"name": "Leave Block List"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "holiday_block_list_name",
|
||||
"fieldname": "leave_block_list_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Holiday Block List Name",
|
||||
"label": "Leave Block List Name",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
@@ -77,10 +77,10 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "holiday_block_list_dates",
|
||||
"fieldname": "leave_block_list_dates",
|
||||
"fieldtype": "Table",
|
||||
"label": "Holiday Block List Dates",
|
||||
"options": "Holiday Block List Date"
|
||||
"label": "Leave Block List Dates",
|
||||
"options": "Leave Block List Date"
|
||||
},
|
||||
{
|
||||
"description": "Allow the following users to make Leave Applications for block days.",
|
||||
@@ -91,10 +91,10 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"fieldname": "holiday_block_list_allowed",
|
||||
"fieldname": "leave_block_list_allowed",
|
||||
"fieldtype": "Table",
|
||||
"label": "Holiday Block List Allowed",
|
||||
"options": "Holiday Block List Allow"
|
||||
"label": "Leave Block List Allowed",
|
||||
"options": "Leave Block List Allow"
|
||||
},
|
||||
{
|
||||
"doctype": "DocPerm"
|
||||
20
hr/doctype/leave_block_list/test_leave_block_list.py
Normal file
20
hr/doctype/leave_block_list/test_leave_block_list.py
Normal file
@@ -0,0 +1,20 @@
|
||||
test_records = [[{
|
||||
"doctype":"Leave Block List",
|
||||
"leave_block_list_name": "_Test Leave Block List",
|
||||
"year": "_Test Fiscal Year 2013",
|
||||
"company": "_Test Company"
|
||||
}, {
|
||||
"doctype": "Leave Block List Date",
|
||||
"parent": "_Test Leave Block List",
|
||||
"parenttype": "Leave Block List",
|
||||
"parentfield": "leave_block_list_dates",
|
||||
"block_date": "2013-01-02",
|
||||
"reason": "First work day"
|
||||
}, {
|
||||
"doctype": "Leave Block List Allow",
|
||||
"parent": "_Test Leave Block List",
|
||||
"parenttype": "Leave Block List",
|
||||
"parentfield": "leave_block_list_allowed",
|
||||
"allow_user": "test1@example.com",
|
||||
}
|
||||
]]
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-02-06 14:31:03",
|
||||
"creation": "2013-02-06 17:43:44",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-06 14:31:03",
|
||||
"modified": "2013-02-14 17:15:45",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -19,7 +19,7 @@
|
||||
"label": "Allow User",
|
||||
"name": "__common__",
|
||||
"options": "Profile",
|
||||
"parent": "Holiday Block List Allow",
|
||||
"parent": "Leave Block List Allow",
|
||||
"parentfield": "fields",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
@@ -27,7 +27,7 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Holiday Block List Allow"
|
||||
"name": "Leave Block List Allow"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField"
|
||||
@@ -1,8 +1,8 @@
|
||||
[
|
||||
{
|
||||
"creation": "2013-02-04 15:33:14",
|
||||
"creation": "2013-02-05 11:48:25",
|
||||
"docstatus": 0,
|
||||
"modified": "2013-02-04 15:36:10",
|
||||
"modified": "2013-02-14 17:15:52",
|
||||
"modified_by": "Administrator",
|
||||
"owner": "Administrator"
|
||||
},
|
||||
@@ -15,7 +15,7 @@
|
||||
{
|
||||
"doctype": "DocField",
|
||||
"name": "__common__",
|
||||
"parent": "Holiday Block List Date",
|
||||
"parent": "Leave Block List Date",
|
||||
"parentfield": "fields",
|
||||
"parenttype": "DocType",
|
||||
"permlevel": 0,
|
||||
@@ -23,7 +23,7 @@
|
||||
},
|
||||
{
|
||||
"doctype": "DocType",
|
||||
"name": "Holiday Block List Date"
|
||||
"name": "Leave Block List Date"
|
||||
},
|
||||
{
|
||||
"doctype": "DocField",
|
||||
@@ -81,9 +81,9 @@ wn.module_page["HR"] = [
|
||||
doctype: "Holiday List"
|
||||
},
|
||||
{
|
||||
"label":wn._("Holiday Block List"),
|
||||
"label":wn._("Leave Block List"),
|
||||
"description":wn._("Block leave applications by department."),
|
||||
doctype: "Holiday Block List"
|
||||
doctype: "Leave Block List"
|
||||
},
|
||||
]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user