 Carlos Andrés
|
326c5c97bd
|
Hotfix test farmingDeliveryNote
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-04-25 19:02:05 +02:00 |
 Pablo Natek
|
5c45dd6c17
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-25 16:18:18 +02:00 |
 Jorge Penadés
|
f7cdbd39f0
|
fix: refs #7211 tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 16:08:52 +02:00 |
|
Jorge Penadés
|
edeed037a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7211-fixWorkerTimeControl
|
2024-04-25 15:38:40 +02:00 |
 Javi Gallego
|
2e2bc3d594
|
Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:31:06 +00:00 |
|
Javi Gallego
|
4f20224acc
|
Merge branch '6382-regularizar-Shelving-Parking' of https://gitea.verdnatura.es/verdnatura/salix into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 14:28:53 +02:00 |
|
Javi Gallego
|
7d3870e4a1
|
feat: refs#6382 test fixed
|
2024-04-25 14:28:47 +02:00 |
 Javier Casado
|
a9e4b2cd36
|
Merge branch 'dev' into 6697-removeClaimQuantity
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 11:46:53 +00:00 |
|
Javi Gallego
|
a4f1183df6
|
feat: refs #7108 pascalCase
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 13:11:57 +02:00 |
|
Pablo Natek
|
4e11e46fff
|
feat: refs #4988 capture error on duplicate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:40:54 +02:00 |
|
Pablo Natek
|
c5b02dc239
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-25 09:46:53 +02:00 |
|
Pablo Natek
|
42591af5c7
|
fix: refs #4988 create table
|
2024-04-25 09:46:15 +02:00 |
|
Javi Gallego
|
1b34822fb7
|
Merge branch 'dev' into 6382-regularizar-Shelving-Parking
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 07:13:57 +00:00 |
|
Jorge Penadés
|
88b06ebef5
|
feat: refs #7211 check if there's available clockIn
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-25 08:49:22 +02:00 |
 Sergio De la torre
|
d4d31c6d9e
|
refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-25 08:35:59 +02:00 |
|
Sergio De la torre
|
46f2d790db
|
refs #6312 hotFix fix:replaceItem
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-25 08:01:32 +02:00 |
 Guillermo Bonet
|
60a3ec99d0
|
Merge branch 'dev' into 7258-lastChangesMigrationVn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 05:02:17 +00:00 |
|
Sergio De la torre
|
8bb2fa93a7
|
Merge branch 'dev' into 6574_itemGetBalance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 13:46:53 +00:00 |
 Alex Moreno
|
917592cdad
|
Merge pull request '7225-hotFix_ticket_advanced_movable a dev para probar' (!2366) from 7225-hotFix_ticket_advanced_movable into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2366
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-24 12:34:46 +00:00 |
jcasado
|
aeee012c2b
|
refs #6697 fix sql test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 11:43:10 +02:00 |
|
Alex Moreno
|
2638b93299
|
Merge branch '7225-hotFix_ticket_advanced_movable' of https://gitea.verdnatura.es/verdnatura/salix into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-24 11:40:25 +02:00 |
|
Alex Moreno
|
eced03f69b
|
fix(ticket_getMovable): refs #7225 stock add ifnull
|
2024-04-24 11:40:24 +02:00 |
|
Guillermo Bonet
|
6fb87531c4
|
refactor: #7258 Deprecated last tables vn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 11:27:16 +02:00 |
|
Guillermo Bonet
|
71e1e53ccd
|
refactor: #7258 Fixes
|
2024-04-24 10:57:35 +02:00 |
|
Alex Moreno
|
2e1ad0c000
|
Merge branch 'master' into 7225-hotFix_ticket_advanced_movable
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-24 08:42:26 +00:00 |
 Jon Elias
|
6706974784
|
fix: refs #6731 fix ticketRequest
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 10:31:26 +02:00 |
|
Guillermo Bonet
|
f7ebd071bf
|
refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 09:53:31 +02:00 |
|
Javi Gallego
|
73f7d09b0e
|
feat: #7108 acl a invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 08:14:07 +02:00 |
 Robert Ferrús
|
ec7dc390b9
|
Merge branch 'dev' into 6223-ticketCalculateClon
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-24 06:05:03 +00:00 |
|
Robert Ferrús
|
e36e997844
|
feat: refs #6223 ticketCalculateClon
|
2024-04-24 08:04:28 +02:00 |
|
Javi Gallego
|
dcc46494bc
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 07:45:02 +02:00 |
|
Guillermo Bonet
|
a6c57ef3df
|
Merge branch 'dev' into 6997-eypbc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 05:09:44 +00:00 |
 Juanjo Breso
