Commit Graph

6945 Commits

Author SHA1 Message Date
Carlos Satorres fbe4441eda refs #4764 e2e solve 2023-06-16 09:06:25 +02:00
Carlos Satorres 9b950cd8d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-16 07:23:41 +02:00
Alexandre Riera 73133778fc Merge branch 'dev' into 5513-back-embalaje 2023-06-16 05:07:16 +00:00
Carlos Satorres 7bff915a7f refs #5325 back fix correct 2023-06-15 17:14:34 +02:00
Carlos Satorres 4157e30d4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable 2023-06-15 16:47:33 +02:00
Alex Moreno 5163b7b253 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-06-15 15:14:41 +02:00
Juan Ferrer 1c666cd48e refs #5595 Fix: ctx & userId removed from TpvTransaction/confirm 2023-06-15 13:10:44 +02:00
Carlos Satorres 8b832c68b3 refs #5325 fix back 2023-06-15 12:49:53 +02:00
Alex Moreno 71651b96a3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix 2023-06-15 11:49:40 +02:00
Alex Moreno 99ad9d3afa refs #5753 fix(change-password) 2023-06-15 11:49:39 +02:00
Vicent Llopis 5f2c5c5f9d refs #5842 delete console.log 2023-06-15 09:55:32 +02:00
Vicent Llopis a50de4e509 refs #5842 feat: comprueba que invoiceDate no sea null 2023-06-15 09:50:46 +02:00
Alex Moreno a206f64e3c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-06-15 07:27:04 +02:00
Vicent Llopis 14ebcf96c0 refs #5842 refactor: change names 2023-06-15 07:24:17 +02:00
Sergio De la torre 1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje 2023-06-15 07:22:10 +02:00
Carlos Satorres b3022d0ce2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-14 17:47:56 +02:00
Carlos Satorres 9cdc914a25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable 2023-06-14 17:03:09 +02:00
Vicent Llopis 7fa4eabf86 refs #5842 fix: recalcula invoiceDate cuando se cambia la company 2023-06-14 14:59:18 +02:00
Sergio De la torre e8b98a2daf Merge branch 'dev' into 5651-packingSiteAdvanced 2023-06-14 11:18:24 +00:00
Vicent Llopis 9e89167d27 Merge branch 'dev' into 5691-route.index_optimizar 2023-06-14 10:57:58 +00:00
Sergio De la torre c62e6fa0eb refs #5651 packingSiteAdvanced 2023-06-14 10:51:22 +02:00
Juan Ferrer 961941ecb3 refs #5667 TicketRequest translations added/fixed 2023-06-13 20:52:26 +02:00
Carlos Satorres 66c5eda6f2 refs #5325 remove defaultSearch 2023-06-13 16:08:11 +02:00
Alex Moreno 92953b9aa8 refs #5094 test(docuware): adapt tests 2023-06-13 11:37:35 +02:00
Vicent Llopis fa9719de78 refs #5691 feat: cambiado url por data en los crudModel 2023-06-13 08:16:37 +02:00
Alex Moreno a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware 2023-06-13 07:11:39 +02:00
Juan Ferrer cc788d7e06 refs #5667 Account translations added 2023-06-12 16:28:47 +02:00
Juan Ferrer 3386af9b17 refs #5667 MailAliasAccount translations added 2023-06-12 16:27:02 +02:00
Carlos Satorres 59642ab3ca refs #5325 defaultSearch 2023-06-12 15:44:22 +02:00
Alex Moreno d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote 2023-06-12 15:20:46 +02:00
Alex Moreno f113bfbc95 Merge branch 'dev' into test 2023-06-12 12:32:29 +00:00
Carlos Satorres 58bcad7b2d refs #4764 validator create 2023-06-12 12:42:30 +02:00
Alex Moreno 24b3697ac6 Merge branch 'dev' into 5472-user_passExpired 2023-06-12 10:31:25 +00:00
Carlos Satorres c9bf74dcc4 Merge branch 'dev' into 5635-contadotTicketExpedition 2023-06-12 09:56:34 +00:00
Alex Moreno 1c39ad873c resolve dev conflicts 2023-06-12 11:06:45 +02:00
Alex Moreno 22e69e6e91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired 2023-06-12 11:06:27 +02:00
Alex Moreno 5c1b867d05 WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired 2023-06-12 10:46:21 +02:00
Alexandre Riera f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje 2023-06-12 10:27:18 +02:00
Alexandre Riera 703c224e91 refs #5513 modified-entry email 2023-06-12 10:26:50 +02:00
Alexandre Riera 48ee29568d Merge branch 'dev' into 5595-modify-loggable-tables-in-procs 2023-06-12 05:26:28 +00:00
Alex Moreno d735f142a1 Merge branch 'dev' into 5472-user_passExpired 2023-06-12 05:04:28 +00:00
Carlos Satorres 06d1334e1f refs #4764 withWarehouse 2023-06-09 14:30:46 +02:00
Carlos Satorres 9ca82a2f79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4764-serviceAbono 2023-06-09 14:23:55 +02:00
Carlos Satorres 61d9e2dcd3 refs #4764 remake refund, back front 2023-06-09 14:19:17 +02:00
Carlos Satorres 9b4c4496b6 Merge branch 'dev' into 5760-changesSMS 2023-06-09 11:16:02 +00:00
Alexandre Riera 81a96e7d82 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs 2023-06-09 09:03:23 +02:00
Carlos Satorres ec9dfa90fd refs #5760 fixtures 2023-06-09 08:06:45 +02:00
Pablo Natek ac67a2606f Merge branch 'dev' into 5735-creditFormat 2023-06-09 07:11:13 +02:00
Carlos Satorres bdffc0401f refs #5760 update getChanges, traduccion 2023-06-08 15:29:03 +02:00
Alex Moreno 96d88cdf4b refs #5366 refactor(invoiceIn_toBook): use invoiceIn_booking 2023-06-08 14:42:07 +02:00