 Robert Ferrús
|
b09e3398ff
|
Merge branch 'dev' into 8077-sumDefaulterBackFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 10:46:16 +00:00 |
 Jon Elias
|
603e3e32c4
|
fix: shipped field
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 07:39:18 +01:00 |
 Jose Antonio Tubau
|
95329b7ddb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7322-addSelectAddressOnTicketTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-23 14:43:17 +01:00 |
|
Jose Antonio Tubau
|
f165d17869
|
feat: refs #7322 add addressFk parameter to transferClient method and update tests
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-23 14:26:02 +01:00 |
|
Robert Ferrús
|
0038fabcc6
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 12:00:13 +00:00 |
 Carlos Satorres
|
10a6626a65
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
|
2025-01-23 10:26:15 +01:00 |
|
Robert Ferrús
|
2124a50dc2
|
Merge branch 'dev' into 6629-addressObservationBack2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:37:03 +00:00 |
|
Robert Ferrús
|
1816ff6cf4
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:22:51 +00:00 |
|
Robert Ferrús
|
14e69c1c64
|
Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:21:32 +00:00 |
|
Jon Elias
|
602e822599
|
refactor: refs #7184 deleted .value
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 08:21:19 +01:00 |
|
Jon Elias
|
6d5a329b49
|
fix: refs #7184 fixed filter and test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-22 17:09:01 +01:00 |
|
Jon Elias
|
0eff155daf
|
refactor: refs #7184 created myteam filter and modified filters where it is used
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-22 16:34:14 +01:00 |
|
Robert Ferrús
|
5a12a01565
|
Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix into 8077-sumDefaulterBackFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-22 07:51:41 +01:00 |
|
Robert Ferrús
|
2e247c3ea5
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 14:14:27 +01:00 |
 Javier Segarra
|
dfcfd34202
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 13:42:36 +01:00 |
|
Robert Ferrús
|
3d5bfb81da
|
feat: refs #8387 regular expression all tags
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-21 13:12:03 +01:00 |
|
Robert Ferrús
|
7292ac48b2
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-21 08:48:24 +00:00 |
 Javi Gallego
|
a46ec1bc8d
|
feat: refs #8381 add agencyModeFk to thermograph and insert agencyIncoming records
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 08:13:56 +01:00 |
|
Javi Gallego
|
8e21ca5293
|
Merge branch 'dev' into 8381-thermographTravel
|
2025-01-21 07:53:38 +01:00 |
 Sergio De la torre
|
7f17cd59e7
|
Merge branch 'dev' of https: refs #7569//gitea.verdnatura.es/verdnatura/salix into 7569-sendEmailOrderTicket
|
2025-01-21 06:58:15 +01:00 |
|
Sergio De la torre
|
ef68884fe0
|
feat: refs #7569 refs#7569 sendEmailNotification
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-20 16:27:35 +01:00 |
|
Carlos Satorres
|
a98967bac1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
|
2025-01-20 12:38:46 +01:00 |
|
Sergio De la torre
|
b5e27707a7
|
feat: refs #7569 refs#7569 sendEmailNotification
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-20 12:36:31 +01:00 |
|
Sergio De la torre
|
0340612645
|
feat: refs #7569 refs#7569 sendEmailNotification
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-20 12:35:55 +01:00 |
 Guillermo Bonet
|
04180bf8da
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-20 07:52:04 +01:00 |
|
Guillermo Bonet
|
5998002420
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-20 07:51:45 +01:00 |
|
Robert Ferrús
|
ce96b0a819
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-19 07:58:16 +00:00 |
|
Robert Ferrús
|
de2f12bdb5
|
Merge branch 'dev' into 6629-addressObservationBack2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-19 07:54:37 +00:00 |
|
Robert Ferrús
|
6c2071742c
|
Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-19 07:38:25 +00:00 |
|
Javi Gallego
|
4f68a7d262
|
feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-17 15:36:11 +01:00 |
 PAU ROVIRA ROSALENY
