 Jorge Penadés
|
2f364ebc76
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 16:40:37 +01:00 |
 Javier Segarra
|
efe0aa708f
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 15:13:49 +00:00 |
|
Jorge Penadés
|
a463a8f4d8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-29 14:49:07 +01:00 |
 Robert Ferrús
|
f87fa37a79
|
Merge branch 'dev' into 8077-sumDefaulterRedirectionLilium
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 12:44:42 +00:00 |
|
Robert Ferrús
|
35e72c90d3
|
Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 11:46:23 +00:00 |
 Jose Antonio Tubau
|
ad29b26553
|
refactor: refs #7414 update Spanish translation for 'total' to 'importe'
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 12:43:03 +01:00 |
|
Javier Segarra
|
ac053814e6
|
test: refs #6321 fixing test
|
2025-01-29 12:26:42 +01:00 |
 Jon Elias
|
17b4089b51
|
Merge pull request 'Fix[WorkerFilter]: Fixed filter' (!3394) from Fix-WorkerFilterLimit into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3394
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
|
2025-01-29 11:03:14 +00:00 |
|
Jorge Penadés
|
2b443266b2
|
Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-29 11:51:21 +01:00 |
|
Jon Elias
|
1d53f2c490
|
fix: worker filter limit
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 11:43:15 +01:00 |
|
Jon Elias
|
f088f1776f
|
fix: fixed manual invoice
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-29 10:45:29 +01:00 |
 Guillermo Bonet
|
56b0baebaa
|
feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-29 07:53:41 +01:00 |
|
Javier Segarra
|
a93e8b28db
|
fix: refs #6321 getSimilar
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-28 23:37:56 +01:00 |
|
Robert Ferrús
|
a6a875cb2c
|
feat: refs #8077 redirection lilium
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 13:27:35 +01:00 |
 Carlos Satorres
|
b383725f9f
|
fix: refs #7917 fix user tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 12:56:30 +01:00 |
|
Carlos Satorres
|
bb08ad7d1a
|
Merge branch '7917-freelancerRoute2' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-28 12:51:24 +01:00 |
|
Carlos Satorres
|
a01c419b44
|
fix: refs #7917 fix tback
|
2025-01-28 12:51:21 +01:00 |
|
Carlos Satorres
|
3c16914135
|
Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-28 11:43:25 +00:00 |
|
Jorge Penadés
|
051c6ffcbc
|
refactor(vehicle filter): refs #7119 simplify search condition to use logical OR for ID and number plate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 12:23:24 +01:00 |
|
Carlos Satorres
|
b14beb83f4
|
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-28 11:55:27 +01:00 |
|
Jorge Penadés
|
2eabfaaa8f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 11:44:59 +01:00 |
|
Robert Ferrús
|
8482743baf
|
feat: refs #6822 ACL
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 11:26:48 +01:00 |
 Sergio De la torre
|
1575c509d1
|
fix: refs #7569 saveSign use lastState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-28 11:19:45 +01:00 |
|
Sergio De la torre
|
3f0f155113
|
fix: refs #7569 saveSign use lastState
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-28 11:15:29 +01:00 |
|
Sergio De la torre
|
79ea19a360
|
fix: refs #7569 saveSign use lastState
|
2025-01-28 11:14:08 +01:00 |
|
Sergio De la torre
|
a29de13ab3
|
fix: refs #7569 saveSign use smtp.send and fix link
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-28 09:54:26 +01:00 |
 Javi Gallego
|
08d2414363
|
refactor: refs #7686 update editableStates tests to check for 'OK' and 'Bloqueado' states
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-28 09:16:19 +01:00 |
|
Javier Segarra
|
9419eada64
|
Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2025-01-28 08:46:17 +01:00 |
|
Javier Segarra
|
10eef6d1b6
|
feat: refs #6321 updates
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-28 08:45:00 +01:00 |
|
Javi Gallego
|
0def25ad15
|
Merge branch 'dev' into 7686-onPrevious
|
2025-01-28 08:28:16 +01:00 |
|
Javier Segarra
|
198ae9a83b
|
Merge branch 'master' into Hotfix-PriceDifferenceShipped
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-28 07:19:37 +00:00 |
 Alex Moreno