|
be8e55a905
|
Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 05:03:19 +00:00 |
|
Carlos Andrés
|
26fd1ae6c9
|
Merge pull request 'test' (!2359) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2359
|
2024-04-23 15:53:13 +00:00 |
|
Carlos Andrés
|
a7f1188975
|
Merge pull request 'master' (!2358) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2358
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
|
2024-04-23 15:35:33 +00:00 |
|
Carlos Andrés
|
033bcf6b67
|
hotfix importErrorNotification refs #6189
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-23 17:24:47 +02:00 |
|
Alex Moreno
|
cc06698214
|
hotFix(ticket): refs #7225 fix advanced and movable
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-23 15:37:04 +02:00 |
|
Juanjo Breso
|
9c306d4cc2
|
Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 12:55:02 +00:00 |
|
Juanjo Breso
|
5efb6acafe
|
feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 14:55:05 +02:00 |
|
Guillermo Bonet
|
e0393a6e72
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-23 14:43:19 +02:00 |
|
Guillermo Bonet
|
f5844ff426
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-23 14:42:57 +02:00 |
|
Guillermo Bonet
|
ec23cc7619
|
hotfix: entry_checkBooked
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-23 14:41:43 +02:00 |
|
Juanjo Breso
|
022264ffff
|
Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 14:05:51 +02:00 |
|
Juanjo Breso
|
d1c72a0be3
|
feat: refs#6493 Cambios solicitados procedimientos
|
2024-04-23 14:05:48 +02:00 |
|
Juanjo Breso
|
9b2bb4be0e
|
Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 12:04:19 +00:00 |
|
Guillermo Bonet
|
afe2669b27
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 13:57:42 +02:00 |
|
Guillermo Bonet
|
36c8a8db0f
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-23 13:57:18 +02:00 |
|
Guillermo Bonet
|
1d5d6141d1
|
Merge branch 'dev' into 6997-eypbc
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-23 11:17:29 +00:00 |
 Ivan Mas
|
e7055e2428
|
Merge branch 'dev' into 7032-Delete-vn.recipeCook
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 10:26:42 +00:00 |
|
Juanjo Breso
|
79172ef288
|
Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 10:16:27 +00:00 |
|
Carlos Andrés
|
2d5daf55c2
|
Merge pull request 'feat: Varias líneas farming en albaranes refs #7020' (!2349) from 7020-Varias-líneas-farming-en-albaranes into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2349
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-23 10:04:08 +00:00 |
|
Guillermo Bonet
|
1044a24bc7
|
refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 12:00:23 +02:00 |
|
Guillermo Bonet
|
8dd4ac9119
|
hotfix: Throw msg and entry_updateComission start transaction
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-23 11:50:48 +02:00 |
|
Alex Moreno
|
85491613b0
|
test: refs #7173 fix fixtures
|
2024-04-23 08:47:28 +02:00 |
|
Juanjo Breso
|
d7e4dd4fc7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 08:03:17 +02:00 |
|
Javi Gallego
|
eaf2762922
|
feat: #6382 chekCodeFormat
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-23 07:57:37 +02:00 |
 Juan Ferrer
