 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
|
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 |
 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
|
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
|
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
|
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
|
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
|
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 |
|
Carlos Jimenez Ruiz
|
9c0cff2f3a
|
removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 16:09:28 +02:00 |
|
Carlos Jimenez Ruiz
|
88a5443d64
|
table style changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 15:52:46 +02:00 |
|
Carlos Jimenez Ruiz
|
e85b7b9817
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
|
2021-06-14 12:07:54 +02:00 |
|
Carlos Jimenez Ruiz
|
cdbab4d7bf
|
Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 10:00:47 +00:00 |
|
Carlos Jimenez Ruiz
|
c09d25ba48
|
Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:59:13 +00:00 |
|
Joan Sanchez
|
59e90c2c10
|
Removed commented block
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 11:58:39 +02:00 |
|
Joan Sanchez
|
722c9ad4d4
|
Merge branch 'dev' into 2957-ticket_summary_postcode
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:42:40 +00:00 |
|
Carlos Jimenez Ruiz
|
7f69909bbd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 11:39:04 +02:00 |
|
Carlos Jimenez Ruiz
|
f36b54f97b
|
invoiceOut summary tickets pagination + refactor
|
2021-06-14 11:38:57 +02:00 |
|
Joan Sanchez
|
a303b98093
|
Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:37:23 +00:00 |
|
Joan Sanchez
|
de30a2d978
|
Total holidays fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 08:09:53 +02:00 |
|
Carlos Jimenez Ruiz
|
5d8a9938d6
|
formattedAddress tests amended for postcode
|
2021-06-13 19:16:35 +02:00 |
|
Carlos Jimenez Ruiz
|
48f80fad8f
|
added postcode to summary + basic data translation
|
2021-06-13 19:11:05 +02:00 |
|
Carlos Jimenez Ruiz
|
7bf832079d
|
route.tickets suggested tickets now shows both descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 13:02:18 +02:00 |
|
Joan Sanchez
|
17a6dfc81b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 10:58:40 +02:00 |
|
Joan Sanchez
|
a72010554c
|
Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-11 10:58:00 +02:00 |
|
Carlos Jimenez Ruiz
|
c776d34cdf
|
invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 17:08:21 +02:00 |
|
Joan Sanchez
|
e8fd1c9c9c
|
Merge branch 'dev' into 2951-fix_unit_test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 14:24:17 +00:00 |
|
Joan Sanchez
|
be791d1f00
|
2951 - Added transaction to updateVolume() method
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 16:08:44 +02:00 |
|
Joan Sanchez
|
3f3e5c2735
|
Unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 16:05:10 +02:00 |
|
Joan Sanchez
|
1b62233ea7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
|
2021-06-10 14:22:13 +02:00 |
|
Joan Sanchez
|
8284702603
|
2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-10 11:24:32 +02:00 |
|
Carlos Jimenez Ruiz
|
fc3af7b6a6
|
ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-09 14:25:50 +02:00 |
|
Carlos Jimenez Ruiz
|
f969323a86
|
ticket create now takes clientFk from params
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-08 17:30:00 +02:00 |
|
Joan Sanchez
|
3c8629b3f3
|
Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-08 16:36:16 +02:00 |
|
Carlos Jimenez Ruiz
|
76e723cc34
|
Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-08 07:47:42 +00:00 |
|
Carlos Jimenez Ruiz
|
238975644f
|
Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 13:02:27 +00:00 |