Alex Moreno
|
7880fb8de9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 14:54:15 +01:00 |
Alex Moreno
|
f34130cbd7
|
feat(invoiceOut): separate index.js and jest test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 14:48:17 +01:00 |
Carlos Jimenez Ruiz
|
717ea60084
|
Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 13:40:56 +00:00 |
Vicent Llopis
|
d3ff60719c
|
fix(last-entries): dateFrom -75 days
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 12:34:56 +01:00 |
Vicent Llopis
|
0849f40df7
|
feat: update backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 11:44:29 +01:00 |
Carlos Jimenez Ruiz
|
d8c3113adc
|
Merge branch 'dev' into 3308-supplier_basic-data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 09:57:06 +00:00 |
Alex Moreno
|
2ca48f2ae0
|
refactor(supplier): remove console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 10:48:05 +01:00 |
Carlos Jimenez Ruiz
|
766d9c6464
|
Merge branch 'dev' into 3319-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 09:38:54 +00:00 |
Vicent Llopis
|
18aec14fe9
|
update backTest
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 08:46:09 +01:00 |
Alex Moreno
|
119d5e45b9
|
feat(supplier): add checkbox isPayMethodChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-10 08:43:25 +01:00 |
Alex Moreno
|
a52c06057f
|
feat(invoiceOut): separate descriptor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-09 15:10:43 +01:00 |
Vicent Llopis
|
833822978a
|
feat(client_balance): test e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 14:36:39 +01:00 |
Carlos Jimenez Ruiz
|
469c544536
|
item.index default columns and filter with like
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-09 11:47:54 +01:00 |
Alex Moreno
|
0aa0358b50
|
refactor(events): name of variable
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 10:21:28 +01:00 |
Alex Moreno
|
f45db68e0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 10:10:20 +01:00 |
Alex Moreno
|
da80fee0e2
|
refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 10:09:44 +01:00 |
Carlos Jimenez Ruiz
|
345be297f0
|
Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 08:26:41 +00:00 |
Alex Moreno
|
7009cc0cc0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 08:40:42 +01:00 |
Alex Moreno
|
9ab51fc21f
|
feat(eventsFiltered): add backTest & refactor zone
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-09 08:39:20 +01:00 |
Carlos Jimenez Ruiz
|
e4ea05fd07
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-08 17:46:50 +01:00 |
Carlos Jimenez Ruiz
|
262e46d7c9
|
added autocompletes to item index
|
2021-11-08 17:46:40 +01:00 |
Vicent Llopis
|
395ad1c76d
|
fix(ibanRequired): set different ibanRequired for Client and Supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 15:04:33 +01:00 |
Joan Sanchez
|
eb36f86b9d
|
Added smart-table to item index
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-08 14:46:23 +01:00 |
Alex Moreno
|
9e4627617d
|
fix(time-control): modify select & refactor dates
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 14:08:44 +01:00 |
Joan Sanchez
|
2bf7250117
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 13:40:22 +01:00 |
Joan Sanchez
|
a48617e267
|
Group first
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 13:39:12 +01:00 |
Vicent Llopis
|
bfbc9b50c4
|
feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 13:02:42 +01:00 |
Joan Sanchez
|
7dc95b8cbf
|
Group first
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 12:50:13 +01:00 |
Alex Moreno
|
9c877ceb7a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-08 11:31:26 +01:00 |
Alex Moreno
|
6e2f7d9e0d
|
feat(events): get range date of calendar
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-08 11:30:00 +01:00 |
Vicent Llopis
|
fbbb1ecdf6
|
feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-08 08:59:42 +01:00 |
Carlos Jimenez Ruiz
|
8fff96ca05
|
Merge branch 'dev' into 3295-claim_search-panel
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-08 07:54:10 +00:00 |
Alex Moreno
|
3324f4acd2
|
fix(zone): back remoteMethod
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-04 07:56:12 +01:00 |
Alex Moreno
|
bb0745532b
|
fix(claim): salesPersonFk where add officeBoss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-02 11:24:52 +01:00 |
Alex Moreno
|
b01298ed17
|
feat(entry_descriptor): add supplier button
gitea/salix/pipeline/head This commit looks good
Details
|
2021-11-02 08:25:43 +01:00 |
Alex Moreno
|
b2dd9e6076
|
feat(zone): filter calendar
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-11-02 07:55:35 +01:00 |
Carlos Jimenez Ruiz
|
04a31f4cff
|
vn table now receives show buttons options
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-10-29 16:55:19 +02:00 |
Carlos Jimenez Ruiz
|
11f24372e5
|
autocomplete options added to smart table
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-10-29 15:52:04 +02:00 |
Carlos Jimenez Ruiz
|
89b7f5ed7a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-10-28 13:46:41 +02:00 |
Joan Sanchez
|
dfb2b0b3d8
|
Updated checked property
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-10-28 09:09:52 +02:00 |
Joan Sanchez
|
bfc9228eef
|
Restored ticket table and added table compatibility on contextmenu
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-28 09:06:03 +02:00 |
Carlos Jimenez Ruiz
|
b27a443729
|
show/hide columns and load default view
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 17:11:33 +02:00 |
Vicent Llopis
|
cd6f0057a1
|
test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 13:41:59 +02:00 |
Vicent Llopis
|
b1b6d93c8e
|
change column value : checkbox for text
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 13:39:38 +02:00 |
Vicent Llopis
|
f60fa5a852
|
change receiver to requesterId
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 12:22:32 +02:00 |
Vicent Llopis
|
d94e2900d0
|
feat(ticket-request): send rocket message when ticket-reques is denied
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 12:16:37 +02:00 |
Alex Moreno
|
21686b4a92
|
feat(test): modify jest test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-27 09:55:35 +02:00 |
Carlos Jimenez Ruiz
|
c976f1ed07
|
multiple search by column feature
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-26 17:16:01 +02:00 |
Alex Moreno
|
92b916580e
|
feat(description): concat bank with tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-26 10:20:35 +02:00 |
Joan Sanchez
|
bf386929d3
|
Deletion ammends and selection fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-25 17:18:57 +02:00 |
Carlos Jimenez Ruiz
|
7ce58c5f33
|
sorting arrows for multiple columns
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-25 14:20:17 +02:00 |
Carlos Jimenez Ruiz
|
f62814e81e
|
refactor(order): catalogFilter, confirm and filter transactions
|
2021-10-25 13:13:05 +02:00 |
Joan Sanchez
|
6578a498ca
|
feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3254
|
2021-10-25 12:13:33 +02:00 |
Joan Sanchez
|
66830f32fd
|
feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3254
|
2021-10-25 11:58:23 +02:00 |
Joan Sanchez
|
d5264486c7
|
Simplified to one component
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-23 14:26:42 +02:00 |
Carlos Jimenez Ruiz
|
13c06bf5be
|
refactor(monitors): added transactions to endpoints
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-22 17:32:10 +02:00 |
Joan Sanchez
|
e6304d026c
|
feat(smart-table): added smart-table and smart-table-menu components
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-22 15:01:54 +02:00 |
Joan Sanchez
|
2cdc22bc4d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-22 11:46:16 +02:00 |
Joan Sanchez
|
aa27ebffc9
|
renamed method
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-22 10:47:44 +02:00 |
Joan Sanchez
|
8a679b2c8b
|
fix(invoice): fixed error for invoice with incoterms
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-22 10:26:40 +02:00 |
Carlos Jimenez Ruiz
|
683f01ddd8
|
refactor(zone): removed deprecated column m3Max
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-21 13:19:41 +02:00 |
Carlos Jimenez Ruiz
|
14a72b32bd
|
refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max
|
2021-10-21 11:37:09 +02:00 |
Carlos Jimenez Ruiz
|
5ea014aeff
|
feat(monitors): added auto-refresh feature to ticket monitors
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-20 15:42:09 +02:00 |
Carlos Jimenez Ruiz
|
1c51d34f7d
|
feat(monitors): added auto-refresh feature to ticket monitors
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-20 14:40:08 +02:00 |
Vicent Llopis
|
601d358b51
|
refactor(entry_summary): ident a line
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-20 10:02:03 +02:00 |
Vicent Llopis
|
f6de57a9b5
|
Merge branch '3235-entry_summary' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-20 07:50:55 +02:00 |
Vicent Llopis
|
4a5cf187a5
|
refactor(entry_summary): ident a line
|
2021-10-20 07:50:51 +02:00 |
Carlos Jimenez Ruiz
|
97242031eb
|
Merge branch 'dev' into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-19 14:43:06 +00:00 |
Vicent Llopis
|
1ba7f16ad3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-19 14:53:54 +02:00 |
Alex Moreno
|
b4986b619a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3105-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-19 14:50:39 +02:00 |
Carlos Jimenez Ruiz
|
5be2eb974f
|
refactor(test): adapted the new thermograph front unit test to expect thermograph data to be defined
|
2021-10-19 11:08:03 +02:00 |
Carlos Jimenez Ruiz
|
e3942c0bb9
|
refactor(thermograph): empty fields handler added and correct usage of thermograph.code
|
2021-10-19 10:58:58 +02:00 |
Alex Moreno
|
1cb0cda3a8
|
fix(sale): delete :: in image
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-19 10:26:00 +02:00 |
Carlos Jimenez Ruiz
|
b41a0bd849
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-19 09:57:45 +02:00 |
Vicent Llopis
|
788bd76014
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-19 07:34:53 +02:00 |
Carlos Jimenez Ruiz
|
fa067f94d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 16:55:28 +02:00 |
Vicent Llopis
|
40ab2ce5bc
|
feat(entry_summary): add reference
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 14:00:59 +02:00 |
Alex Moreno
|
44f174103c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 12:12:17 +02:00 |
Carlos Jimenez Ruiz
|
cec04a307d
|
refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 12:05:38 +02:00 |
Vicent Llopis
|
e61e74ed36
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 10:27:59 +02:00 |
Alex Moreno
|
bf100f339e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 10:22:53 +02:00 |
Joan Sanchez
|
ee1a7952ad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-18 09:44:27 +02:00 |
Carlos Jimenez Ruiz
|
ace1c9c84b
|
fix(transaction): priceDifference now commits its created transaction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 16:02:50 +02:00 |
Carlos Jimenez Ruiz
|
c4c1aa929a
|
refactor(endpoints): corrected indentation and removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 16:00:50 +02:00 |
Carlos Jimenez Ruiz
|
de7af0fee2
|
fix(transaction): priceDifference now commits its created transaction
|
2021-10-15 15:59:59 +02:00 |
Carlos Jimenez Ruiz
|
270b2802c8
|
refactor(transactions): added transaction to sendChechingPresence and corrected a typo
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 15:31:13 +02:00 |
Carlos Jimenez Ruiz
|
05df98939b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 14:47:34 +02:00 |
Carlos Jimenez Ruiz
|
580ba36357
|
refactor(jasmine): usage of done on async functions is deprecated
|
2021-10-15 14:45:41 +02:00 |
Joan Sanchez
|
d5cf57fbb1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-15 14:07:48 +02:00 |
Joan Sanchez
|
b6a9896cba
|
Fixed monitor problems filter
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 12:10:28 +02:00 |
Joan Sanchez
|
85b4730c6c
|
feat(monitor): show client risk to future on tickets
gitea/salix/pipeline/head This commit looks good
Details
Refs: 2624
|
2021-10-15 10:49:23 +02:00 |
Vicent Llopis
|
6d05b046e8
|
feat(last-entries): add dateTo & delete style.scss
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-15 10:34:32 +02:00 |
Carlos Jimenez Ruiz
|
99043bd94e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-14 16:21:55 +02:00 |
Carlos Jimenez Ruiz
|
b81d6b022c
|
refactor(buy): removed width limit for a column that was breaking e2e behavior
|
2021-10-14 16:18:04 +02:00 |
Carlos Jimenez Ruiz
|
35a2a71602
|
refactor(sales): transaction correctly passed to findById
|
2021-10-14 16:16:00 +02:00 |
Joan Sanchez
|
e278491ad2
|
refactor(order): index filter optimization
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-14 08:48:57 +02:00 |
Joan Sanchez
|
d06385fc73
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-13 15:09:34 +02:00 |
Joan Sanchez
|
c0e1f2f0dc
|
Changed column order
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-13 14:55:53 +02:00 |
Joan Sanchez
|
1b9b918812
|
Fixed format
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-13 14:29:11 +02:00 |
Joan Sanchez
|
b2cdfd9785
|
Removed empty spaces
|
2021-10-13 14:29:01 +02:00 |
Joan Sanchez
|
31e160559b
|
fix(salesMonitor): now sorts correctly by practical and theorical hour
Refs: 3219
|
2021-10-13 14:28:50 +02:00 |
Joan Sanchez
|
d951ca02f0
|
Fixed format
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-13 14:21:42 +02:00 |
Joan Sanchez
|
491cca2bd6
|
Removed empty spaces
gitea/salix/pipeline/head Build queued...
Details
|
2021-10-13 14:19:29 +02:00 |
Joan Sanchez
|
a0a01de937
|
fix(salesMonitor): now sorts correctly by practical and theorical hour
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3219
|
2021-10-13 14:17:45 +02:00 |
Alex Moreno
|
1684c1bf87
|
feat(diary): modify sql item_getBalance
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-13 14:03:06 +02:00 |
Alex Moreno
|
a8f8248c41
|
feat(diary): Add column claim
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-13 12:33:48 +02:00 |
Joan Sanchez
|
e641a947b3
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-08 09:51:42 +02:00 |
Joan Sanchez
|
e6b60d73f1
|
Added unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-07 13:36:23 +02:00 |
Joan Sanchez
|
4610ed83d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-10-07 10:28:06 +02:00 |
Joan Sanchez
|
82a14088d0
|
Added options to invoiceOut
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-10-07 10:04:50 +02:00 |
Carlos Jimenez Ruiz
|
8e05301792
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-07 09:58:32 +02:00 |
Carlos Jimenez Ruiz
|
cb7d1b24e8
|
refactor(ticket): all ticket endpoints are using transactions now
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-07 09:57:07 +02:00 |
Javi Gallego
|
2dee9fec20
|
falta test checkToBook
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-05 11:19:48 +02:00 |
Joan Sanchez
|
3d57e9a618
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-05 08:13:13 +02:00 |
Joan Sanchez
|
1ff3e1f429
|
Increased date range from +10 to +60 days
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-05 08:12:25 +02:00 |
Joan Sanchez
|
b299efa63e
|
Changed zone_getShippedWarehouse() to zone_getShipped()
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-04 14:58:38 +02:00 |
Joan Sanchez
|
bb4a32293d
|
Changed zone_getShippedWarehouse() to zone_getShipped()
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-04 14:45:39 +02:00 |
Carlos Jimenez Ruiz
|
0b46e9ce35
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-04 10:21:09 +02:00 |
Joan Sanchez
|
6b59bdd01c
|
fix(descriptorMenu): show PDF regeneration option
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-04 10:19:53 +02:00 |
Carlos Jimenez Ruiz
|
a61a7f7d49
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-04 09:37:27 +02:00 |
Joan Sanchez
|
495b06b932
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-04 09:37:15 +02:00 |
Joan Sanchez
|
b3a34489b0
|
fix(calendar): Event colors were not showing properly
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3166
|
2021-10-04 09:30:55 +02:00 |
Carlos Jimenez Ruiz
|
16b27c2074
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-04 09:23:28 +02:00 |
Joan Sanchez
|
580231d30b
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-01 14:59:12 +02:00 |
Joan Sanchez
|
313db4960e
|
refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
|
2021-10-01 14:59:08 +02:00 |
Joan Sanchez
|
68178bdb1f
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-01 14:48:25 +02:00 |
Joan Sanchez
|
f60c754c59
|
refactor(invoice): Show generate PDF option if it was never generated before
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: 3162
|
2021-10-01 14:31:42 +02:00 |
Joan Sanchez
|
1ec20e250c
|
feat(invoice): Send invoice and delivery-note on CSV format
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-10-01 12:41:31 +02:00 |
Joan Sanchez
|
1c8bb35eae
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-01 11:41:55 +02:00 |
Joan Sanchez
|
3df03b31a3
|
fix(invoice): invalid date for PDF storage
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-01 10:56:40 +02:00 |
Joan Sanchez
|
c80457142f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-01 08:18:56 +02:00 |
Joan Sanchez
|
a41ae85226
|
Removed PDF creation on download
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-01 08:11:26 +02:00 |
Joan Sanchez
|
26df12a70a
|
fix(invoice): fixed pdf generation condition race
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-30 15:28:34 +02:00 |
Joan Sanchez
|
54fa419255
|
fix(invoice): was storing invoices on incorrect path folder
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-30 14:43:37 +02:00 |
Joan Sanchez
|
479d4892ce
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-29 12:23:55 +02:00 |
Joan Sanchez
|
a7c75fcbd4
|
fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
|
2021-09-29 12:23:47 +02:00 |
Joan Sanchez
|
458d2670b3
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-29 12:17:21 +02:00 |
Joan Sanchez
|
197ed2009f
|
fix(invoicePdf): Create PDF document on invoice download
gitea/salix/pipeline/head There was a failure building this commit
Details
Refs: 3109, 3110
|
2021-09-29 12:15:42 +02:00 |
Carlos Jimenez Ruiz
|
156ecb32ec
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-29 08:27:53 +02:00 |
Carlos Jimenez Ruiz
|
392c4dcba3
|
refactor(sale): ticket.sale endpoints now use transactions
|
2021-09-29 08:27:18 +02:00 |
Carlos Jimenez Ruiz
|
e690febc7f
|
refactor(updateAll): usage of documented methods as update alias is not documented in loopback
|
2021-09-29 08:26:10 +02:00 |
Carlos Jimenez Ruiz
|
6cf1737c0d
|
refactor(thermograph): temperature column now displays the correct data
|
2021-09-28 11:59:04 +02:00 |
Javi Gallego
|
4f1fd5412d
|
faltan test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-09-28 10:57:51 +02:00 |
Joan Sanchez
|
06b49f36b6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-28 10:03:00 +02:00 |
Joan Sanchez
|
19d3b19e5a
|
Updated translation
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-28 09:59:00 +02:00 |
Joan Sanchez
|
ee0e1e122b
|
Removed crudModel default params
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 13:02:20 +02:00 |
Joan Sanchez
|
4ea0f92c35
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 12:54:22 +02:00 |
Joan Sanchez
|
4545a5c8fa
|
fix(filter): single search results don't use scopeDates
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 12:51:20 +02:00 |
Carlos Jimenez Ruiz
|
8c446edc9e
|
Merge branch 'dev' into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 08:02:19 +00:00 |
Carlos Jimenez Ruiz
|
c6692ca951
|
Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 07:54:50 +00:00 |
Carlos Jimenez Ruiz
|
5f0e2825b8
|
Merge branch 'dev' into 3059-ticket_index_filter
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 07:46:09 +00:00 |
Carlos Jimenez Ruiz
|
7369f4aa54
|
Merge branch 'dev' into 3010-send_invoice
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 07:44:24 +00:00 |
Carlos Jimenez Ruiz
|
14b92e530a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-24 09:37:37 +02:00 |
Javi Gallego
|
e5c9ea850b
|
testback done
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-09-24 08:24:34 +02:00 |
Carlos Jimenez Ruiz
|
8fc17f05c6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-23 17:35:07 +02:00 |
Carlos Jimenez Ruiz
|
368f54b872
|
refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-23 17:19:47 +02:00 |
Carlos Jimenez Ruiz
|
f74d2cc302
|
test(tags): moved code used on a single test to the correct place
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-22 15:16:45 +02:00 |
Carlos Jimenez Ruiz
|
95ff46db09
|
refactor(buys): entry buys now show item.subName
|
2021-09-22 15:15:52 +02:00 |
Carlos Jimenez Ruiz
|
23ba5657c5
|
refactor(sales): ticket sales now shows item.subName
|
2021-09-22 15:14:29 +02:00 |
Carlos Jimenez Ruiz
|
c971d3ee01
|
refactor(consumption): client consuption now shows item.subName
|
2021-09-22 15:13:29 +02:00 |
Javi Gallego
|
40e589203e
|
test fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-22 07:42:58 +02:00 |
Carlos Jimenez Ruiz
|
aae54b5707
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-21 18:49:35 +02:00 |
Carlos Jimenez Ruiz
|
cc90a08f03
|
refactor(ticket): ticket endpoins now can receive transactions
|
2021-09-21 18:48:59 +02:00 |
Joan Sanchez
|
08cba0a9c8
|
fix(filter): search limit by date range was not being applied
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3059
|
2021-09-21 15:49:59 +02:00 |
Javi Gallego
|
3365eadf5e
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
|
2021-09-21 14:02:07 +02:00 |
Joan Sanchez
|
6e89fa1b5e
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-21 12:56:49 +02:00 |
Joan Sanchez
|
689662f9bb
|
fix code duplication
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-21 12:48:51 +02:00 |
Carlos Jimenez Ruiz
|
95b4d23599
|
added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-21 12:39:54 +02:00 |
Joan Sanchez
|
786589f214
|
fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3093
|
2021-09-21 12:25:22 +02:00 |
Joan Sanchez
|
cd478a9f7b
|
Removed line break
|
2021-09-20 14:02:04 +02:00 |
Joan Sanchez
|
369b79c6af
|
refactor(invoice): removed unnecessary class
gitea/salix/pipeline/head Build queued...
Details
|
2021-09-20 14:01:40 +02:00 |
Joan Sanchez
|
a0ac55bc3e
|
refactor(invoice): send invoice to specific email address from descriptor option
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3010
|
2021-09-20 13:59:57 +02:00 |
Joan Sanchez
|
e07e8ec658
|
Merge branch 'dev' into 2389-calendar_weeks
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-20 08:11:21 +00:00 |
Joan Sanchez
|
7223344aa0
|
Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #736
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-09-17 09:59:29 +00:00 |
Joan Sanchez
|
01db0f6ece
|
Merge branch 'dev' into 3081-newbankentity_component_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-17 07:47:25 +00:00 |
Carlos Jimenez Ruiz
|
b3c70de6e0
|
Merge branch 'dev' into 3093-fix_dup_tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-17 07:38:12 +00:00 |
Carlos Jimenez Ruiz
|
183fe85e07
|
Merge branch 'dev' into 3086-monitor_index_hours
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-17 07:22:12 +00:00 |
Joan Sanchez
|
079f99ca0d
|
fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3093
|
2021-09-17 08:50:22 +02:00 |
Joan Sanchez
|
4494522ad1
|
feat(calendar): component shows now the year week numbers
gitea/salix/pipeline/head This commit looks good
Details
Refs: 2389
|
2021-09-16 12:13:20 +02:00 |
Carlos Jimenez Ruiz
|
34038b885c
|
refactor(newBankEntity): client.billingData and supplier.account refactor to use newBankEntity Dialog
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-15 17:58:58 +02:00 |
Carlos Jimenez Ruiz
|
d8a2302b18
|
refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component
|
2021-09-15 13:25:26 +02:00 |
Carlos Jimenez Ruiz
|
6e67dd408e
|
prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-13 10:29:35 +02:00 |
Joan Sanchez
|
b0d291e49c
|
Fixed error for clients without a previous credit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-09 16:44:15 +02:00 |
Carlos Jimenez Ruiz
|
f7e2dd25e4
|
refactor(monitors): added column practicalHour to tickets monitor and renamed two columns
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-09 16:07:46 +02:00 |
Carlos Jimenez Ruiz
|
46b59473a3
|
refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures
|
2021-09-09 16:06:44 +02:00 |
Joan Sanchez
|
e8792d5686
|
refactor(client): added restriction to change the credit amount from zero set by a manager
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3087
|
2021-09-09 14:43:18 +02:00 |
Carlos Jimenez Ruiz
|
76c55cb551
|
Merge branch 'dev' into 3049-item_index_show_lastbuy_landed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 09:27:23 +00:00 |
Carlos Jimenez Ruiz
|
8370b5dc1d
|
refactor(fiscaldata): isTaxDataChecked checkbox no longer disabled by businessType presence
|
2021-09-08 11:03:58 +02:00 |
Javi Gallego
|
8160912fe7
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 10:41:26 +02:00 |
Carlos Jimenez Ruiz
|
0472deb9b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3049-item_index_show_lastbuy_landed
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 10:40:07 +02:00 |
Carlos Jimenez Ruiz
|
538805828e
|
refactor(item): item index now shows last buy landing
|
2021-09-08 10:39:54 +02:00 |
Carlos Jimenez Ruiz
|
398e79c069
|
Merge branch 'dev' into 3065-client_businessTypeFk_required
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 07:55:55 +00:00 |
Javi Gallego
|
2fe4fad28a
|
test front ok
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 09:44:46 +02:00 |
Joan Sanchez
|
903caef155
|
fix(path): Was not showing the old inactive client
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 08:39:37 +02:00 |
Joan Sanchez
|
db538a3f6f
|
Merge branch 'dev' into 3041-monitor_sort_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 06:11:39 +00:00 |
Joan Sanchez
|
29bc0c04fb
|
test(monitor): Updated back unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-08 08:08:10 +02:00 |
Carlos Jimenez Ruiz
|
99f4a2ed7d
|
refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-07 16:07:46 +02:00 |
Carlos Jimenez Ruiz
|
2ce79a8d49
|
Merge branch 'dev' into 3061-send_thermograph
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-07 10:10:09 +00:00 |
Carlos Jimenez Ruiz
|
471da0f4da
|
fix(clone): invoiceIn clone now adds (2) to the ref
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-07 11:55:26 +02:00 |
Carlos Jimenez Ruiz
|
c7558dfb0b
|
refactor(temperatures): added crudmodel autoload for temperatures
|
2021-09-07 11:54:53 +02:00 |
Carlos Jimenez Ruiz
|
8bdb02c0fc
|
refactor(createThermograph): endpoint rollsback only if transaction was created in it
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-07 10:30:53 +02:00 |
Joan Sanchez
|
6ca7ced067
|
refactor(monitor): removed unused code
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-07 10:27:19 +02:00 |
Joan Sanchez
|
04a817c4f9
|
fix(problems): problems filter was not working properly on sales monitor
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3040
|
2021-09-07 07:41:57 +02:00 |
Carlos Jimenez Ruiz
|
c4e51146fd
|
refactor(thermograph): temperatures source updated on frontend
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-06 16:39:44 +02:00 |
Carlos Jimenez Ruiz
|
56276783db
|
test(thermograph): e2e and unit tests for the backend of thermograph
|
2021-09-06 16:39:04 +02:00 |
Carlos Jimenez Ruiz
|
1f0bcb63f1
|
refactor(thermograph): added temperature model + updated thermographs models and endpoints
|
2021-09-06 16:38:27 +02:00 |
Joan Sanchez
|
4db25bf722
|
refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3045
|
2021-09-03 16:30:25 +02:00 |
Joan Sanchez
|
13f78359d5
|
fix(bank): the search by bank was not differentiating between numerical values and string values
gitea/salix/pipeline/head This commit looks good
Details
Refs: 3084
|
2021-09-03 14:00:47 +02:00 |
Joan Sanchez
|
273086472a
|
test(salesfilter): updated unit test for sales filter
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-03 12:27:19 +02:00 |
Joan Sanchez
|
8623f914c7
|
feat(monitor): Sort by amount of problems on a ticket list
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-03 12:09:37 +02:00 |
Joan Sanchez
|
559ff95fd7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-03 07:36:42 +02:00 |
Joan Sanchez
|
681b8afb15
|
fix(invoice): missing UserError import
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-03 07:23:26 +02:00 |
Javi Gallego
|
bc34be85ef
|
fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-02 17:49:25 +02:00 |
Carlos Jimenez Ruiz
|
6b465f9150
|
Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-02 13:07:57 +00:00 |
Carlos Jimenez Ruiz
|
0337a1d6db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2021-09-02 14:17:50 +02:00 |
Carlos Jimenez Ruiz
|
f2f81442d9
|
fix(cloneWithEntries): endpoint was broken due to production changes
|
2021-09-02 14:17:35 +02:00 |
Carlos Jimenez Ruiz
|
85844973d6
|
refactor(geolocation): create province now uses autonomy instead of country
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-09-02 11:56:59 +02:00 |
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 |
Carlos Jimenez Ruiz
|
05c630533a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 16:38:33 +02:00 |
Joan Sanchez
|
8f24c3f39b
|
Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 14:34:48 +00:00 |
Joan Sanchez
|
9506a8fd90
|
Disabled sortable column
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 16:34:34 +02:00 |
Joan Sanchez
|
6acf922d3b
|
Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 14:15:42 +00:00 |
Joan Sanchez
|
dd7f37e36c
|
Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #663
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-18 14:15:15 +00:00 |
Joan Sanchez
|
a4f20daf17
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 16:14:30 +02:00 |
Joan Sanchez
|
a50eebfed4
|
Replaced salesPerson by packages column
|
2021-06-18 16:07:13 +02:00 |
Carlos Jimenez Ruiz
|
4656b2e25a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 15:54:41 +02:00 |
Carlos Jimenez Ruiz
|
1afae3d56d
|
address nickname now gets updated when client or address updates
|
2021-06-18 15:54:33 +02:00 |
Carlos Jimenez Ruiz
|
ba0fdcd743
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 15:05:10 +02:00 |
Carlos Jimenez Ruiz
|
82cb9ed749
|
zone module endpoints now have transactions
|
2021-06-18 15:05:03 +02:00 |
Joan Sanchez
|
20e933ed07
|
2980 - Invoice in fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 13:29:59 +02:00 |
Joan Sanchez
|
0ff114ff36
|
Ammends
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 12:32:37 +02:00 |
Joan Sanchez
|
c622f24b0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 11:12:58 +02:00 |
Carlos Jimenez Ruiz
|
e74f1f109e
|
Merge branch 'dev' into 2906-deliveryNote_packages
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:27:46 +00:00 |
Joan Sanchez
|
325afe2245
|
2906 - Number of packages
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:42:55 +02:00 |
Joan Sanchez
|
b36b48f4b3
|
Merge branch 'dev' into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 06:04:33 +00:00 |
Joan Sanchez
|
bc7c288742
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 08:03:55 +02:00 |
Joan Sanchez
|
8695fadc18
|
Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-18 05:21:01 +00:00 |
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 |
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
|
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
|
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
|
7370269e4d
|
ticket.sale now shows Packing type
|
2021-06-16 17:06:11 +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
|
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 |
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 |
Javi Gallego
|
a8e01909d0
|
ancho ok
|
2021-06-15 09:02:00 +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 |
Javi Gallego
|
44ce54ede4
|
seccion en summary
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-14 09:47:04 +02: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 |
Javi Gallego
|
acf03959f5
|
creada seccion invoiceInTax
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-09 10:20:18 +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 |
Javi Gallego
|
8878a2280a
|
models
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-08 08:04:38 +02: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 |
Carlos Jimenez Ruiz
|
3894fe94ec
|
Merge branch 'dev' into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 13:02:20 +00:00 |
Joan Sanchez
|
8fa64122f8
|
Ammends
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-07 14:58:24 +02:00 |
Carlos Jimenez Ruiz
|
a46fef5295
|
endpoint minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 14:26:34 +02:00 |
Carlos Jimenez Ruiz
|
8fd7faa47b
|
fixed bug module importation + rewritten tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 11:12:56 +02:00 |
Javi Gallego
|
c90fa41fae
|
accountingType.isAutoConciliated == true
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-07 07:57:46 +02:00 |
Carlos Jimenez Ruiz
|
647b7a93cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 17:16:10 +02:00 |
Carlos Jimenez Ruiz
|
b38605442e
|
transactions for entry module endpoints
|
2021-06-04 17:16:02 +02:00 |
Joan Sanchez
|
c853cfc86f
|
Refactor
|
2021-06-04 15:49:48 +02:00 |
Joan Sanchez
|
2c0fc7e45e
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 11:46:37 +02:00 |
Joan Sanchez
|
6b65aa87d8
|
HOTFIX: Max width for client name field
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 11:46:09 +02:00 |
Joan Sanchez
|
b77ecc2c06
|
changes2
|
2021-06-04 11:45:35 +02:00 |
Joan Sanchez
|
f8df3f1f3d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
|
2021-06-04 11:10:43 +02:00 |
Joan Sanchez
|
651a9356f3
|
Merge branch 'dev' into 2932-invoiceIn_log
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 07:54:18 +00:00 |
Javi Gallego
|
2604c81533
|
falta solucionar test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-04 08:24:33 +02:00 |
Joan Sanchez
|
e1c1bb8425
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-04 08:00:08 +02:00 |
Joan Sanchez
|
8bb254e93f
|
HOTFIX: Ticket monitor clientGetDebt
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:29:45 +02:00 |
Joan Sanchez
|
edf18938a6
|
HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:21:43 +02:00 |
Carlos Jimenez Ruiz
|
b0bed3c1c4
|
invoiceInLog section, model and table
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 16:14:52 +02:00 |
Joan Sanchez
|
d1daed3540
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 13:39:51 +02:00 |
Joan Sanchez
|
5962a68d15
|
HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-03 12:40:27 +02:00 |
Joan Sanchez
|
3fcd78e1f3
|
Changes
|
2021-06-03 11:00:40 +02:00 |
Carlos Jimenez Ruiz
|
86631c84d0
|
moved transferor from fiscal data to basic data + e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-02 17:35:30 +02:00 |
Joan Sanchez
|
655380a52c
|
Removed focus
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-02 10:33:10 +02:00 |
Joan Sanchez
|
07026a68bb
|
#2934 - HOTFIX: Route suggested tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-02 10:29:56 +02:00 |
Joan Sanchez
|
a594e63566
|
Chip color
gitea/salix/pipeline/head This commit looks good
Details
|
2021-06-01 11:39:40 +02:00 |
Javi Gallego
|
70fc260eae
|
vnConfig solucionado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-06-01 10:10:09 +02:00 |
Javi Gallego
|
3a5d84b34c
|
rutas reparadas
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-05-31 08:21:16 +02:00 |
Joan Sanchez
|
a24cfe0087
|
Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-27 09:42:27 +00:00 |
Joan Sanchez
|
27cd54bef1
|
Updated icons title
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-27 11:41:45 +02:00 |
Joan Sanchez
|
920e7b1daf
|
E2E fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-26 13:05:58 +02:00 |
Carlos Jimenez Ruiz
|
3f167de10f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-26 09:14:30 +02:00 |
Carlos Jimenez Ruiz
|
d6ef5352a2
|
sale module now has canEdit endpoint to check arrays of sales
|
2021-05-26 09:14:18 +02:00 |
Joan Sanchez
|
099ff657e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 14:08:02 +02:00 |
Joan Sanchez
|
f6a0bcb12c
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 13:33:17 +02:00 |
Joan Sanchez
|
26cc3a3dec
|
2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-25 10:01:18 +02:00 |
Carlos Jimenez Ruiz
|
e418d6239b
|
fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-24 11:28:23 +02:00 |
Carlos Jimenez Ruiz
|
2a4ff5a97b
|
fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-24 10:31:51 +02:00 |
Carlos Jimenez Ruiz
|
9a1b6e4653
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 15:33:23 +02:00 |
Carlos Jimenez Ruiz
|
5c18c5c94c
|
ticket module descriptor now takes warehouseFk from the ticket
|
2021-05-21 15:31:28 +02:00 |
Carlos Jimenez Ruiz
|
1bfe537186
|
claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig
|
2021-05-21 15:31:05 +02:00 |
Joan Sanchez
|
60185bdf34
|
Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 07:24:34 +00:00 |
Joan Sanchez
|
a103c8d7fc
|
2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 08:49:32 +02:00 |
Joan Sanchez
|
6f245698f2
|
Merge branch 'dev' into 2620-mostrar-disponible
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-21 06:29:43 +00:00 |
Joan Sanchez
|
b7049122fe
|
Url fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-20 10:28:37 +02:00 |
Joan Sanchez
|
fbc11b7a39
|
Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-20 08:23:45 +00:00 |
Javi Gallego
|
df073cce2f
|
refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 17:04:13 +02:00 |
Carlos Jimenez Ruiz
|
2494af0113
|
removed unused relation from item @addSale
|
2021-05-19 15:33:35 +02:00 |
Carlos Jimenez Ruiz
|
5eb0ab8296
|
add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 15:25:49 +02:00 |
Carlos Jimenez Ruiz
|
72a0b774de
|
add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 14:15:28 +02:00 |
Joan Sanchez
|
a5c3ba3926
|
2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-19 10:26:58 +02:00 |
Joan Sanchez
|
714142f868
|
Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good
Details
|
2021-05-18 12:53:33 +00:00 |