|
d58607f26e
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 19:43:48 +00:00 |
|
Carlos Andrés
|
8bb331f0ed
|
feat: Varias líneas farming en albaranes refs #7020
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 19:57:17 +02:00 |
|
Ivan Mas
|
9899efab97
|
refs #7032 Delete vn.recipe_Cook
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 17:55:49 +02:00 |
|
Pablo Natek
|
adc3b413f5
|
feat: refs #4988 agency add module
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-22 17:17:17 +02:00 |
|
Ivan Mas
|
f03a431ea2
|
Merge branch 'dev' into 7191-entry_BeforeUpdate-isBooked
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 13:08:06 +00:00 |
|
Ivan Mas
|
0284b138d7
|
refs #7191 requested modifications
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 15:03:08 +02:00 |
|
Robert Ferrús
|
44f2cd4efc
|
feat: refs #7247 clientSupplier_add
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 14:04:07 +02:00 |
|
Ivan Mas
|
f380e0d1ce
|
Merge branch 'dev' into 7021-Delete_rfid_schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 11:17:54 +00:00 |
|
Guillermo Bonet
|
eb9f81c81d
|
feat #7181 Rollback creditInsurance_getRisk
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-22 13:05:16 +02:00 |
|
Ivan Mas
|
1ef98ecd8c
|
Merge branch 'dev' into 7021-Delete_rfid_schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 10:37:15 +00:00 |
|
Sergio De la torre
|
0f05fe5d93
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 10:32:03 +00:00 |
|
Robert Ferrús
|
debd163b3f
|
Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 10:16:01 +00:00 |
|
Robert Ferrús
|
6bb36e0d82
|
Merge branch 'dev' into 7029-packagingVolumeRestriction
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 09:53:51 +00:00 |
|
Javi Gallego
|
4416790ce1
|
Merge branch 'dev' into 7108-exchange-rate
|
2024-04-22 11:45:02 +02:00 |
|
Robert Ferrús
|
b0289d2e18
|
Merge pull request 'test' (!2344) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2344
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-04-22 09:34:45 +00:00 |
|
Robert Ferrús
|
b88dff0d99
|
feat: refs #6777
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 10:48:37 +02:00 |
|
Sergio De la torre
|
23fa74a5ad
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 08:11:37 +00:00 |
|
Robert Ferrús
|
e8d7f20221
|
Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-22 07:43:39 +00:00 |
|
Robert Ferrús
|
a1a3470df4
|
feat: refs #174903
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-22 09:43:13 +02:00 |
|
Robert Ferrús
|
6a0a944319
|
Merge branch 'dev' into 7029-packagingVolumeRestriction
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 07:23:18 +00:00 |
|
Juan Ferrer
|
739ae82ace
|
fix(binlog): refs #4409 Fix cursor name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 09:02:43 +02:00 |
|
Juan Ferrer
|
bc45cafb40
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-22 08:54:14 +02:00 |
|
Robert Ferrús
|
e09b828d88
|
Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 05:49:53 +00:00 |
|
Sergio De la torre
|
081c97828c
|
Merge branch 'master' into hotFix_Ubicador
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-22 05:08:59 +00:00 |
|
Carlos Andrés
|
fd903f27c0
|
fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-21 16:01:32 +02:00 |
|
Guillermo Bonet
|
e7f81e99bc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-19 14:40:26 +02:00 |
|
Juan Ferrer
|
a0126748e2
|
fix(binlog): refs #4409 Fix fixtures cursor name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 14:19:34 +02:00 |
|
Guillermo Bonet
|
65892625d5
|
feat: #7231 Collection_assing more time and throw
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-19 14:17:49 +02:00 |
|
Ivan Mas
|
ad317cb5e5
|
refs #7021 Delete rfid schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 14:11:35 +02:00 |
|
Carlos Andrés
|
e0cd08b280
|
fix: hotfix importar A3 Ticket 175840
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-19 14:10:11 +02:00 |
|
Sergio De la torre
|
e6258dc9e5
|
refs #6413 hotFix fix:ubicadorChecking
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-19 13:03:57 +02:00 |
|
Robert Ferrús
|
5b027a88fa
|
feat: refs #6777 restore view
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-19 11:33:33 +02:00 |
|
Robert Ferrús
|
e601310d3e
|
feat: refs #6777 restore view
|
2024-04-19 11:27:54 +02:00 |
|
Robert Ferrús
|
28c08d8b18
|
feat: refs #7237 company_getSuppliersDebt
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-19 10:58:19 +02:00 |
|
Robert Ferrús
|
fb17a54ebd
|
feat: refs #6777 resotre view
|
2024-04-19 10:53:03 +02:00 |
|
Robert Ferrús
|
c375223ae5
|
Merge branch 'dev' into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-19 05:23:23 +00:00 |
|
Carlos Andrés
|
27d59f4a8f
|
fix: descuentos en bs.ventas refs #6974
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-18 19:12:24 +02:00 |
|
Sergio De la torre
|
f4afda8cb2
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 14:52:57 +00:00 |
|
Ivan Mas
|
7e488ee601
|
refs #7191 check isBooked in entry_BeforeUpdate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-18 16:09:05 +02:00 |
|
Robert Ferrús
|
f269d41596
|
Merge branch 'master' into 174903-item_getSimilar
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-04-18 12:52:52 +00:00 |
|
Guillermo Bonet
|
bb8379f8db
|
refactor: refs #6724 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 14:42:29 +02:00 |
|
Robert Ferrús
|
4f7d315719
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6777-changeDependenciesVn2008toVnPart7
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 14:07:23 +02:00 |
|
Guillermo Bonet
|
8f9adbb37c
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 13:55:22 +02:00 |
|
Guillermo Bonet
|
5c5d0ec9dc
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 13:52:31 +02:00 |
|
Guillermo Bonet
|
d5dc057c36
|
hotfix: changes
|
2024-04-18 13:52:30 +02:00 |
|
Sergio De la torre
|
279c300fbf
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 11:08:15 +00:00 |
|
Guillermo Bonet
|
2b11f85b67
|
Merge pull request 'feat: refs #6724 permissions to vn.entry.isBooked' (!2147) from 6724-permisos-vn.entry.isBooked into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-18 11:06:47 +00:00 |
|
Robert Ferrús
|
9295bddaa8
|
feat: refs #174903 item_getSimilar
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-18 13:06:45 +02:00 |
|
Carlos Andrés
|
0ebdd032e5
|
Merge pull request 'testToMaster fix' (!2325) from test into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2325
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-04-18 10:39:19 +00:00 |
|
Guillermo Bonet
|
d6ec84e1fe
|
hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 12:07:00 +02:00 |
|
Sergio De la torre
|
958759dc80
|
Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 08:12:46 +00:00 |
|
Alex Moreno
|
9143447eb8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 09:27:46 +02:00 |
|
Alex Moreno
|
51d09b4f2a
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-18 09:27:15 +02:00 |
|
Alex Moreno
|
659adfd87d
|
deploy: refs #7226 dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-18 09:20:47 +02:00 |
|
Alex Moreno
|
7a021c9ac6
|
fix(payrollCenter): refs #6738
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-18 09:13:15 +02:00 |
|
Pablo Natek
|
77f7348acb
|
feat(workcenter): refs #4988 add workcenter config menu
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 09:02:01 +02:00 |
|
Sergio De la torre
|
76fb9bf7a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-18 07:12:43 +02:00 |
|
Pablo Natek
|
eee7062e3f
|
Merge pull request 'test' (!2319) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2319
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-04-18 05:05:40 +00:00 |
|
Jorge Penadés
|
b83e0a4ae2
|
fix: refs #6492 castToInt
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-04-17 16:43:17 +02:00 |
|
Pablo Natek
|
07f95f3f6c
|
Merge pull request 'master' (!2318) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-master This commit looks good
Details
Reviewed-on: #2318
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-04-17 13:25:56 +00:00 |
|
Sergio De la torre
|
3f291da02c
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:57:56 +02:00 |
|
Sergio De la torre
|
32e2827287
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:55:07 +02:00 |
|
Robert Ferrús
|
edc6e4a5e3
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 11:30:45 +00:00 |
|
Sergio De la torre
|
a3c8532661
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:27:00 +02:00 |
|
Juan Ferrer
|
7cda14c424
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 13:24:32 +02:00 |
|
Juan Ferrer
|
ae326e6e2e
|
feat(binlog): refs #4409 Old recalc code removed
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Queues: orderTotal, ticketTotal and travelEntries
|
2024-04-17 13:21:27 +02:00 |
|
Robert Ferrús
|
e769081a74
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 13:11:28 +02:00 |
|
Pablo Natek
|
d93dc28728
|
fix(view): refs #6372 fix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-17 12:32:33 +02:00 |
|
Robert Ferrús
|
998466f6eb
|
Merge pull request 'test' (!2316) from test into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2316
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-04-17 10:28:45 +00:00 |
|
Guillermo Bonet
|
0d50f5b405
|
Merge pull request 'master' (!2315) from master into test
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2315
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-04-17 10:20:20 +00:00 |
|
Robert Ferrús
|
3e5b6a9ad1
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 09:01:39 +00:00 |
|
Robert Ferrús
|
8ca278b5a9
|
feat: refs #6500 cambios solicitados
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 11:00:00 +02:00 |
|
Guillermo Bonet
|
cffc1964b6
|
feat: refs #6968 Transactioned and isTriggerDisabled
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-17 10:26:21 +02:00 |
|
Robert Ferrús
|
0a4cd4d4d0
|
feat: company_getSuppliersDebtHotFix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-17 09:58:27 +02:00 |
|
Guillermo Bonet
|
9f9662924d
|
Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-17 06:48:43 +00:00 |
|
Robert Ferrús
|
a0f3c6183b
|
Merge branch 'test' into 7219-sale_replaceItem
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-04-17 06:42:18 +00:00 |
|
Guillermo Bonet
|
f1bb2fbcb3
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-17 08:41:33 +02:00 |
|
Guillermo Bonet
|
7d50907676
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-17 08:41:10 +02:00 |
|
Guillermo Bonet
|
786a5a68b9
|
hotfix: EKT
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-17 08:40:25 +02:00 |
|
Sergio De la torre
|
ae88a8a281
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 07:44:08 +02:00 |
|
Juanjo Breso
|
3950d60387
|
feat: refs#6493 Cambios solicitados procedimientos
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 07:37:58 +02:00 |
|
Juanjo Breso
|
97c0db62ac
|
Merge branch '6493-refactorizar-procedimientos-vn2008-parte_2' of https://gitea.verdnatura.es/verdnatura/salix into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 07:33:11 +02:00 |
|
Juanjo Breso
|
187c918a21
|
feat: refs#6493 Cambios solicitados procedimientos
|
2024-04-17 07:33:08 +02:00 |
|
Juanjo Breso
|
81b2e89fd8
|
Merge branch 'dev' into 6493-refactorizar-procedimientos-vn2008-parte_2
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 05:30:39 +00:00 |
|
Guillermo Bonet
|
36bf770ed4
|
Merge pull request 'feat: refs #7173 Bloquear facturas recibidas contabilizadas' (!2258) from 7173-Restricción-eliminar/modificar-vn.invoiceIn into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2258
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-17 05:17:36 +00:00 |
|
Guillermo Bonet
|
d92d373db4
|
Merge branch 'dev' into 6968-groupingModeRefactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 05:15:37 +00:00 |
|
Guillermo Bonet
|
c8e7706652
|
feat: refs #6968 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 07:15:24 +02:00 |
|
Pablo Natek
|
e15fb8dec6
|
fix: refs #6021 proc
|
2024-04-16 18:00:15 +02:00 |
|
Pablo Natek
|
70c9bae710
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6021-fix-item_get
|
2024-04-16 17:58:04 +02:00 |
|
Pablo Natek
|
dac562e960
|
Merge pull request 'feat: refs #6021 order_put refactor' (!2311) from 6021-fix-orderPut into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #2311
Reviewed-by: Pako Natek <pako@verdnatura.es>
|
2024-04-16 15:54:19 +00:00 |
|
Pablo Natek
|
1d29c77aa7
|
feat: refs #6021 fix proc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 17:53:21 +02:00 |
|
Pablo Natek
|
70836b93b6
|
fix: refs #6021 catalogue_findById
|
2024-04-16 17:51:34 +02:00 |
 Pako Natek