|
1cdeadb59d
|
feat: refs #8258 added uppercase validation on supplier create
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-17 13:20:45 +01:00 |
|
Robert Ferrús
|
8b3f2572a1
|
Merge branch 'dev' into 8077-sumDefaulterBackFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-17 12:05:01 +00:00 |
|
Robert Ferrús
|
9cd8dfaf9d
|
feat: refs #8077 fix spec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-17 13:03:28 +01:00 |
|
Robert Ferrús
|
0bfd0895d7
|
feat: refs #8077 sumDefaulter
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-17 12:11:18 +01:00 |
|
Javi Gallego
|
d4b7d54052
|
Merge pull request '8298-zonePriceOptimum' (!3345) from 8298-zonePriceOptimum into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3345
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-17 08:30:44 +00:00 |
|
Robert Ferrús
|
81ab9fe0ba
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-16 09:06:42 +00:00 |
|
Robert Ferrús
|
df3f4c3d2e
|
Merge branch 'dev' into 8398-mergeSendCheckingPresenceBack
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2025-01-16 08:59:15 +00:00 |
|
Guillermo Bonet
|
4d98c340d2
|
feat: refs #7882 Added coords to create a address
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-16 09:34:18 +01:00 |
|
Javi Gallego
|
b8dbaec46c
|
Merge pull request 'test: refs #8361 enhance exchangeRateUpdate specs with additional scenarios' (!3340) from 8361-exchangeRateUpdateWithFestiveDays into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3340
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2025-01-16 08:10:09 +00:00 |
|
Robert Ferrús
|
0e8b4d92bf
|
Merge branch 'master' into hotFixDefaulterFilter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-16 06:53:00 +00:00 |
|
Robert Ferrús
|
4853e45051
|
feat: refs #8398 change merge.spec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-16 07:29:40 +01:00 |
 Carlos Andrés
|
c24b008567
|
Actualizar modules/travel/back/methods/travel/filter.js
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-15 16:34:44 +00:00 |
|
Jose Antonio Tubau
|
b78603275f
|
fix: refs #7322 reorder parameters in transferClient method for consistency
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-15 14:13:00 +01:00 |
|
Jose Antonio Tubau
|
ec14281a82
|
feat: refs #7322 add optional addressFk parameter to transferClient method
|
2025-01-15 13:37:57 +01:00 |
|
Robert Ferrús
|
6ab0515f8e
|
feat: refs #8398 sendCheckingPresence
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-15 12:31:28 +01:00 |
|
Carlos Satorres
|
024ab8602d
|
fix: refs #6553 fix back advanced summary
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-15 10:31:49 +01:00 |
|
Robert Ferrús
|
93c9ef6f4c
|
feat: refs #8387 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-15 10:25:21 +01:00 |
|
Robert Ferrús
|
620d14355c
|
Merge branch 'master' into hotFixDefaulterFilter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-15 09:12:45 +00:00 |
|
Carlos Satorres
|
6ef0d2625d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-15 08:40:16 +01:00 |
|
Robert Ferrús
|
807ddf07ad
|
feat: refs #6629 test back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-15 07:31:49 +01:00 |
|
Robert Ferrús
|
849bcd1ff5
|
feat: refs #6629 test back updateObservations
|
2025-01-14 13:39:43 +01:00 |
|
Carlos Satorres
|
d9716154bb
|
Merge branch 'master' into hotfix-7366-6943CreditBillingDataAWB
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-14 11:54:20 +00:00 |
|
Carlos Satorres
|
01072f7cbc
|
fix: hotfix 7366 6943
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2025-01-14 11:36:54 +01:00 |
 Alex Moreno
