Joan Sanchez
|
0b704db353
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-02 08:56:19 +02:00 |
Joan Sanchez
|
b68e99b412
|
fix(invoice): invoicing was throwing a transaction error
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3077
|
2021-09-02 08:55:41 +02:00 |
Carlos Jimenez Ruiz
|
f5548a82a3
|
test(clone): invoiceIn clone production trigger broke the test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-01 15:02:27 +02:00 |
Carlos Jimenez Ruiz
|
158c15afa1
|
fix(filter): removed fixtures that no longer work due to structure changes
|
2021-09-01 13:12:32 +02:00 |
Carlos Jimenez Ruiz
|
ec9c061051
|
fix(getUpcomingDeliveries) fixtures were broken due to db structure changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-01 12:37:46 +02:00 |
Joan Sanchez
|
7a98613ef8
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-01 11:48:21 +02:00 |
Joan Sanchez
|
0370cbf207
|
feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3068
|
2021-09-01 11:27:24 +02:00 |
Javi Gallego
|
d4fc64484a
|
fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-31 16:37:09 +02:00 |
Carlos Jimenez Ruiz
|
74a3b5cf89
|
refactor(basicdata): order basicdata requires address and landed to show agencies
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-31 14:10:37 +02:00 |
Carlos Jimenez Ruiz
|
9cdf34642f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-31 13:15:37 +02:00 |
Carlos Jimenez Ruiz
|
88aada2895
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies
|
2021-08-31 13:02:24 +02:00 |
Carlos Jimenez Ruiz
|
614c23fd77
|
refactor(basicdata): order basicdata now shows only available agencies
|
2021-08-31 13:02:14 +02:00 |
Joan Sanchez
|
0de6af5633
|
fix(searchbar): wasn't applying a search by postcode on page refresh
gitea/salix/pipeline/head This commit looks good
Details
Refs: #3072
|
2021-08-31 11:41:42 +02:00 |
Carlos Jimenez Ruiz
|
c00201b236
|
corrected a typo
|
2021-08-31 11:01:14 +02:00 |
Joan Sanchez
|
a0efe5f896
|
Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-31 06:27:23 +00:00 |
Joan Sanchez
|
17a732e811
|
Merge branch 'dev' into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 13:00:02 +00:00 |
Joan Sanchez
|
4dc107bc58
|
Removed console.log()
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 14:51:02 +02:00 |
Joan Sanchez
|
3247f35b90
|
3075 - Show closure hour from an event
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 14:14:21 +02:00 |
Carlos Jimenez Ruiz
|
3e0f2b5c26
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 13:31:57 +02:00 |
Carlos Jimenez Ruiz
|
52e1df2af5
|
removed the usage of niches from item index and summary
|
2021-08-30 13:31:24 +02:00 |
Carlos Jimenez Ruiz
|
8a6da66916
|
removed niche section
|
2021-08-30 13:31:07 +02:00 |
Carlos Jimenez Ruiz
|
e6bc856b35
|
removed niches model, relations and its usages
|
2021-08-30 13:29:16 +02:00 |
Joan Sanchez
|
74dfa9f757
|
3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-30 11:23:46 +02:00 |
Javi Gallego
|
488ef17559
|
insert mail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-27 09:01:21 +02:00 |
Javi Gallego
|
072f88d1a5
|
refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-23 14:47:26 +02:00 |
Javi Gallego
|
cffe25d41f
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-18 12:38:41 +02:00 |
Javi Gallego
|
bb764e206a
|
test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-18 12:36:18 +02:00 |
Javi Gallego
|
d0f0b52b66
|
minor changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-18 08:24:07 +02:00 |
Javi Gallego
|
78a98cd6b7
|
shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-15 08:35:14 +02:00 |
Joan Sanchez
|
23b73aaa41
|
Merge branch 'dev' into 3038-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-13 15:28:58 +00:00 |
Carlos Jimenez Ruiz
|
7a7bbe2ba8
|
more module transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-13 16:46:44 +02:00 |
Carlos Jimenez Ruiz
|
cd334bf967
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions
|
2021-08-13 16:29:15 +02:00 |
Carlos Jimenez Ruiz
|
1a045442d4
|
added acl to goToUser button on client and worker descriptors
|
2021-08-13 14:53:39 +02:00 |
Carlos Jimenez Ruiz
|
e1fe2aa5b5
|
added the claim icon to the ticket summary lines
gitea/salix/pipeline/head Build started...
Details
|
2021-08-13 12:30:22 +02:00 |
Carlos Jimenez Ruiz
|
d5e40320ae
|
removed unwanted console.log
|
2021-08-13 12:29:48 +02:00 |
Javi Gallego
|
249ea918dd
|
Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-13 08:18:34 +02:00 |
Joan Sanchez
|
48e6079527
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-13 08:04:42 +02:00 |
Joan Sanchez
|
4aad4ee2e0
|
3044 - FIX: Load correct tickets on different situations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-12 13:55:10 +02:00 |
Carlos Jimenez Ruiz
|
2b4afdd04d
|
ticket module transactions + tests
|
2021-08-12 11:21:59 +02:00 |
Carlos Jimenez Ruiz
|
708c0035c0
|
deprecated changeWorker as it is no longer in use
|
2021-08-12 11:06:49 +02:00 |
Carlos Jimenez Ruiz
|
2c3f46f394
|
added throw to catch in many tests
|
2021-08-12 10:55:04 +02:00 |
Javi Gallego
|
87fe3c529a
|
Merge branch 'dev' into 2940-invoiceInTax-section
|
2021-08-12 09:39:35 +02:00 |
Javi Gallego
|
92c3a24b1b
|
dash
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-12 09:24:42 +02:00 |
Javi Gallego
|
3b9bdc18bf
|
funciona
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-12 09:23:19 +02:00 |
Javi Gallego
|
54634ed22d
|
test okl
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-12 07:39:26 +02:00 |
Carlos Jimenez Ruiz
|
da7bda2d0e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions
|
2021-08-11 16:06:52 +02:00 |
Joan Sanchez
|
de2bda5284
|
Removed PDF generation from transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-11 08:47:05 +02:00 |
Joan Sanchez
|
6ed0dcc4c5
|
Removed exclusion
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-10 14:28:37 +02:00 |
Joan Sanchez
|
b3db1cda13
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-10 13:57:03 +02:00 |
Joan Sanchez
|
e65e90d00f
|
Global invoicing improvements
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-10 11:48:29 +02:00 |
Carlos Jimenez Ruiz
|
d4c5d54fa8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions
|
2021-08-10 08:29:11 +02:00 |
Javi Gallego
|
d49242751e
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-10 08:23:13 +02:00 |
Javi Gallego
|
3424fabd5b
|
test fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-10 08:18:52 +02:00 |
Joan Sanchez
|
cbaba8a075
|
Ammends
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-09 14:06:23 +02:00 |
Joan Sanchez
|
3a45c99594
|
Merge branch '2985-invoiceOut_manual' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-09 13:00:41 +02:00 |
Joan Sanchez
|
8e84f98629
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global
|
2021-08-09 12:59:00 +02:00 |
Carlos Jimenez Ruiz
|
a9b2e45683
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual
|
2021-08-06 13:30:14 +02:00 |
Carlos Jimenez Ruiz
|
ec6d4b29c1
|
Merge branch 'dev' into 2954-order_catalog_types
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-06 10:48:51 +00:00 |
Joan Sanchez
|
9048ce238e
|
Added translation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-06 12:47:46 +02:00 |
Carlos Jimenez Ruiz
|
7d442c40ec
|
Merge branch 'dev' into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-06 10:39:15 +00:00 |
Joan Sanchez
|
9911a6d6a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-06 12:37:25 +02:00 |
Joan Sanchez
|
9dc1168ad2
|
Transaction refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-06 12:24:36 +02:00 |
Carlos Jimenez Ruiz
|
3432fab6af
|
now shows only the itemType of available items
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-06 11:53:38 +02:00 |
Joan Sanchez
|
886d38ad8a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys
|
2021-08-05 14:33:28 +02:00 |
Joan Sanchez
|
eba39cc706
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-05 13:44:31 +02:00 |
Joan Sanchez
|
1b9ca13391
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-05 13:42:19 +02:00 |
Joan Sanchez
|
d4b1105cda
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-05 13:39:11 +02:00 |
Carlos Jimenez Ruiz
|
870314277f
|
add sale and canbeInvoice refactor + tests
|
2021-08-05 13:32:35 +02:00 |
Carlos Jimenez Ruiz
|
82259eee16
|
added catalog calculate join to show only available item types
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-04 11:48:21 +02:00 |
Carlos Jimenez Ruiz
|
51a8077f4d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-03 11:17:07 +02:00 |
Carlos Jimenez Ruiz
|
3d2de99129
|
vn-popover containing non-descriptor components now relocates correctly for ticket.sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-08-03 11:16:43 +02:00 |
Joan Sanchez
|
41a1b3d909
|
2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-08-02 13:35:38 +02:00 |
Carlos Jimenez Ruiz
|
a771fd584f
|
minor refactors + missing transaction on discount
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-30 10:29:57 +02:00 |
Carlos Jimenez Ruiz
|
9578895f95
|
backend unit tests adapted
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-29 17:40:45 +02:00 |
Carlos Jimenez Ruiz
|
8d682f4e03
|
chat notifications for many sales modifications
|
2021-07-29 17:20:57 +02:00 |
Joan Sanchez
|
c9f235df97
|
Merge branch 'dev' into 3032-ticket_card_components_volume_error
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-28 07:35:28 +00:00 |
Carlos Jimenez Ruiz
|
6e3a18a923
|
removed test for deprecated function
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 18:18:32 +02:00 |
Carlos Jimenez Ruiz
|
88ecaff1d2
|
prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 16:17:47 +02:00 |
Carlos Jimenez Ruiz
|
6d4b97443e
|
autoload refreshes the model when url is set
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-07-27 15:59:59 +02:00 |
Joan Sanchez
|
8b005ae012
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 12:24:45 +02:00 |
Joan Sanchez
|
531937ebbc
|
2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-27 09:07:04 +02:00 |
Carlos Jimenez Ruiz
|
caedfff34e
|
Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-23 15:18:08 +02:00 |
Carlos Jimenez Ruiz
|
b837a8c328
|
fixed a selector for ticket sale
|
2021-07-23 15:17:30 +02:00 |
Carlos Jimenez Ruiz
|
72535f87e1
|
Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-23 12:47:36 +00:00 |
Carlos Jimenez Ruiz
|
abbce74100
|
clone invoiceIn from descriptor
|
2021-07-23 14:06:48 +02:00 |
Carlos Jimenez Ruiz
|
c1162b1b8a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-21 10:07:21 +02:00 |
Carlos Jimenez Ruiz
|
0676eb5f30
|
web access inputs can't be modified together anymore
|
2021-07-21 10:06:50 +02:00 |
Joan Sanchez
|
9d855a80d5
|
3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 12:33:27 +02:00 |
Joan Sanchez
|
f24e7cafce
|
Merge branch 'dev' into 2989-client_debt_sample
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:07:36 +00:00 |
Joan Sanchez
|
1b373503a6
|
Added translation & removed fields property
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 11:07:04 +02:00 |
Joan Sanchez
|
3080936963
|
Merge branch 'dev' into 3025-client_summary_additions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 08:10:42 +00:00 |
Joan Sanchez
|
266ffde86b
|
Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 07:53:56 +00:00 |
Carlos Jimenez Ruiz
|
af321be095
|
Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 07:52:42 +00:00 |
Carlos Jimenez Ruiz
|
4cbaf247ed
|
removed unused showfield in model log
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:33:45 +02:00 |
Joan Sanchez
|
bfd6c995ad
|
2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-20 09:09:46 +02:00 |
Carlos Jimenez Ruiz
|
0163b6c21b
|
added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 15:59:39 +02:00 |
Carlos Jimenez Ruiz
|
e784403fd4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3027-itemBotanical_deprecated_column
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 14:46:32 +02:00 |
Carlos Jimenez Ruiz
|
29f1f7e89e
|
itemTaxCountry and item bonanical no longer use the bonanical prop
|
2021-07-19 14:46:18 +02:00 |
Joan Sanchez
|
63b502b368
|
Updated model ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 13:01:06 +02:00 |
Joan Sanchez
|
e9b6c6b63e
|
3026 - Send invoice PDF
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 12:31:09 +02:00 |
Carlos Jimenez Ruiz
|
e5b1f47478
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 11:20:38 +02:00 |
Joan Sanchez
|
94b668c01e
|
Filter item from a dialog
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-15 13:41:29 +02:00 |
Javi Gallego
|
ee30bc9e1e
|
test fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-15 12:51:10 +02:00 |
Carlos Jimenez Ruiz
|
559eaf5853
|
the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 11:22:04 +02:00 |
Carlos Jimenez Ruiz
|
9f5df91be4
|
workers without active contract no longer set calendar and timeControl at fault
|
2021-07-14 11:21:29 +02:00 |
Joan Sanchez
|
ff71e6f2c7
|
2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 11:14:53 +02:00 |
Joan Sanchez
|
675a48d8ad
|
Merge branch 'dev' into 3018-time_control_info
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 08:36:09 +00:00 |
Carlos Jimenez Ruiz
|
ae4f1d1730
|
the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 10:09:24 +02:00 |
Javi Gallego
|
c509509963
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-14 07:57:22 +02:00 |
Joan Sanchez
|
4eabba115f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-13 11:21:26 +02:00 |
Joan Sanchez
|
ea78db1441
|
3012 - Hotfix: Get ticket list
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-13 08:59:36 +02:00 |
Javi Gallego
|
3ec8d4583f
|
bug
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:29:53 +02:00 |
Javi Gallego
|
2f265760b4
|
permisos invoceInTax
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:27:36 +02:00 |
Carlos Jimenez Ruiz
|
98a691c152
|
minor changes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 15:00:20 +02:00 |
Carlos Jimenez Ruiz
|
1835171fe8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-more_module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 13:56:58 +02:00 |
Carlos Jimenez Ruiz
|
21e34de1dd
|
item module transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 12:54:59 +02:00 |
Carlos Jimenez Ruiz
|
dd3473b93d
|
small refactors correcting constants and adding transactions
|
2021-07-12 12:50:15 +02:00 |
Joan Sanchez
|
c0d75e20d8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 08:32:11 +02:00 |
Joan Sanchez
|
878e989c02
|
HOTFIX: Disable address without a province
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-12 08:29:21 +02:00 |
Carlos Jimenez Ruiz
|
3b2b4e3819
|
client module changes for transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-08 15:53:30 +02:00 |
Javi Gallego
|
3ca2dd820d
|
Merge branch 'dev' into 2940-invoiceInTax-section
|
2021-07-08 08:20:30 +02:00 |
Javi Gallego
|
d57c71dba7
|
minor fix
|
2021-07-08 08:19:30 +02:00 |
Carlos Jimenez Ruiz
|
10c7aa70d6
|
claim module transactions for filter, summary and isEditable
|
2021-07-05 12:00:49 +02:00 |
Javi Gallego
|
2ec2a89f88
|
test ok
|
2021-07-03 09:19:03 +02:00 |
Joan Sanchez
|
ae091a3b11
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 14:41:45 +02:00 |
Joan Sanchez
|
35e3c8ce65
|
HOTFIX: 3009 - Unlock report button
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 14:35:24 +02:00 |
Joan Sanchez
|
48730be203
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 14:12:37 +02:00 |
Joan Sanchez
|
057d138991
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-07-02 13:44:44 +02:00 |
Joan Sanchez
|
4849355c9b
|
Changed limit value
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 13:22:37 +02:00 |
Joan Sanchez
|
9ad54b9622
|
HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 13:17:48 +02:00 |
Joan Sanchez
|
eeb9a1861e
|
HOTFIX: Added pagination
|
2021-07-02 13:10:46 +02:00 |
Joan Sanchez
|
249f5074df
|
Show client id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-02 10:57:17 +02:00 |
Carlos Jimenez Ruiz
|
d20b717c1b
|
tested controller modifications accordingly
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 16:19:59 +02:00 |
Carlos Jimenez Ruiz
|
0c71b915ca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2967-zone_deliverydays_keep_search_on_url
|
2021-07-01 15:04:45 +02:00 |
Carlos Jimenez Ruiz
|
03b1ab0166
|
Merge branch 'dev' into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 12:30:54 +00:00 |
Joan Sanchez
|
3246101574
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 14:03:28 +02:00 |
Joan Sanchez
|
319a168b89
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:43:13 +02:00 |
Joan Sanchez
|
92b6318c79
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:31:04 +02:00 |
Joan Sanchez
|
79f20a404d
|
Merge branch 'dev' into 3003-worker_sections_without_contract_faults
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 11:18:15 +00:00 |
Carlos Jimenez Ruiz
|
be850571d9
|
updated the field name
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 13:14:36 +02:00 |
Carlos Jimenez Ruiz
|
243636ccf6
|
item category name as category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 12:34:30 +02:00 |
Carlos Jimenez Ruiz
|
8cf2b241cd
|
route delivery days now gets params from url
|
2021-07-01 12:08:48 +02:00 |
Carlos Jimenez Ruiz
|
3ea2772e1e
|
Merge branch 'dev' into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 09:54:57 +00:00 |
Joan Sanchez
|
c8bfc911c2
|
2974 - Get amount unpaid from customer_risk
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-01 08:33:56 +02:00 |
Joan Sanchez
|
7e836e570f
|
2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 16:10:26 +02:00 |
Joan Sanchez
|
d30a3490fe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 15:21:47 +02:00 |
Carlos Jimenez Ruiz
|
4148500c61
|
workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 14:05:16 +02:00 |
Carlos Jimenez Ruiz
|
d946750113
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 10:48:27 +02:00 |
Carlos Jimenez Ruiz
|
2469540f66
|
item category filter is now working again
|
2021-06-30 10:48:19 +02:00 |
Javi Gallego
|
9054aa0885
|
Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-30 08:30:40 +02:00 |
Javi Gallego
|
9371c49922
|
cambios solicitados
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-30 08:26:03 +02:00 |
Joan Sanchez
|
33d03c8f21
|
Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-30 06:15:05 +00:00 |
Carlos Jimenez Ruiz
|
08360bfdc4
|
deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 18:01:33 +02:00 |
Carlos Jimenez Ruiz
|
15c7c0cb4b
|
read acl set on the model
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 15:31:58 +02:00 |
Carlos Jimenez Ruiz
|
a51494e784
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2949-client_basicdata_businesstype
|
2021-06-29 15:03:56 +02:00 |
Carlos Jimenez Ruiz
|
01a9154015
|
Merge branch 'dev' into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:23:47 +00:00 |
Carlos Jimenez Ruiz
|
d67e36212f
|
added validation for the dms id field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 11:59:21 +02:00 |
Carlos Jimenez Ruiz
|
f30cd1aeda
|
added business type to client basic data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:51:27 +02:00 |
Carlos Jimenez Ruiz
|
f3193f0dc1
|
added businesType model and relation to client
|
2021-06-29 10:51:01 +02:00 |
Javi Gallego
|
59fac7edfa
|
fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 10:33:01 +02:00 |
Javi Gallego
|
e217f02321
|
test front
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-29 08:59:55 +02:00 |
Carlos Jimenez Ruiz
|
8ca3e0d120
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 16:45:19 +02:00 |
Carlos Jimenez Ruiz
|
e2ff3ff17f
|
validation message for dup entry
|
2021-06-28 13:30:49 +02:00 |
Joan Sanchez
|
c6504140af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 12:23:11 +02:00 |
Joan Sanchez
|
52e6c9d793
|
CSS fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 12:06:21 +02:00 |
Carlos Jimenez Ruiz
|
0e47cf72e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
|
2021-06-28 11:19:07 +02:00 |
Carlos Jimenez Ruiz
|
e054145b49
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2996-route_tickets_recalc
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 10:44:19 +02:00 |
Carlos Jimenez Ruiz
|
32d0aa4e10
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 10:17:30 +02:00 |
Carlos Jimenez Ruiz
|
e9bcddc29f
|
invoice modules transactions and tests
|
2021-06-28 10:15:54 +02:00 |
Joan Sanchez
|
65ac3fc205
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:58:27 +02:00 |
Joan Sanchez
|
66a2563552
|
Added line break
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-28 08:48:35 +02:00 |
Joan Sanchez
|
e7dcb54efb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:33:41 +02:00 |
Joan Sanchez
|
ef9f3b13e4
|
html fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-28 08:28:31 +02:00 |
Carlos Jimenez Ruiz
|
8b9bfb4ba0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 10:12:52 +02:00 |
Carlos Jimenez Ruiz
|
832452df95
|
ticketDms import
|
2021-06-25 10:12:41 +02:00 |
Carlos Jimenez Ruiz
|
2548fdc891
|
#3000 add buyer to ticket isEditable
|
2021-06-25 09:46:18 +02:00 |
Javi Gallego
|
02cd2283a7
|
summary total
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 09:30:24 +02:00 |
Javi Gallego
|
82e65ec1c3
|
rellena campo rate
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-25 07:47:53 +02:00 |
Joan Sanchez
|
0941b2423e
|
2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 13:33:51 +02:00 |
Joan Sanchez
|
db30ac3175
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 11:40:23 +02:00 |
Carlos Jimenez Ruiz
|
3bfc08b117
|
route.summary order by priority
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 10:06:31 +02:00 |
Carlos Jimenez Ruiz
|
320c04b2d3
|
update volume is not called when add/remove tickets from route
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 09:54:07 +02:00 |
Joan Sanchez
|
362c404aba
|
Css fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-24 09:16:59 +02:00 |
Carlos Jimenez Ruiz
|
6aae09f070
|
front unit tests final amend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 14:21:48 +02:00 |
Carlos Jimenez Ruiz
|
2da72fc993
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
|
2021-06-23 14:20:12 +02:00 |
Carlos Jimenez Ruiz
|
12c9f3fd7d
|
Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
|
2021-06-23 14:18:23 +02:00 |
Joan Sanchez
|
b2feb5227c
|
Merge branch 'dev' into 2974-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-23 12:15:36 +00:00 |
Carlos Jimenez Ruiz
|
029b2f2fdd
|
Merge branch 'dev' into 2955-entry_summary_show_receved_sent
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-23 12:12:37 +00:00 |
Carlos Jimenez Ruiz
|
9389bbf779
|
front unit tests fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:32:23 +02:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-23 13:24:23 +02:00 |
Carlos Jimenez Ruiz
|
c88033a69d
|
deprecated listWorkers endpoint as it was not in use
|
2021-06-23 13:22:35 +02:00 |
Joan Sanchez
|
deaade92b0
|
Shortened packing type
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 14:27:45 +02:00 |
Joan Sanchez
|
256203944e
|
HOTFIX: Prevent error on tickets without state
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 14:11:33 +02:00 |
Joan Sanchez
|
a1b4164b5d
|
2974 - Client balance default company and fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 13:57:32 +02:00 |
Joan Sanchez
|
79296ac857
|
2974 - Client balance default company and fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 11:57:43 +02:00 |
Carlos Jimenez Ruiz
|
565f343e19
|
added isDelivered, isReceived and removed travel descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-22 09:39:33 +02:00 |
Carlos Jimenez Ruiz
|
0421fd8828
|
back end unit tests for zone endpoints
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-21 15:04:23 +02:00 |
Carlos Jimenez Ruiz
|
b651fdebe6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
|
2021-06-21 14:35:01 +02:00 |
Joan Sanchez
|
8c0171096f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-21 09:19:00 +00:00 |
Carlos Jimenez Ruiz
|
48a2bb7b10
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
|
2021-06-21 09:08:03 +02:00 |