Commit Graph

9329 Commits

Author SHA1 Message Date
Joan Sanchez 565162740a Updated unit tests 2021-03-15 16:35:55 +01:00
Joan Sanchez 0ec6d273e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:49:16 +01:00
Joan Sanchez bd081f9fd6 2734 - Make invoice PDF refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:43:22 +01:00
Carlos Jimenez Ruiz ef0b72c621 Merge pull request '2842-npm_maintenance' (#574) from 2842-npm_maintenance into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #574
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-15 11:49:16 +00:00
Carlos Jimenez Ruiz 0aaf7b32ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 12:32:08 +01:00
Carlos Jimenez Ruiz 139861785e Merge branch '2842-npm_maintenance' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 12:27:37 +01:00
Carlos Jimenez Ruiz 0870a902af chat.send tests fixed + small refactor 2021-03-15 12:26:11 +01:00
Joan Sanchez d2b4e0b39f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 12:15:29 +01:00
Joan Sanchez 1acd5dc838 Closure to dayEnd
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 12:03:19 +01:00
Joan Sanchez 893cca52cc Changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 11:49:35 +01:00
Carlos Jimenez Ruiz afb8df1429 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance 2021-03-15 11:32:57 +01:00
Joan Sanchez 060fc2ac21 Closure by date
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 11:07:44 +01:00
Joan Sanchez 5f75295f5a Merge branch 'dev' into 2842-npm_maintenance
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 09:52:13 +00:00
Joan Sanchez d275dcfafd Fix for procedure changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 09:45:48 +01:00
Joan Sanchez 92aa9eb933 Removed ticket total temporary table
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 06:52:15 +01:00
Joan Sanchez c3bb099b85 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-03-15 06:50:42 +01:00
Joan Sanchez 6cb620a41d Ticket filter fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-14 17:20:42 +01:00
Joan Sanchez 7b94cc2942 Ticket filter test
gitea/salix/pipeline/head This commit looks good Details
2021-03-14 17:12:31 +01:00
Carlos Jimenez Ruiz 2b8286eb28 deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 17:15:26 +01:00
Carlos Jimenez Ruiz 49216e09c9 Merge pull request 'Added shrink for date' (#550) from 2787-change_css_date_time into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #550
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-12 12:07:53 +00:00
Joan Sanchez 747ec492d0 Removed npm module as dependency
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 13:03:02 +01:00
Carlos Jimenez Ruiz 7c34555afd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 12:30:55 +01:00
Carlos Jimenez Ruiz 8dc60ea3a3 Merge pull request '2752 - Import json file' (#524) from 2752-entry_import_buys into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #524
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-03-12 11:28:13 +00:00
Carlos Jimenez Ruiz 8018b20d95 e2e path for entry.buy.card.index import
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 11:56:02 +01:00
Joan Sanchez f92db8c5a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 08:52:07 +01:00
Joan Sanchez 4c7d95f001 Requested changes + e2e updated
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 08:45:41 +01:00
Joan Sanchez be37334f49 Requested changes 2021-03-12 08:17:56 +01:00
Carlos Jimenez Ruiz fc6fc73df7 Merge pull request '2824-ticket_totalWith_and_without_VAT' (#571) from 2824-ticket_totalWith_and_without_VAT into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #571
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-11 16:08:44 +00:00
Carlos Jimenez Ruiz 674b959bbc minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 15:14:08 +01:00
Carlos Jimenez Ruiz 05ee2ee2d3 ticket.sale front unit test fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 10:44:34 +01:00
Joan Sanchez 1ed4dd27d6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 08:59:02 +01:00
Joan Sanchez 1719f53111 2734 - Recreate invoice
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 08:58:34 +01:00
Carlos Jimenez Ruiz 4c0d583556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT 2021-03-10 19:25:43 +01:00
Carlos Jimenez Ruiz 0cb7ddd9ce ticket.total with and witout VAT refactor 2021-03-10 19:25:26 +01:00
Joan Sanchez e29dd4db42 Updated it description
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 11:14:50 +01:00
Joan Sanchez a0358044a1 Acl fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 11:11:04 +01:00
Joan Sanchez a7c2e08f8f ACl fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 11:04:56 +01:00
Joan Sanchez b39ec70a2c Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:54:14 +00:00
Joan Sanchez c144d9ed47 Unit test changed query path
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 10:53:22 +01:00
Joan Sanchez a4d2c531a3 Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-10 10:29:58 +01:00
Joan Sanchez 2a2e276c6b Added back unit test plus fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-10 09:01:32 +01:00
Joan Sanchez ab755e29c7 Merge branch 'dev' into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 14:01:04 +00:00
Joan Sanchez 31205f4556 Added front unit test 2021-03-09 13:39:22 +01:00
Joan Sanchez 2541623423 Merge pull request 'Added icon for supplier descriptor' (#569) from 2733-supplier_descriptor_icon into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #569
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-09 11:37:03 +00:00
Joan Sanchez 5cbd8d632d Changes 2021-03-09 10:01:40 +01:00
Joan Sanchez 9da59949fd Merge branch 'dev' into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 08:31:03 +00:00
Joan Sanchez e7cabc052e Merge pull request '2832 Fixed problem with conditional for validate the role on item summary' (#568) from 2832-summary_validate_h4 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #568
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-03-09 08:27:15 +00:00
jorgebl 59882cca77 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 09:26:02 +01:00
jorgebl 2d36d4e610 Added line break in vn-icon 2021-03-09 09:25:10 +01:00
Joan Sanchez ff6c80aa7e Merge branch 'dev' into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good Details
2021-03-09 08:24:10 +00:00