|
d75d4f82f2
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2025-01-28 08:16:59 +01:00 |
|
Jon Elias
|
e85b68650d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into Fix-TicketSummaryAddress
|
2025-01-28 07:33:03 +01:00 |
|
Javi Gallego
|
1261722943
|
Merge pull request 'feat: refs #8381 add agencyModeFk to travel thermograph and create AgencyModeIncoming model' (!3369) from 8381-thermographTravel into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3369
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-01-27 15:12:51 +00:00 |
|
Javi Gallego
|
857874c4c6
|
refactor: refs #7686 remove obsolete alert level updates and adjust state alert level logic
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 15:43:26 +01:00 |
|
Javier Segarra
|
b003dff045
|
fix: new params
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-01-27 13:30:29 +00:00 |
|
Javier Segarra
|
72a1c2ca57
|
fix: some params
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2025-01-27 12:57:58 +00:00 |
|
Javier Segarra
|
1a0992da78
|
feat: refs #6321 changes
|
2025-01-27 12:04:18 +01:00 |
|
Robert Ferrús
|
5a449c66ce
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 10:26:48 +00:00 |
|
Carlos Satorres
|
06cd177d31
|
Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 10:23:57 +00:00 |
|
Robert Ferrús
|
6f8cbc1017
|
Merge branch 'dev' into 6822-entryTransfer
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 08:51:03 +00:00 |
|
Carlos Satorres
|
62f26ec8c8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7917-freelancerRoute2
|
2025-01-27 09:24:38 +01:00 |
|
Robert Ferrús
|
d10670cb37
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 08:05:26 +00:00 |
|
Robert Ferrús
|
1f6779d86b
|
feat: refs #8387 change request
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 08:59:33 +01:00 |
|
Jose Antonio Tubau
|
29af7cfcbc
|
test: refs #7322 added test error for case when expected error is not thrown
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 08:23:30 +01:00 |
|
Robert Ferrús
|
46a22733e2
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 07:10:54 +00:00 |
|
Jose Antonio Tubau
|
4fd58e24c5
|
Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-27 07:07:28 +00:00 |
|
Robert Ferrús
|
ad87631092
|
Merge branch 'dev' into 6629-addressObservationBack2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 06:33:42 +00:00 |
|
Robert Ferrús
|
b9206c44bb
|
Merge branch 'dev' into 8387-itemTagCrudModel
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-27 06:17:49 +00:00 |
|
Javier Segarra
|
bd54eacda1
|
feat: refs #6321 alternative alertLevel
|
2025-01-26 02:36:39 +01:00 |
|
Javier Segarra
|
36192c14ec
|
Merge branch 'dev' into 6321_negative_tickets
|
2025-01-25 09:10:45 +01:00 |
|
Jorge Penadés
|
fb653c1eca
|
fix: refs #7119 rollback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 16:42:10 +01:00 |
|
Jorge Penadés
|
ec7bbd13b1
|
refactor: refs #7119 update vehicle filter logic and improve test cases
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 16:37:35 +01:00 |
|
Jorge Penadés
|
2346205072
|
Merge branch 'dev' of https: refs #7119//gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-24 16:14:09 +01:00 |
|
Jon Elias
|
034df6e8ea
|
feat: added nickname in address
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-24 13:48:35 +01:00 |
|
Robert Ferrús
|
163302c770
|
feat: refs #6822 fix test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 13:26:36 +01:00 |
|
Robert Ferrús
|
2ee5ba908a
|
feat: refs #6822 change request
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-24 13:16:36 +01:00 |
|
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 |
|
Jorge Penadés
|
3fba81b41e
|
feat: refs #7119 add 'id' filter option and enhance bank policy model with dmsFk field
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 10:46:35 +01:00 |
|
Jorge Penadés
|
f8e4561a59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-24 09:37:10 +01:00 |
|
Jon Elias
|
6da004e7cf
|
fix: fixed shipped date when it is null
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2025-01-24 09:29:58 +01: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 |
|
Jorge Penadés
|
3a449896cd
|
feat: refs #7119 update vehicle permissions and enhance vehicle model with new fields
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 18:02:53 +01:00 |
|
Jose Antonio Tubau
|
e22a472e97
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8304-workerChangesAndFixes
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-23 15:06:03 +01:00 |
|
Javier Segarra
|
c3361fd49b
|
Merge branch 'dev' into 6321_negative_tickets
|
2025-01-23 14:48:28 +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 |
|
Jorge Penadés
|
3ea67675da
|
feat: refs #7119 add VehicleType model and update vehicle permissions for delivery roles
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 10:53:53 +01: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 |
|
Jorge Penadés
|
0440582e2b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-23 10:09:47 +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 |
|
Jose Antonio Tubau
|
e05f740c3d
|
Merge branch 'dev' into 8304-workerChangesAndFixes
|
2025-01-22 16:17:35 +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 |
|
Javier Segarra
|
2a4bad5034
|
Merge branch 'dev' into 6321_negative_tickets
|
2025-01-21 23:43:07 +01:00 |
|
Jose Antonio Tubau
|
7f5224ebca
|
feat: refs #8304 add ACL entries for Business and Worker models and update worker model relationships
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-21 14:45:13 +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 |
|
Jose Antonio Tubau
|
b20dee8382
|
feat: refs #8304 add notes field to business model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 12:28:34 +01:00 |
|
Jorge Penadés
|
e343e457ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-21 10:48:08 +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 |
|
Jorge Penadés
|
3d2a7cfb66
|
feat: refs #7119 update ACLs for vehicle management and refine vehicle filter logic
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-20 18:05:33 +01:00 |
|
Jorge Penadés
|
946d08e543
|
feat: refs #7119 update ACLs and remove unused models for vehicle management
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2025-01-20 17:29:18 +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 |
|
Javier Segarra
|
1560c48af2
|
feat: refs #6321 improve query
|
2025-01-20 14:32:26 +01:00 |
|
Jorge Penadés
|
ecedc84164
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-createVehicle
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2025-01-20 14:28:30 +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 |