Commit Graph

12689 Commits

Author SHA1 Message Date
Javi Gallego a6c093cf16 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 07:07:52 +02:00
Carlos Jimenez Ruiz b6d96f57f2 Merge branch 'dev' into 2972-travel_e2e
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 14:22:12 +00:00
Carlos Jimenez Ruiz 2724033909 added a waitForTimeout to allow descriptor component to load
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 16:17:18 +02:00
Joan Sanchez bbbf008076 Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 16:09:17 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Carlos Jimenez Ruiz cf1fde6892 Merge pull request 'expedition-minor-changes' (#662) from expedition-minor-changes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #662
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-06-17 10:04:36 +00:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 11:52:12 +02:00
Javi Gallego 577129a24a test e2e
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 08:17:02 +02:00
Javi Gallego d0389cabf4 excluyo e2e para pasar test verde
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 08:02:39 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Javi Gallego dc0212d2fc chip
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 18:36:42 +02:00
Carlos Jimenez Ruiz b9bfb35008 e2e fix
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 17:58:47 +02:00
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Joan Sanchez 2a1a0a3244 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 13:33:32 +02:00
Joan Sanchez c8d378cc36 Merge pull request '2928-entry_latestsbuys_weight' (#660) from 2928-entry_latestsbuys_weight into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #660
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-16 11:18:28 +00:00
Carlos Jimenez Ruiz da2d62899f Merge pull request '2956 - Fix for extra community report' (#659) from 2956-extraCommunity_hotfix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #659
2021-06-16 11:16:09 +00:00
Joan Sanchez 9c09d60775 Updated var name
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 13:14:13 +02:00
Joan Sanchez e7c62d2e71 2956 - Fix for extra community report
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 13:04:54 +02:00
Carlos Jimenez Ruiz 47ad63c154 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz 588a499c44 editLatestsBuys now is called only with id and itemFk 2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz 9dbff9842f Merge pull request '2961 - Show tickets on summary' (#657) from 2961-summary_tickets into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #657
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-06-16 10:28:17 +00:00
Carlos Jimenez Ruiz f5ad0c9c1c Merge branch 'dev' into 2961-summary_tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 10:18:47 +00:00
Carlos Jimenez Ruiz fc1587bcdd Merge pull request '2941 - Monitor changes' (#654) from 2941-salesMonitor_changes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #654
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-06-16 10:18:31 +00:00
Joan Sanchez 447d8341e7 Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:49:12 +00:00
Joan Sanchez b7342ec15d Merge pull request '2965-delete_travel_from_descriptor' (#656) from 2965-delete_travel_from_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #656
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-16 09:48:58 +00:00
Joan Sanchez 76623d8c95 Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:47:45 +00:00
Joan Sanchez 0ce782a4de Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:40:00 +02:00
Joan Sanchez 3e938fa9fb Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz b9cdc5ed6a Merge branch 'dev' into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 08:19:01 +00:00
Joan Sanchez efc9edb384 Fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 10:13:06 +02:00
Joan Sanchez c3bebc9f7e Merge pull request 'removed several columns from bulk edit and added packingOut' (#652) from 2929-entry_latestsbuys_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #652
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-16 08:02:31 +00:00
Joan Sanchez df94190a8c Removed console log 2021-06-16 09:59:54 +02:00
Carlos Jimenez Ruiz 34e0d0b7cf translations update
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:50:32 +02:00
Joan Sanchez 225bfd09b9 Missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:47:54 +02:00
Joan Sanchez c10f792619 Merge branch 'dev' into 2929-entry_latestsbuys_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 07:44:30 +00:00
Joan Sanchez 353d0e352d 2961 - Show tickets on summary
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:43:07 +02:00
Joan Sanchez 55908c0fca Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 07:41:16 +00:00
Carlos Jimenez Ruiz 47c9071bdb Merge pull request '2963 - Show section to all employee' (#655) from 2963-creditInsurance_acl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #655
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-06-15 14:43:44 +00:00
Carlos Jimenez Ruiz 1a053942a1 Merge branch 'dev' into 2963-creditInsurance_acl
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:41:52 +00:00
Carlos Jimenez Ruiz 8c1df0743d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 16:41:12 +02:00
Carlos Jimenez Ruiz 8aa3d269ea Travel descriptor now shows delete option if there are no entries 2021-06-15 16:41:01 +02:00
Joan Sanchez 2262f3e542 Merge pull request '2938-entry_buy_style' (#651) from 2938-entry_buy_style into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #651
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-15 12:46:50 +00:00
Joan Sanchez 9591f04853 Merge branch 'dev' into 2938-entry_buy_style
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:18:59 +00:00
Joan Sanchez 120be190ae Merge pull request 'added missing html closing tag' (#653) from 2968-move_supplier_billingdata_form_buttons into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #653
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-15 12:17:46 +00:00
Joan Sanchez 92e8f528e8 2963 - Show section to all employee
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:16:12 +02:00
Joan Sanchez 2469409068 2941 - Monitor changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 13:48:42 +02:00
Carlos Jimenez Ruiz db3d5ca4d8 added missing html closing tag
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 13:14:21 +02:00
Carlos Jimenez Ruiz 7004ad5ade removed several columns from bulk edit and added packingOut
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:47:40 +02:00
Javi Gallego 500b68162b summary con chip
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 09:58:21 +02:00
Javi Gallego 5369e8d97e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 09:09:08 +02:00