|
12f7cc85ed
|
Merge branch 'dev' into 6021-floranet_item_get
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 15:45:41 +00:00 |
|
Pako Natek
|
c1c6204eab
|
Merge branch 'dev' into 6021-fix-orderPut
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 15:44:02 +00:00 |
|
Pablo Natek
|
f05b33787f
|
feat: refs #6021 order_put refactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 17:42:36 +02:00 |
|
Guillermo Bonet
|
e4c3704231
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 17:25:49 +02:00 |
|
Guillermo Bonet
|
62596de1dd
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 17:25:28 +02:00 |
|
Guillermo Bonet
|
db5b0d7967
|
hotfix: ticket#174761 Greatest fix null possibility
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 17:19:25 +02:00 |
|
Pako Natek
|
f5fd708891
|
item_get
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 17:08:45 +02:00 |
|
Pablo Natek
|
d0dfdc668b
|
feat(agency): refs #4988 add new agency
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 16:25:27 +02:00 |
|
Ivan Mas
|
3a7b0df36f
|
Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 11:29:03 +00:00 |
|
Robert Ferrús
|
01d959f6f4
|
feat: refs #7219
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-04-16 12:46:50 +02:00 |
|
Guillermo Bonet
|
56dc0ddb68
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 12:32:53 +02:00 |
|
Guillermo Bonet
|
9ea1ac2a56
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 12:32:27 +02:00 |
|
Guillermo Bonet
|
7fda58d4a4
|
hotfix: ticket#174308 Ekt load packing
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-16 12:29:44 +02:00 |
|
Guillermo Bonet
|
7a557be09a
|
feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 11:07:57 +02:00 |
|
Robert Ferrús
|
ffd7b3cf50
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 08:39:08 +00:00 |
|
Javi Gallego
|
58baa45e09
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 09:47:21 +02:00 |
|
Guillermo Bonet
|
4678c0567b
|
Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 08:58:27 +02:00 |
|
Guillermo Bonet
|
45fac06c6b
|
feat: refs #7173 Added restrictions in invoiceIn structure
|
2024-04-16 08:58:26 +02:00 |
|
Guillermo Bonet
|
d88957d157
|
Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 06:45:04 +00:00 |
|
Guillermo Bonet
|
91d5f51e73
|
Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 08:44:51 +02:00 |
|
Guillermo Bonet
|
93abfdd8a1
|
feat: refs #7173 Added restrictions in invoiceIn structure
|
2024-04-16 08:44:50 +02:00 |
|
Guillermo Bonet
|
0c24e67af1
|
Merge branch 'dev' into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 05:42:59 +00:00 |
|
Pablo Natek
|
0418540ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 07:39:13 +02:00 |
|
Pablo Natek
|
336c3274ea
|
feat(agency): refs #4988 add summary
|
2024-04-16 07:38:48 +02:00 |
|
Ivan Mas
|
5bb3dccd19
|
Merge branch 'dev' into 7161DeleteitemTrash
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 14:03:42 +00:00 |
|
Ivan Mas
|
6e183b7426
|
refs #7161 change vAddress to vAddressShortage
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 15:59:05 +02:00 |
|
Guillermo Bonet
|
0f26fb46b6
|
feat: refs #6724 Grant changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 13:16:36 +02:00 |
|
Guillermo Bonet
|
78bd561122
|
Merge branch 'dev' into 6724-permisos-vn.entry.isBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-15 11:11:55 +00:00 |
|
Sergio De la torre
|
4cb79956a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6921_addFromDelivery
|
2024-04-15 13:03:47 +02:00 |
|
Robert Ferrús
|
a41aa46c3a
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 09:35:52 +00:00 |
|
Juan Ferrer
|
42fe7fb1e2
|
feat(binlog): refs #4409 Disable order recalc from triggers
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-15 11:32:44 +02:00 |
|
Jorge Penadés
|
200cbd8d74
|
fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 11:03:57 +02:00 |
|
Jorge Penadés
|
0219fa105e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6938-hideWorkerPhone
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:22:44 +02:00 |
|
Juan Ferrer
|
133d45eecf
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:22:04 +02:00 |
|
Jorge Penadés
|
a68b8431c5
|
feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:21:59 +02:00 |
|
Juan Ferrer
|
31e27f1926
|
Merge branch '4409-binlogQueueFn' of https://gitea.verdnatura.es/verdnatura/salix into 4409-binlogQueueFn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:18:07 +02:00 |
|
Juan Ferrer
|
5414aaa1b4
|
fix(binlog): refs #4409 Fixtures for binlogQueue
|
2024-04-15 10:18:06 +02:00 |
|
Juan Ferrer
|
ba9e1d9233
|
Merge branch 'dev' into 4409-binlogQueueFn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 08:16:56 +00:00 |
|
jcasado
|
dc8a6d1274
|
Merge branch 'dev' into 6641-checkboxMyTeam
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:11:36 +02:00 |
|
Juan Ferrer
|
50d6c234be
|
feat(binlog): refs #4409 New function for binlog queue monitoring
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 09:31:24 +02:00 |
|
Robert Ferrús
|
36b3a92ca3
|
Merge branch 'dev' into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 05:18:54 +00:00 |
|
Robert Ferrús
|
f30f907d8e
|
feat: refs #6500 cambios solicitados
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 12:13:07 +02:00 |
|
Javi Gallego
|
bb6ea31bf7
|
feat: funcional a falta de test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 10:26:32 +02:00 |
|
Pablo Natek
|
0d03cf76b4
|
fix(sql): refs #6005 fix fk formation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 10:17:04 +02:00 |
|
Juan Ferrer
|
ccf77ed356
|
fix(util): refs #7205 util.slowLog_prune code clean
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-12 09:24:48 +02:00 |
|
Juan Ferrer
|
622075a9aa
|
fix(util): refs #7205 fix util.slowLog_prune
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-12 09:21:34 +02:00 |
|
Pablo Natek
|
3547299c70
|
Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2276
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-04-12 07:12:53 +00:00 |
|
Guillermo Bonet
|
e516f90a0b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:56:58 +02:00 |
|
Guillermo Bonet
|
d503018d5c
|
Fixtures Jorge
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:56:38 +02:00 |
|
Pablo Natek
|
aaef10b8d8
|
feat(collection-label): refs #6602 add qr to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-12 08:48:29 +02:00 |
|
Robert Ferrús
|
adadf70f1e
|
feat: refs #6500
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 08:44:06 +02:00 |
|
Robert Ferrús
|
800fa36d04
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6500-procRefactor8
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 08:40:50 +02:00 |