Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight

2024-08-13 11:41:52 +02:00 · 2024-08-13 11:41:52 +02:00 · 85f064c869
parent c742f6f79d 459254a652
commit 85f064c869
3 changed files with 15 additions and 0 deletions
--- a/db/versions/11185-maroonArborvitae/00-firstScript.sql
+++ b/db/versions/11185-maroonArborvitae/00-firstScript.sql
@ -0,0 +1 @@
+DROP TABLE bi.Greuges_comercial_detail;
--- a/modules/worker/back/locale/worker-time-control/en.yml
+++ b/modules/worker/back/locale/worker-time-control/en.yml
@ -0,0 +1,7 @@
+name: time control
+columns:
+    direction: direction
+    isSendMail: sent mail
+    logExclude: excluded log
+    manual: manual
+    timed: timed
--- a/modules/worker/back/locale/worker-time-control/es.yml
+++ b/modules/worker/back/locale/worker-time-control/es.yml
@ -0,0 +1,7 @@
+name: control horario
+columns:
+    direction: dirección
+    isSendMail: correo enviado
+    logExclude: registro excluido
+    manual: manual
+    timed: fichada