verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
18,069 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

18069 Commits

Author SHA1 Message Date
Alex Moreno 0fed5c1ab4 Merge branch 'dev' into 6335-ticketAdvance_splitOrCreate
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 09:59:24 +00:00
Alex Moreno 69255fe2fc refs #6014 feat(execute): use user_hasRoutinePriv. feat(execute): split in executeProc & executeFunc
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 10:58:58 +01:00
Alex Moreno f1b5e45491 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6014-executeRoutineMethod 2023-11-10 10:53:11 +01:00
Alex Moreno ad07c4ec97 Merge pull request '#4797 Seccion Worker/Notification' (!1494) from 4797-worker-notification-selector into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1494
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-10 09:47:40 +00:00
Alex Moreno 2eacf7391e refs #6335 fix(db_ticket_canAdvance): not use unnecessary ifnulls
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 08:46:49 +01:00
Alex Moreno e9666a5930 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6335-ticketAdvance_splitOrCreate 2023-11-10 08:11:52 +01:00
Jorge Penadés 40b9a83606 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-newInvoiceInDueDay
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:59:12 +01:00
Jorge Penadés 8d94a94e14 ref #5914 fix test back
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:56:50 +01:00
Jorge Penadés 513562955b ref #5835 test back
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:53:41 +01:00
Alex Moreno fd142b9f23 refs #5881 warmFix: roleSync
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:05:36 +01:00
Jorge Penadés 52f1843580 ref #5835 due day new and fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 15:00:49 +01:00
Jorge Penadés 0baa9c5a98 ref #5914 fix summary
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:34:53 +01:00
Jorge Penadés b07858fddb ref #5914 replace name
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 14:33:46 +01:00
Guillermo Bonet 9668468f94 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:06:55 +00:00
Sergio De la torre 4aac9f93cc Merge branch 'dev' into 6014-executeRoutineMethod
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 13:03:25 +00:00
Jorge Penadés 3e45334149 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-warmfix-renameTable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 12:04:47 +01:00
Jorge Penadés 01d3c23cf0 ref #5914 renameTable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-09 11:57:52 +01:00
Alex Moreno a0c4573f4d refs #4797 fix: correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 09:34:37 +01:00
Alex Moreno 52f419d4cf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector 2023-11-09 09:33:22 +01:00
Alex Moreno dbe6844419 refs #6415 feat: init version 23.48
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 09:31:32 +01:00
Alex Moreno 973eff4520 refs #6415 fix. sql files
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 09:05:56 +01:00
Alex Moreno 5629db4ae2 Merge pull request 'refs #5870 feat:fixModel' (!1830) from 5870_operatorModel into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1830
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-09 07:43:24 +00:00
Sergio De la torre 4258015c07 refs #5870 feat:fixModel
gitea/salix/pipeline/head This commit looks good Details
2023-11-09 08:04:38 +01:00
Sergio De la torre 9f5cfd920f Merge pull request 'refs #5652 feat:addressShortage' (!1828) from 5652_addressOption into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1828
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-08 15:08:15 +00:00
Alex Moreno 204323ac69 test(notification_getList): fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 14:57:07 +01:00
Alex Moreno 0de5bc5109 refs #4797 refactor: getList & notificationSubscription method 2023-11-08 14:56:47 +01:00
Sergio De la torre 5751065e6a refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 11:50:04 +01:00
Javi Gallego 9d54618620 fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 10:01:02 +01:00
Sergio De la torre d30c4e4463 refs #5652 feat:addressShortage
gitea/salix/pipeline/head This commit looks good Details
2023-11-07 16:13:21 +01:00
Pablo Natek 3ce0957de0 Merge pull request 'fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit' (!1818) from 6150-clientCredit-update-Fix into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1818
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-07 12:29:30 +00:00
Pablo Natek 0818efaa99 fix(fixtures): refs #6150 clientCredit
gitea/salix/pipeline/head This commit looks good Details
2023-11-06 14:58:39 +01:00
Pablo Natek 1c6618d494 fix(new): refs #6150 revert chabges in worker new method
gitea/salix/pipeline/head Build queued... Details
2023-11-06 14:56:48 +01:00
Pablo Natek 72c8e76a2f Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 14:54:57 +01:00
Pablo Natek b442c9f5ed fix: refs #6150 ticket to client trigger 2023-11-06 14:54:56 +01:00
Pablo Natek 526a5fdc8f Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 13:26:45 +00:00
Pablo Natek aa800b1fd3 Merge branch '6150-clientCredit-update-Fix' of https://gitea.verdnatura.es/verdnatura/salix into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-06 14:23:38 +01:00
Pablo Natek a75565f2ce feat(client.create): refs #6150 clientCredit update fix 2023-11-06 14:23:36 +01:00
Pablo Natek 779ca2cc05 Merge pull request 'feat(claimViewer): refs #5881 nuevo rol claimViewer' (!1825) from 5881-claim-viewer into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1825
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-11-06 09:46:42 +00:00
Pablo Natek 7ca3ea156c feat(claimViewer): refs #5881 nuevo rol claimViewer
gitea/salix/pipeline/head This commit looks good Details
2023-11-06 09:16:10 +01:00
Juan Ferrer 99c88e6f5d fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good Details
2023-11-05 09:33:18 +01:00
Alex Moreno 8c5e40c27f refs #4797 fix: correct sql folder
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 15:16:03 +01:00
Alex Moreno d06810b1b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4797-worker-notification-selector
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 14:58:55 +01:00
Alex Moreno a523e32373 refs #6335 style(ticketAdvance): fix with split-progress
gitea/salix/pipeline/head This commit looks good Details
2023-11-03 07:57:53 +01:00
Jorge Penadés d0975f0acd ref #6276 operator_add
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-02 16:25:25 +01:00
Sergio De la torre 439b3091d0 Merge pull request 'hotFix_6312 fix originalQuantity' (!1819) from hotFix_6312 into master
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1819
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-11-02 14:05:17 +00:00
Sergio De la torre 728838334c hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:42:22 +01:00
Pablo Natek 2d3ee4a16e Merge branch 'dev' into 6150-clientCredit-update-Fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 13:05:31 +00:00
Pablo Natek 175e73e565 fix(clientCredit): refs #6150 se arreglan los inserts en clientCredit
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:05:14 +01:00
Sergio De la torre 426b3aa4de Merge branch 'dev' into 5867-Driver-Route-Pdf
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 10:02:13 +00:00
Alex Moreno 03e2f57306 refs #6067 fix: emailVerify url
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 10:57:50 +01:00