Commit Graph

12689 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 392c4dcba3 refactor(sale): ticket.sale endpoints now use transactions 2021-09-29 08:27:18 +02:00
Carlos Jimenez Ruiz e690febc7f refactor(updateAll): usage of documented methods as update alias is not documented in loopback 2021-09-29 08:26:10 +02:00
Joan Sanchez 148e40c71f Changed again
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 21:52:17 +02:00
Joan Sanchez 5f27bb9f92 Storage folder rollback
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 21:41:26 +02:00
Carlos Jimenez Ruiz 6cf1737c0d refactor(thermograph): temperature column now displays the correct data 2021-09-28 11:59:04 +02:00
Javi Gallego 4f1fd5412d faltan test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-28 10:57:51 +02:00
Joan Sanchez 06b49f36b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 10:03:00 +02:00
Joan Sanchez 19d3b19e5a Updated translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-28 09:59:00 +02:00
Juan Ferrer 6c391bb1cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-09-27 14:42:26 +02:00
Juan Ferrer 7c1aa4f1a6 Ceph mounts
gitea/salix/pipeline/head This commit looks good Details
2021-09-27 14:39:49 +02:00
Carlos Jimenez Ruiz b51c0c938b Merge branch '3092-module_transactions' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-24 13:02:53 +02:00
Joan Sanchez ee0e1e122b Removed crudModel default params
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 13:02:20 +02:00
Carlos Jimenez Ruiz 061e622171 Merge branch '3092-module_transactions' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-24 12:56:42 +02:00
Joan Sanchez 4ea0f92c35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:54:22 +02:00
Joan Sanchez 4545a5c8fa fix(filter): single search results don't use scopeDates
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 12:51:20 +02:00
Carlos Jimenez Ruiz cb3d0678ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions 2021-09-24 10:09:51 +02:00
Carlos Jimenez Ruiz 218c37c134 Merge pull request '3098-item_tag_productor' (#742) from 3098-item_tag_productor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #742
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-09-24 08:09:06 +00:00
Carlos Jimenez Ruiz 8c446edc9e Merge branch 'dev' into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 08:02:19 +00:00
Carlos Jimenez Ruiz 3118b104eb Merge pull request 'Search limit by date range was not being applied' (#741) from 3059-ticket_index_filter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #741
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-24 08:01:55 +00:00
Carlos Jimenez Ruiz c6692ca951 Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:54:50 +00:00
Carlos Jimenez Ruiz 88f1d1d3a5 Merge pull request 'Send invoice to specific email address from descriptor option' (#739) from 3010-send_invoice into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #739
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-24 07:53:57 +00:00
Carlos Jimenez Ruiz 5f0e2825b8 Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:46:09 +00:00
Carlos Jimenez Ruiz 7369f4aa54 Merge branch 'dev' into 3010-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 07:44:24 +00:00
Carlos Jimenez Ruiz 14b92e530a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 09:37:37 +02:00
Joan Sanchez 0e287447bf SQL version folder
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 09:09:16 +02:00
Javi Gallego e5c9ea850b testback done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-24 08:24:34 +02:00
Joan Sanchez 39ff9d0ddb Removed package-lock
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 08:19:12 +02:00
Joan Sanchez 4fc14685e4 Removed package-lock
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2021-09-24 08:18:41 +02:00
Joan Sanchez 98944f4b12 Updated node version
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-24 08:10:13 +02:00
Carlos Jimenez Ruiz 8fc17f05c6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:35:07 +02:00
Carlos Jimenez Ruiz 368f54b872 refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
gitea/salix/pipeline/head This commit looks good Details
2021-09-23 17:19:47 +02:00
Joan Sanchez 8c3a3d83e0 Removed vn-mysql package
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-23 07:59:56 +02:00
Carlos Jimenez Ruiz f74d2cc302 test(tags): moved code used on a single test to the correct place
gitea/salix/pipeline/head This commit looks good Details
2021-09-22 15:16:45 +02:00
Carlos Jimenez Ruiz 95ff46db09 refactor(buys): entry buys now show item.subName 2021-09-22 15:15:52 +02:00
Carlos Jimenez Ruiz 23ba5657c5 refactor(sales): ticket sales now shows item.subName 2021-09-22 15:14:29 +02:00
Carlos Jimenez Ruiz c971d3ee01 refactor(consumption): client consuption now shows item.subName 2021-09-22 15:13:29 +02:00
Joan Sanchez 352f214f6f Merge pull request '2995-supplierAccount-modificaciones' (#714) from 2995-supplierAccount-modificaciones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #714
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-09-22 10:58:04 +00:00
Javi Gallego 40e589203e test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-09-22 07:42:58 +02:00
Carlos Jimenez Ruiz aae54b5707 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 18:49:35 +02:00
Carlos Jimenez Ruiz cc90a08f03 refactor(ticket): ticket endpoins now can receive transactions 2021-09-21 18:48:59 +02:00
Carlos Jimenez Ruiz ca00e3611c package-lock after removing vn-mysql 2021-09-21 18:43:45 +02:00
Joan Sanchez 08cba0a9c8 fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good Details
Refs: 3059
2021-09-21 15:49:59 +02:00
Javi Gallego 6058e2a60a npm i
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-21 14:11:03 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez d41378a532 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 13:51:38 +02:00
Joan Sanchez 32d492efd3 refactor(deliveryNote): updated report translations
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-21 13:03:07 +02:00
Joan Sanchez 96e283b2bf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-21 12:57:04 +02:00
Joan Sanchez 6e89fa1b5e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 12:56:49 +02:00
Joan Sanchez 689662f9bb fix code duplication
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 12:48:51 +02:00
Carlos Jimenez Ruiz 95b4d23599 added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good Details
2021-09-21 12:39:54 +02:00