Commit Graph

10402 Commits

Author SHA1 Message Date
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
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
Joan Sanchez 786589f214 fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good Details
Refs: 3093
2021-09-21 12:25:22 +02:00
Joan Sanchez deb085ce9f fix(bankEntity): was not sending back the data id
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-21 08:43:21 +02:00
Joan Sanchez c9cda92fbf refactor(smtp): replaced field "sender" with "receiver"
gitea/salix/pipeline/head This commit looks good Details
2021-09-20 14:32:15 +02:00
Joan Sanchez cd478a9f7b Removed line break 2021-09-20 14:02:04 +02:00
Joan Sanchez 369b79c6af refactor(invoice): removed unnecessary class
gitea/salix/pipeline/head Build queued... Details
2021-09-20 14:01:40 +02:00
Joan Sanchez a0ac55bc3e refactor(invoice): send invoice to specific email address from descriptor option
gitea/salix/pipeline/head This commit looks good Details
Refs: 3010
2021-09-20 13:59:57 +02:00
Carlos Jimenez Ruiz 8ab67f0ba5 Merge pull request 'Component shows now the year week numbers' (#738) from 2389-calendar_weeks into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #738
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-20 08:50:08 +00:00
Carlos Jimenez Ruiz c17cedd124 Merge branch 'dev' into 2389-calendar_weeks
gitea/salix/pipeline/head This commit looks good Details
2021-09-20 08:44:49 +00:00
Carlos Jimenez Ruiz 2846089f8e Merge pull request 'Added warning text for non returned packagings' (#737) from 3097-delivery_note_text into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #737
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-20 08:15:08 +00:00
Joan Sanchez e07e8ec658 Merge branch 'dev' into 2389-calendar_weeks
gitea/salix/pipeline/head This commit looks good Details
2021-09-20 08:11:21 +00:00
Joan Sanchez 69346a17a0 Removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-09-20 10:10:25 +02:00
Joan Sanchez f90eb4c39d refactor(deliveryNote): added warning text for non returned packagings
gitea/salix/pipeline/head This commit looks good Details
Refs: 3097
2021-09-20 08:57:51 +02:00
Joan Sanchez 22cbe4875f fix(upload-photo): Updated translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 12:56:12 +02:00
Joan Sanchez 7223344aa0 Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #736
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-17 09:59:29 +00:00
Joan Sanchez 560993cc8c Removed unused translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 11:34:26 +02:00
Joan Sanchez d52252ac07 Merge pull request '3081-newbankentity_component_refactor' (#735) from 3081-newbankentity_component_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #735
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-09-17 08:44:43 +00:00
Joan Sanchez 01db0f6ece Merge branch 'dev' into 3081-newbankentity_component_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:47:25 +00:00
Carlos Jimenez Ruiz b3c70de6e0 Merge branch 'dev' into 3093-fix_dup_tickets
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:38:12 +00:00
Carlos Jimenez Ruiz 78ec26a1de Merge pull request 'feat(upload-photo): added options to choose between upload from computer or external url' (#734) from 2627-photo_external_url into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #734
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-17 07:37:50 +00:00
Carlos Jimenez Ruiz 189e7374e2 Merge branch 'dev' into 2627-photo_external_url
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:31:59 +00:00
Carlos Jimenez Ruiz d4a4bc2ad7 Merge pull request 'feat(closure): send to driver the route report on route closure' (#733) from 2910-route_closure into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #733
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-09-17 07:31:27 +00:00
Carlos Jimenez Ruiz 8d8740a33b Merge branch 'dev' into 2910-route_closure
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:27:14 +00:00
Joan Sanchez ad24432e54 Merge pull request '3086-monitor_index_hours' (#732) from 3086-monitor_index_hours into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #732
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-09-17 07:26:54 +00:00
Carlos Jimenez Ruiz 183fe85e07 Merge branch 'dev' into 3086-monitor_index_hours
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 07:22:12 +00:00
Joan Sanchez 079f99ca0d fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good Details
Refs: 3093
2021-09-17 08:50:22 +02:00
Joan Sanchez 4494522ad1 feat(calendar): component shows now the year week numbers
gitea/salix/pipeline/head This commit looks good Details
Refs: 2389
2021-09-16 12:13:20 +02:00
Carlos Jimenez Ruiz 34038b885c refactor(newBankEntity): client.billingData and supplier.account refactor to use newBankEntity Dialog
gitea/salix/pipeline/head This commit looks good Details
2021-09-15 17:58:58 +02:00
Carlos Jimenez Ruiz 47e70f7c3c refactor(newbankentity): the component now extends from Dialog 2021-09-15 15:54:54 +02:00
Carlos Jimenez Ruiz e81c1046f6 test(e2e): e2e and selectors amended according to newbankentity refactor 2021-09-15 13:26:08 +02:00
Carlos Jimenez Ruiz d8a2302b18 refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component 2021-09-15 13:25:26 +02:00
Carlos Jimenez Ruiz 0f1b33802e refactor(newbankentity): added id as entity code input + translation 2021-09-15 13:24:01 +02:00
Joan Sanchez 59efc24077 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-09-14 11:26:22 +02:00
Joan Sanchez c442073eae feat(upload-photo): added options to choose between upload from computer or external url
Refs: 2627
2021-09-14 09:33:23 +02:00