Joan Sanchez
|
7e51fe3775
|
Merge pull request 'e2e paths for invoiceIn summary, descriptor and basicData' (#604) from 2886-invoiceIn_descriptor_n_basicdata_e2e into dev
Reviewed-on: #604
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-04-16 08:22:15 +00:00 |
Carlos Jimenez Ruiz
|
56ec7b4729
|
input number made wider
|
2021-04-16 10:17:59 +02:00 |
Carlos Jimenez Ruiz
|
9a4c056059
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover
|
2021-04-16 10:07:18 +02:00 |
Carlos Jimenez Ruiz
|
17904c4edb
|
only undo and save buttons are disabled until data changed now
|
2021-04-16 09:20:02 +02:00 |
Carlos Jimenez Ruiz
|
d392b50209
|
e2e paths for invoiceIn summary, descriptor and basicData
|
2021-04-15 18:00:21 +02:00 |
Joan Sanchez
|
2cdafeecf4
|
Added unit tests
|
2021-04-15 14:30:47 +02:00 |
Joan Sanchez
|
bf976a3e8f
|
2729 - Prices popover refactor
|
2021-04-15 14:30:30 +02:00 |
Joan Sanchez
|
bb299a3547
|
Merge pull request '2744-invoiceIn-module_rdy_n_summary' (#602) from 2744-invoiceIn-module_rdy_n_summary into dev
Reviewed-on: #602
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-04-15 10:06:30 +00:00 |
Carlos Jimenez Ruiz
|
2ebd812a1f
|
updated model + translations
|
2021-04-15 11:54:40 +02:00 |
Carlos Jimenez Ruiz
|
41ab1bbe35
|
fixed a test where invoiceIn was nested into the summary
|
2021-04-15 10:50:10 +02:00 |
Carlos Jimenez Ruiz
|
38f43eca3b
|
invoiceIn basicData + index preview of summary
|
2021-04-15 10:47:39 +02:00 |
Carlos Jimenez Ruiz
|
69069d5e28
|
invoiceIn summary frontend
|
2021-04-15 10:46:23 +02:00 |
Carlos Jimenez Ruiz
|
ec378a17ae
|
invoiceIn model updated a summary registered
|
2021-04-15 10:45:27 +02:00 |
Carlos Jimenez Ruiz
|
8faa1531c6
|
summary route + test
|
2021-04-15 10:44:25 +02:00 |
Carlos Jimenez Ruiz
|
5931dd238c
|
Anomalous trigger disabled
|
2021-04-15 10:43:28 +02:00 |
Carlos Jimenez Ruiz
|
d8628379dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary
|
2021-04-14 11:11:40 +02:00 |
Carlos Jimenez Ruiz
|
7e6b7ec491
|
Merge pull request '2878 - Splitted method into activeWithRole and activeWithInheritedRole' (#600) from 2878-activeWorkers_refactor into dev
Reviewed-on: #600
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-04-14 08:17:18 +00:00 |
Carlos Jimenez Ruiz
|
b2ecd7d3c2
|
Merge branch 'dev' into 2878-activeWorkers_refactor
|
2021-04-14 08:15:06 +00:00 |
Carlos Jimenez Ruiz
|
14155ff2ec
|
Merge pull request '2882 - Replaced worker userFk property by user id' (#601) from 2882-subordinate_by_user into dev
Reviewed-on: #601
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-04-14 07:14:17 +00:00 |
Joan Sanchez
|
dac95805e8
|
2882 - Replaced worker userFk property by user id
|
2021-04-14 09:02:08 +02:00 |
Joan Sanchez
|
55b3a048e7
|
Updated E2E
|
2021-04-14 08:49:10 +02:00 |
Joan Sanchez
|
78313bd9a7
|
Updated unit tests
|
2021-04-14 08:15:03 +02:00 |
Joan Sanchez
|
6b8074e32f
|
2878 - Splitted method into activeWithRole and activeWithInheritedRole
|
2021-04-13 14:08:10 +02:00 |
Carlos Jimenez Ruiz
|
8c9ad39762
|
Merge pull request '2483 - Added replyTo param when sending an email to a client' (#597) from 2483-email_replyTo into dev
Reviewed-on: #597
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-04-13 08:57:59 +00:00 |
Carlos Jimenez Ruiz
|
01f0fed0c3
|
Merge branch 'dev' into 2483-email_replyTo
|
2021-04-13 08:41:56 +00:00 |
Joan Sanchez
|
7033ec2c11
|
Added missing translations
|
2021-04-13 10:39:42 +02:00 |
Joan Sanchez
|
7e29c865fc
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-04-12 22:26:30 +02:00 |
Joan Sanchez
|
db81d7d6d4
|
HOTFIX: Notify when ticket doesn't have a team
|
2021-04-12 22:25:55 +02:00 |
Carlos Jimenez Ruiz
|
90a7c803fd
|
descriptor invoiceIn amount
|
2021-04-12 16:32:13 +02:00 |
Carlos Jimenez Ruiz
|
b6f31d7d44
|
invoiceIn descriptor implementation
|
2021-04-12 12:43:17 +02:00 |
Joan Sanchez
|
de769a2565
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-04-12 08:02:35 +02:00 |
Joan Sanchez
|
6eba19a1b7
|
OsTicket notifications
|
2021-04-12 07:48:29 +02:00 |
Carlos Jimenez Ruiz
|
c846b6a170
|
Merge pull request '2815 - Fix ticket without state' (#598) from 2815-ticket_without_state into dev
Reviewed-on: #598
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-04-08 11:56:00 +00:00 |
Carlos Jimenez Ruiz
|
6f0c48847a
|
Merge branch 'dev' into 2815-ticket_without_state
|
2021-04-08 11:53:25 +00:00 |
Carlos Jimenez Ruiz
|
68fa14ca51
|
Merge pull request '2859 - Force translation for SMS' (#599) from 2859-sms_remove_hours into dev
Reviewed-on: #599
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-04-08 11:53:02 +00:00 |
Joan Sanchez
|
af0307a419
|
2859 - Force translation for SMS
|
2021-04-08 13:39:11 +02:00 |
Joan Sanchez
|
418d7a2d12
|
Updated unit test
|
2021-04-07 14:14:31 +02:00 |
Joan Sanchez
|
e40911e833
|
2815 - Fix ticket without state
|
2021-04-07 13:39:36 +02:00 |
Joan Sanchez
|
465955d0c5
|
2483 - Added replyTo param when sending an email to client
|
2021-04-07 13:09:53 +02:00 |
Joan Sanchez
|
f5b95a0c4d
|
Merge pull request '2631 - Notify claim status change to incomplete' (#596) from 2631-notify_incomplete into dev
Reviewed-on: #596
|
2021-04-07 09:54:50 +00:00 |
Carlos Jimenez Ruiz
|
2d041142c3
|
Merge branch 'dev' into 2631-notify_incomplete
|
2021-04-07 09:30:05 +00:00 |
Carlos Jimenez Ruiz
|
fba7d4b1c4
|
Merge pull request '2615-waste_detail' (#595) from 2615-waste_detail into dev
Reviewed-on: #595
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-04-07 09:27:13 +00:00 |
Joan Sanchez
|
1a572ae256
|
Added english translation
|
2021-04-07 11:25:13 +02:00 |
Joan Sanchez
|
93399d6de6
|
Updated description
|
2021-04-07 11:18:44 +02:00 |
Joan Sanchez
|
6c36ab3905
|
Removed back button
|
2021-04-07 10:47:31 +02:00 |
Joan Sanchez
|
d4c6695629
|
2631 - Notify status change to incomplete
|
2021-04-07 07:45:00 +02:00 |
Joan Sanchez
|
65dc0e3780
|
2615 - Waste breakdown
|
2021-04-06 13:46:38 +02:00 |
Joan Sanchez
|
5ef3ff40ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail
|
2021-04-06 09:14:11 +02:00 |
Joan Sanchez
|
a2144405ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-04-02 17:04:37 +02:00 |
Joan Sanchez
|
9bbf43c590
|
Replace http with https
|
2021-04-02 14:34:16 +02:00 |