Commit Graph

1998 Commits

Author SHA1 Message Date
Alexandre Riera a42723210f refs #4951 delete function
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:13:18 +01:00
Alexandre Riera 14ca5cc599 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4951-longitud-cuentaContables
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 08:48:46 +01:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Vicent Llopis 984a3294f9 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 11:58:00 +00:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 15:11:53 +01:00
Pau 24b8b172b9 use notification id 2023-01-05 14:13:42 +01:00
Pau 4ae903191a Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 12:48:03 +00:00
Vicent Llopis 810a1afcd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2023-01-05 11:40:25 +01:00
Joan Sanchez 030c474e06 Fixed update module
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 13:18:55 +01:00
Alexandre Riera e82035606f refs #4984 autoincrement added
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 11:31:09 +01:00
Alexandre Riera a4e591c5f5 refs #4951 triggers modified
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 10:37:59 +01:00
Alex Moreno 8184749626 change db version folder
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:40:27 +01:00
Alex Moreno 021c475de7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2023-01-04 09:39:26 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alexandre Riera f499311a16 refs #4951 changed triggers and added checkLength
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 08:36:55 +01:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Pau 1653439c44 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:33:21 +00:00
Vicent Llopis ddfee57470 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 13:09:02 +01:00
Vicent Llopis 25dad4b358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 13:03:36 +01:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Alexandre Riera 6185b2f055 refs #5051 changed fixture
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:04:38 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Vicent Llopis fe7f388f3d Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:07:31 +00:00
Pau a55d007655 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:12:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Vicent Llopis 3792a80ad5 refs #4925 feat: añadido back para editar tags
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 14:24:32 +01:00
Pau 21cd2e2a63 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 09:03:05 +00:00
Pau 45d4ab80d5 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2022-12-29 06:37:21 +00:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Alex Moreno bee65f9c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-28 07:24:08 +01:00
Pau ee0cd2174f requested changes refs #4797 @2h
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 14:32:19 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 11:50:58 +01:00
Pau ea7f4b7c02 remove broken fixture 2022-12-27 10:34:12 +01:00
Pau 3ca1d1f4ee remove error in fixtures 2022-12-27 10:29:15 +01:00
Pau ada3e6f175 update sql folder
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 10:10:37 +01:00
Pau c9468990b7 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-27 10:08:39 +01:00
Pau deb730aae7 solve fixture error 2022-12-27 09:21:02 +01:00
Pau 7aeeddcf18 removed the sql
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 07:23:15 +01:00
Pau 8696d554d6 Change SQL folder
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-26 07:22:59 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +01:00
Vicent Llopis fb325d5e65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 12:34:51 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Joan Sanchez c13b49c7cd Added next version & changelog
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 10:07:19 +01:00
Vicent Llopis 9468f604ff move sql changes
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 10:02:21 +01:00
Vicent Llopis 906d8c5df7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat 2022-12-23 10:01:44 +01:00
Joan Sanchez 39699114e3 Changed version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 10:01:08 +01:00
Joan Sanchez ff0243db8f Fixed SQL files 2022-12-23 09:55:15 +01:00
Vicent Llopis c98b5a969d feat: actualizada consulta intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 09:16:26 +01:00
Pau fc86e913c4 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:09:38 +00:00
Alexandre Riera eefc5ab80d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat 2022-12-23 08:01:52 +01:00
Joan Sanchez e15d724db5 Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1151
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 12:44:01 +00:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 10:43:20 +00:00
Pau a8ca163321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:49:41 +01:00
Pau fce0352986 add fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 10:41:07 +01:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Pau aa716634db Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:30:36 +01:00
Pau ea6d399cf1 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:25:38 +00:00
Pau c0d285856b move sql files
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:24:54 +01:00
Pau f57201c8c3 add requested changes 2022-12-22 08:20:59 +01:00
Pau fed4cc8534 Merge branch 'dev' into #288-traducir-state-i18n 2022-12-22 08:07:25 +01:00
Pau a713cf92cf Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:00:33 +01:00
Pau f6f6d0866d requested changes refs #4732 @1h 2022-12-22 08:00:18 +01:00
Pau 05f4db7924 Add requested changes to the fixtures 2022-12-22 07:16:22 +01:00
Alex Moreno 7e6cdc9152 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 13:47:54 +01:00
Alex Moreno 502a692521 test(item_fixedPrice_rate2): backTest and e2e
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:55:11 +01:00
Vicent Llopis a45ef27e3f move changes sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 12:15:33 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis e4f4e70cc6 Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:26:53 +00:00
Vicent Llopis 6634ebcec5 fix: id duplicado en util.notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 09:25:52 +01:00
Alex Moreno b4b7b8e204 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-21 09:08:39 +01:00
Vicent Llopis b0595dd0da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 08:12:59 +01:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Pau 1430749892 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:02 +00:00
Alexandre Riera 5b87514501 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3302-logFormat
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:15:50 +01:00
Alexandre Riera 9291f4a380 refs #3963 sql moved
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:10:02 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Vicent Llopis d178800c14 movidos change sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 10:53:13 +01:00
Vicent Llopis 1ddaf7ff08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-20 10:52:23 +01:00
Joan Sanchez 73ea928b33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:23 +01:00
Joan Sanchez 47e1c05e47 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:39:39 +01:00
Joan Sanchez 70b1854cc5 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:20:31 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Alexandre Riera cd71a59dfe Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:01:45 +00:00
Alex Moreno f82870bec6 feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 14:39:38 +01:00
Pau 6b3876b200 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 12:26:52 +00:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Pau d356e5352b delete old files
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:41:15 +01:00
Pau 055a479aba Merge branch 'dev' into #288-traducir-state-i18n 2022-12-19 07:40:56 +01:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 13:06:06 +01:00
Alex Moreno 0a18c855e7 Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:43:40 +00:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 09:51:40 +01:00
Vicent Llopis 85148ab929 refactor: movidos changes sql
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 08:59:06 +01:00