Commit Graph

11301 Commits

Author SHA1 Message Date
Alex Moreno d4b06d2d1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data 2022-02-17 07:31:31 +01:00
Alex Moreno 068459994d Merge branch '3609-ticket_basic-data' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data 2022-02-17 07:31:24 +01:00
Joan Sanchez 3e33436bf6 fix(report): Check ticket property first
gitea/salix/pipeline/head This commit looks good Details
2022-02-16 09:53:38 +01:00
Joan Sanchez 59ad70c4ac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-02-16 08:16:17 +01:00
Joan Sanchez 9a1b90eec4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 13:36:06 +01:00
Joan Sanchez 5a2677c7de Removed icons font color
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 13:21:13 +01:00
Carlos Jimenez Ruiz 9ec8eb6e16 Merge pull request '3315 - feat(notification): notify client metrics' (#876) from 3315-notify_metrics into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #876
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-02-15 11:19:40 +00:00
Joan Sanchez 633679e26e Merge branch 'dev' into 3315-notify_metrics
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 10:52:34 +00:00
Joan Sanchez 5518fac357 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-14 08:44:22 +01:00
Alex Moreno 9c9bcb68aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data 2022-02-10 11:34:38 +01:00
Joan Sanchez 624fa853d5 Merge branch 'dev' into 3609-ticket_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-02-10 10:04:46 +00:00
Alex Moreno 4e5e6dccca fix(test): change movable expeted
gitea/salix/pipeline/head This commit looks good Details
2022-02-10 10:15:43 +01:00
Carlos Jimenez Ruiz 0c93e0fa70 Merge pull request '3591-feat(order_summary): change salesPersonFk for clientFk' (#874) from 3591-order_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #874
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-02-10 08:29:43 +00:00
Alex Moreno 135aff27a4 fix(getMovable): show correct movable
gitea/salix/pipeline/head This commit looks good Details
2022-02-10 09:13:48 +01:00
Alex Moreno b4bed608ab refactor(ticket): getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 15:01:02 +01:00
Joan Sanchez f4ff854a1f feat(notification): notify client metrics
gitea/salix/pipeline/head This commit looks good Details
Refs: 3315
2022-02-09 14:06:06 +01:00
Alex Moreno ef281bb663 feat(order_summary): change salesPersonFk for clientFk
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 12:39:08 +01:00
Joan Sanchez db0fe766b0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 08:24:25 +01:00
Alex Moreno 2e649e81d6 fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 08:23:41 +01:00
Joan Sanchez 2809b6c7c1 Merge pull request '3570-feat(setQuantitySale): back route and test' (#869) from 3558-setQuantitySale into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #869
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-08 12:11:22 +00:00
Alex Moreno e09e84c36b refactor(setSaleQuantity): rename, remove transaction
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 12:41:55 +01:00
Alex Moreno d7a3821d05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale 2022-02-08 12:16:41 +01:00
Joan Sanchez b9c83cba1b Merge pull request '3585-invoiceIn_dueDate' (#872) from 3585-invoiceIn_dueDate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #872
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-08 08:43:40 +00:00
Joan Sanchez 8db6424b6d Merge branch 'dev' into 3585-invoiceIn_dueDate
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 08:41:02 +00:00
Joan Sanchez a726667c63 Merge pull request '3258-Entry.buys' (#873) from 3258-import_buys into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #873
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-02-08 08:37:20 +00:00
Carlos Jimenez Ruiz 4f1d34069b corrected some typos
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 09:27:39 +01:00
Carlos Jimenez Ruiz 00f8946675 feat(entry.buys): each buy groupingMode can now changed
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 18:01:45 +01:00
Carlos Jimenez Ruiz 485da4d0a7 added groupingMode to getBuys 2022-02-07 18:00:23 +01:00
Carlos Jimenez Ruiz cb21d4db01 removed a typo 2022-02-07 17:59:40 +01:00
Vicent Llopis f7297801f8 add due day section
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 12:24:08 +01:00
Alex Moreno e08a3d31bc remove f of focus
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 08:23:19 +01:00
Alex Moreno dc78cd2dc5 feat(collection): setQuantitySale
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 08:05:05 +01:00
Alex Moreno e958453831 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale 2022-02-07 08:01:38 +01:00
Carlos Jimenez Ruiz 9501d93217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys 2022-02-04 15:25:12 +01:00
Carlos Jimenez Ruiz 912ea12ff7 Merge pull request '3587-ticket_isEmpty' (#871) from 3587-ticket_isEmpty into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #871
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-02-04 12:02:33 +00:00
Carlos Jimenez Ruiz 7b2702ccbf Merge branch 'dev' into 3587-ticket_isEmpty
gitea/salix/pipeline/head This commit looks good Details
2022-02-04 10:38:39 +00:00
Alex Moreno 9df70cb30d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3558-setQuantitySale 2022-02-04 07:41:34 +01:00
Joan Sanchez 1fd84f583d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-03 12:02:35 +01:00
Joan Sanchez 2fa284cd4b Updated report anchor
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 12:02:20 +01:00
Alex Moreno 460923464a fix(icon): icon-plant
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 11:52:55 +01:00
Alex Moreno dc47af7224 feat(ticket): isEmpty ticketRequest not necessary isOk 2022-02-03 11:51:50 +01:00
Carlos Jimenez Ruiz fe13b33efc Merge pull request '3552-feat(monitor_ticket): classColor in db' (#864) from 3552-monitor_ticket_state into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #864
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-02-03 09:51:35 +00:00
Carlos Jimenez Ruiz e9189509c2 Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:50:01 +00:00
Carlos Jimenez Ruiz 5c75050e11 Merge pull request '3586-claim_filter and non ECMA compatible bugs' (#870) from 3586-claim_filter into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #870
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-02-03 09:49:19 +00:00
Carlos Jimenez Ruiz 4641f53108 Merge branch 'dev' into 3586-claim_filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:37:48 +00:00
Carlos Jimenez Ruiz 3c13bbbf5f Merge pull request '3563-feat(item_index): add column producer' (#866) from 3563-item_index_producer into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #866
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-02-03 09:37:23 +00:00
Alex Moreno c004ee638c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 10:34:48 +01:00
Alex Moreno 902714ba7d feat(item_index): add producer basic filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 10:32:59 +01:00
Alex Moreno 1250382209 missing zero
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:52:17 +01:00
Alex Moreno 386155f242 feat(setQuantitySale): transaction
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 14:55:21 +01:00