|
e273733832
|
refactor: order by id
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-14 09:33:26 +01:00 |
|
Javi Gallego
|
44765b5a64
|
feat: refs #8361 add hasToDownloadRate field to currency model and update exchange rate logic
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-14 09:07:00 +01:00 |
|
Robert Ferrús
|
277cd80f50
|
Merge branch 'dev' into 6822-entryTransfer
|
2025-01-14 07:13:52 +00:00 |
|
Robert Ferrús
|
0891fc6665
|
Merge branch 'master' into hotFixDefaulterFilter
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-14 06:31:23 +00:00 |
|
Carlos Satorres
|
07b07611be
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
|
2025-01-14 07:21:13 +01:00 |
|
Javier Segarra
|
96649f5d8a
|
feat: refs #7134 remove default value
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-13 23:13:26 +01:00 |
|
Javier Segarra
|
f0e9cce228
|
fix: refs #7134 remove unnused method
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-13 22:52:35 +01:00 |
|
Robert Ferrús
|
da3b8ac8d0
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-13 13:39:12 +00:00 |
|
Robert Ferrús
|
c4870d52de
|
feat: refs #257275 defaulterFilter
gitea/salix/pipeline/pr-master Build queued...
Details
|
2025-01-13 14:37:27 +01:00 |
|
Robert Ferrús
|
050c338ffb
|
feat: refs #8387 crudModel
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-13 14:29:13 +01:00 |
|
Carlos Satorres
|
60f0b169d4
|
fix: refs #6553 fix advanced
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 13:56:24 +01:00 |
|
Javier Segarra
|
f6c3893d00
|
feat: refs #7134 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-13 12:41:36 +01:00 |
|
Javier Segarra
|
420bb2a57e
|
perf: refs #7134 remove unnecessary code
|
2025-01-13 12:41:16 +01:00 |
|
Carlos Satorres
|
a4f9d62504
|
Merge branch '6553-workerBusiness' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 12:23:24 +01:00 |
|
Carlos Satorres
|
358f93c454
|
fix: refs #6553 fix worker back
|
2025-01-13 12:23:21 +01:00 |
|
Javier Segarra
|
f207222b47
|
Merge branch 'dev' into 7134-supplierBalance
|
2025-01-13 11:56:25 +01:00 |
|
Javi Gallego
|
c15a3bfe50
|
feat: refs #8381 add initial and final temperature fields to entry model and queries
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 11:28:30 +01:00 |
|
Alex Moreno
|
951376af2f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-13 09:19:03 +01:00 |
|
Alex Moreno
|
9d05b16404
|
fix: canBeInvoiced only in makeInvoice
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 09:18:46 +01:00 |
|
Carlos Satorres
|
978914aa71
|
Merge branch 'dev' into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 07:50:12 +00:00 |
|
Carlos Satorres
|
d547456d22
|
Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-13 07:14:59 +00:00 |
|
Jose Antonio Tubau
|
1cd7eda4ac
|
Merge pull request 'feat: refs #8117 add worker first and last name to item type query' (!3330) from 8117-filtersAndValuesReviewed into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3330
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-13 06:13:31 +00:00 |
|
Robert Ferrús
|
95e7757574
|
Merge branch 'dev' of https: refs #6629//gitea.verdnatura.es/verdnatura/salix into 6629-addressObservationBack2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-10 11:26:47 +01:00 |
|
Guillermo Bonet
|
886383b82d
|
Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-10 10:01:40 +01:00 |
|
Sergio De la torre
|
a1e1d4fa72
|
fix: refs #7569 refs·6861 ticketOrderReserve
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-10 07:20:24 +01:00 |
|
Carlos Satorres
|
6d661dba85
|
Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-10 05:36:23 +00:00 |
|
Sergio De la torre
|
12fa87a93c
|
fix: refs #7569 refs·6861 ticketOrderReserve
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-09 16:15:29 +01:00 |
|
Guillermo Bonet
|
2f0a79da3f
|
Merge branch 'test' into dev
|
2025-01-09 11:34:53 +01:00 |
|
Guillermo Bonet
|
1787cd3102
|
Merge branch 'master' into test
|
2025-01-09 11:34:41 +01:00 |
|
Carlos Satorres
|
c8d57a1efa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-09 09:59:25 +01:00 |
 Jorge Penadés
|
50a95ed3c4
|
fix: correct variable name in canModifyAbsenceInPast method
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2025-01-08 18:30:33 +01:00 |
|
Jorge Penadés
|
b12c3bb72f
|
fix: enable tests for createAbsence and deleteAbsence methods
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-08 18:28:00 +01:00 |
|
Jorge Penadés
|
412638d590
|
fix: refactor access control for modifying past absences
|
2025-01-08 18:27:23 +01:00 |
|
Jorge Penadés
|
838617e3f6
|
fix: update access control for modifying absences in the past
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-08 15:47:53 +01:00 |
|
Jorge Penadés
|
f557b41feb
|
fix: tests
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-08 13:52:50 +01:00 |
|
Javi Gallego
|
53c604762a
|
Merge branch 'dev' into 8298-zonePriceOptimum
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 13:43:17 +01:00 |
 Ivan Mas
|
14b88b1ad6
|
Merge branch 'dev' into 7343-modifyDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 12:16:01 +00:00 |
|
Jorge Penadés
|
c07e30a89c
|
fix: prevent deleting absences for past dates
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2025-01-08 12:48:28 +01:00 |
|
Alex Moreno
|
60933216f7
|
fix: hotFix getMondayWeekYear
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-08 11:42:32 +01:00 |
|
Alex Moreno
|
ecc877e07d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-08 11:35:30 +01:00 |
|
Alex Moreno
|
9842f70bec
|
fix: hotFix getMondayWeekYear
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-08 11:25:07 +01:00 |
|
Javi Gallego
|
1816b6de67
|
feat: refs #8298 add priceOptimum and packagesDiscountFactor to zone and client tables
|
2025-01-08 10:24:18 +01:00 |
|
Alex Moreno
|
c0c75c1bee
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2025-01-08 09:41:31 +01:00 |
|
Alex Moreno
|
5ab06ef6e4
|
fix: hotFix getStartDateOfWeekNumber
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-08 09:39:55 +01:00 |
|
Robert Ferrús
|
115756aaf3
|
feat: refs #6822 fix transfer test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-08 07:44:49 +01:00 |
|
Ivan Mas
|
0940a31288
|
Merge branch 'dev' into 7343-modifyDriverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-07 16:47:43 +00:00 |
|
Javi Gallego
|
dbd8d816c0
|
fix: refs #8361 streamline transaction handling in exchangeRateUpdate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-07 14:53:26 +01:00 |