Carlos Jimenez Ruiz
|
9fa3f17a9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-09-01 17:45:00 +02:00 |
 Joan Sanchez
|
cb4fe1f610
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
|
2020-09-01 07:37:48 +00:00 |
|
Joan Sanchez
|
5a16a10b8f
|
Merge branch 'dev' into 2409-last_entries_contextmenu
|
2020-09-01 06:55:13 +00:00 |
 Javi Gallego
|
b4952002a3
|
Merge branch 'dev' into 2411-ticket-expedition-añadir-campo-packagingFk
|
2020-09-01 06:49:09 +00:00 |
|
Joan Sanchez
|
8aa9918d84
|
2409 - Added filter by selection
|
2020-08-31 15:03:00 +02:00 |
|
Javi Gallego
|
daee9081d1
|
test excepto invoiceOut
|
2020-08-31 12:29:51 +02:00 |
|
Joan Sanchez
|
baf9ec6e70
|
2416 - Item request - Added state filter
|
2020-08-31 08:32:30 +02:00 |
|
Carlos Jimenez Ruiz
|
3a82ef0e06
|
2375 entry lastBuy seccion
|
2020-08-26 16:33:47 +02:00 |
|
Carlos Jimenez Ruiz
|
dee3ab166a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2341-Entry_lastBuy_section
|
2020-08-17 14:18:44 +02:00 |
|
Carlos Jimenez Ruiz
|
6007506633
|
wider space for tags
|
2020-07-31 11:43:56 +02:00 |
|
Carlos Jimenez Ruiz
|
c62801e741
|
modules component to vnComponent working
|
2020-07-24 14:22:30 +02:00 |
|
Carlos Jimenez Ruiz
|
6913f2db72
|
$httpBackend.when and .expect no longer misused
|
2020-07-23 17:10:07 +02:00 |
|
Carlos Jimenez Ruiz
|
4ca004f833
|
angular.mock.injet shorten to inject
|
2020-07-23 16:46:16 +02:00 |
|
Carlos Jimenez Ruiz
|
f2730dd51c
|
some parts of latestsBuys WIP
|
2020-07-20 11:31:47 +02:00 |
|
Joan Sanchez
|
ca19581a5d
|
Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-03 11:09:19 +00:00 |
Bernat Exposito Domenech
|
1cd9c75468
|
fix item diary descriptor
|
2020-06-03 12:37:01 +02:00 |
|
Joan Sanchez
|
613937dc8d
|
Fixed order
|
2020-06-03 12:21:03 +02:00 |
|
Joan Sanchez
|
f71a2a3665
|
Removed isOk param
|
2020-06-03 11:58:53 +02:00 |
|
Bernat Exposito Domenech
|
0b3608433c
|
item diary, fix ticket descriptor
|
2020-06-03 10:37:17 +02:00 |
|
Joan Sanchez
|
16d7186829
|
Fixed initial filters
|
2020-06-02 14:42:58 +02:00 |
|
Joan Sanchez
|
a0767a6ea2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters
|
2020-06-02 10:56:40 +02:00 |
 Juan Ferrer
|
3e5bab41d3
|
Merge branch 'test' into dev
|
2020-06-01 13:47:33 +02:00 |
|
Juan Ferrer
|
3fcb76246d
|
Merge branch 'master' into test
|
2020-06-01 13:38:59 +02:00 |
|
Joan Sanchez
|
3d8bc3b7b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-06-01 13:32:35 +02:00 |
|
Joan Sanchez
|
c188da88e8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2020-06-01 13:31:08 +02:00 |
|
Javi Gallego
|
5188f80da5
|
Merge branch 'dev' into 2234-getVisibleAvailable
|
2020-05-26 10:47:48 +02:00 |
|
Javi Gallego
|
d8871c0bce
|
cr
|
2020-05-26 10:37:52 +02:00 |
 Bernat Exposito
|
17ef761ba4
|
Merge pull request '2226-item_last_entries' (#271) from 2226-item_last_entries into dev
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-05-26 07:59:17 +00:00 |
Joan Sanchez
|
44160d2f3c
|
Changed order
|
2020-05-26 08:11:36 +02:00 |
|
Joan Sanchez
|
4d2d57d646
|
2265 Changes to filter
|
2020-05-26 08:08:09 +02:00 |
|
Javi Gallego
|
0f718ad065
|
Merge branch 'dev' into 2242-test
|
2020-05-22 07:56:00 +02:00 |
|
Bernat Exposito Domenech
|
52241e6f2c
|
update itemLastENtries
|
2020-05-21 15:26:00 +02:00 |
 Carlos Jimenez Ruiz
|
55c4ccdb29
|
Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-20 08:40:02 +00:00 |
|
Bernat Exposito Domenech
|
4133021e5c
|
fix translate on plural
|
2020-05-20 08:52:20 +02:00 |
|
Javi Gallego
|
670c5936ce
|
test2
|
2020-05-19 13:11:22 +02:00 |
|
Javi Gallego
|
529bd5673c
|
test
|
2020-05-19 13:06:59 +02:00 |
|
Javi Gallego
|
ff03133277
|
test
|
2020-05-19 12:21:02 +02:00 |
|
Bernat Exposito Domenech
|
d289c17530
|
searchbar translates
|
2020-05-19 10:27:22 +02:00 |
|
Juan Ferrer
|
b94c97d322
|
Hotfix: Clone option added to vnItemDescriptor
|
2020-05-13 17:51:27 +02:00 |
|
Juan Ferrer
|
07cbac7fcd
|
Merge fixes
|
2020-05-08 19:56:39 +02:00 |
|
Juan Ferrer
|
7a1bb7e68d
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-08 14:01:49 +02:00 |
|
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
|
2020-05-06 18:42:50 +02:00 |
|
Juan Ferrer
|
6c14743017
|
Last fixes & tests passed
|
2020-05-06 14:38:09 +02:00 |
|
Juan Ferrer
|
6a8e1bf6b5
|
#1882 Boileplate code removed, declarative quicklinks
|
2020-04-30 12:48:52 +02:00 |
|
Juan Ferrer
|
b536c8291a
|
#1882 Popover::show() boilerplate code removed
|
2020-04-28 14:26:02 +02:00 |
|
Juan Ferrer
|
5826099601
|
#1882 First step, front tests passed
|
2020-04-25 11:50:04 +02:00 |
|
Juan Ferrer
|
4336a303c0
|
Merge branch 'dev' into 2026-itemDescriptorPopoverRelocate
|
2020-04-07 13:03:57 +02:00 |
|
Juan Ferrer
|
2249f68d6e
|
SCSS px to em: rem for font-size
|
2020-04-02 15:11:42 +02:00 |
|
Juan Ferrer
|
559cc5eb8c
|
SCSS em to px: Second step
|
2020-04-02 14:52:02 +02:00 |
|
Juan Ferrer
|
734c86c5f5
|
SCSS px to em - First step
|
2020-04-02 14:20:57 +02:00 |
|
Juan Ferrer
|
bf68d15264
|
E2E expeditions fixes, scss px/em fixes
|
2020-04-02 11:39:39 +02:00 |
|
Juan Ferrer
|
0bd09492d1
|
#2026 Implemented & tests passed
|
2020-03-25 20:44:59 +01:00 |
|
Joan Sanchez
|
e71ace6da7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
|
2020-03-25 15:59:41 +01:00 |
|
Juan Ferrer
|
8eb6590285
|
E2E fixes
|
2020-03-24 17:27:21 +01:00 |
|
Joan Sanchez
|
9b933e7d88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
|
2020-03-20 12:00:53 +01:00 |
|
Joan Sanchez
|
3d23583e0b
|
Fixes
|
2020-03-18 14:08:04 +01:00 |
|
Joan Sanchez
|
934e057a67
|
Fixed watcher changes
|
2020-03-18 09:41:23 +01:00 |
|
Joan Sanchez
|
526a92fd32
|
Order refactor
|
2020-03-17 15:18:02 +01:00 |
|
Joan Sanchez
|
88fe9a006e
|
Item refactor
|
2020-03-17 14:43:46 +01:00 |
|
Juan Ferrer
|
9d1bc8eb54
|
First functional version (No tests)
|
2020-03-13 20:33:12 +01:00 |
|
Carlos Jimenez Ruiz
|
794b20fc83
|
#2131 jest.spyOn
|
2020-02-26 13:22:52 +01:00 |
|
Joan Sanchez
|
ad1e08ec70
|
2134 - Irem request load error
|
2020-02-24 14:29:48 +01:00 |
|
Carlos Jimenez Ruiz
|
081c742dcb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1835-e2e-item-request
|
2020-02-19 11:48:01 +01:00 |
|
Joan Sanchez
|
fe8a0b4583
|
Added translation. taxClassCode.sql removed
|
2020-02-18 07:21:35 +01:00 |
|
Joan Sanchez
|
7d8e88e884
|
Updated unit test
|
2020-02-17 13:32:12 +01:00 |
|
Joan Sanchez
|
844b27acb9
|
2118 - Create new intrastat
|
2020-02-17 12:47:03 +01:00 |
|
Joan Sanchez
|
d9ed7cda38
|
Added form dialog
|
2020-02-17 07:22:55 +01:00 |
|
Carlos Jimenez Ruiz
|
4e2ab537ee
|
unstable with the rest of tests
|
2020-02-14 14:52:47 +01:00 |
|
Joan Sanchez
|
b623646f25
|
removed console
|
2020-02-07 07:02:27 +01:00 |
|
Joan Sanchez
|
3e0fd10b41
|
2029 - Item request fixes & searchbar filters working
|
2020-02-06 14:33:28 +01:00 |
|
Joan Sanchez
|
e3b1a4b58a
|
2076 - Item tags refactor
|
2020-02-06 07:41:51 +01:00 |
|
Carlos Jimenez Ruiz
|
f74792dbe9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2020-01-24 10:17:08 +01:00 |
|
Joan Sanchez
|
1d6edabb10
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-01-21 09:23:58 +01:00 |
|
Joan Sanchez
|
e93e9d2947
|
getWasteDetail() now calls weekWaste_getDetail()
|
2020-01-21 09:17:55 +01:00 |
|
Joan Sanchez
|
826dfe8092
|
changes to percentage filter
|
2020-01-17 11:46:45 +01:00 |
|
Joan Sanchez
|
3a4c379033
|
Added waste section
|
2020-01-17 11:44:05 +01:00 |
|
Joan Sanchez
|
2b2e6532f6
|
changes to percentage filter
|
2020-01-16 13:39:32 +01:00 |
|
Joan Sanchez
|
708789502d
|
Added waste section
|
2020-01-15 13:07:33 +01:00 |
|
Carlos Jimenez Ruiz
|
e922a05e50
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-31 11:40:15 +01:00 |
|
Joan Sanchez
|
f2e9dbd597
|
added category name to item type autocompletes
|
2019-12-26 11:27:44 +01:00 |
|
Joan Sanchez
|
d2c5ab7297
|
trigger unit tests
|
2019-12-26 08:43:34 +01:00 |
|
Joan Sanchez
|
c95c7192da
|
Added template to specie autocomplete
|
2019-12-26 08:21:08 +01:00 |
|
Joan Sanchez
|
3d4fc9c18e
|
#1963 Entry & zone style changes
|
2019-12-23 08:05:58 +01:00 |
|
Juan Ferrer
|
4da83ef963
|
Hotfixes: vnTicketSale menu, vnItemDiary width
|
2019-12-17 12:23:31 +01:00 |
|
Carlos Jimenez Ruiz
|
e6130e78fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into puppeteer
|
2019-12-13 15:12:55 +01:00 |
|
Joan Sanchez
|
780f1e4773
|
renamed expence to expense and added field
|
2019-12-13 11:59:25 +01:00 |
|
Bernat Exposito Domenech
|
eb2cfc5535
|
updated selectors
|
2019-12-11 14:14:44 +01:00 |
|
Juan Ferrer
|
1c035ca045
|
All tests fixed
|
2019-11-12 14:18:46 +01:00 |
|
Juan Ferrer
|
efa6ddc0f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-11 16:25:00 +01:00 |
|
Joan Sanchez
|
6cedfceddd
|
Show ticket state #1836
|
2019-11-11 13:51:30 +01:00 |
|
Juan Ferrer
|
515234187a
|
First working version
|
2019-11-10 11:08:44 +01:00 |
|
Juan Ferrer
|
c41fb1d0f4
|
#1847 vnDialog refactor
|
2019-10-30 16:57:14 +01:00 |
|
Juan Ferrer
|
1b2c383502
|
vnDialog opens in body, nightmare extensions with detailed errors
|
2019-10-28 17:31:33 +01:00 |
|
Juan Ferrer
|
47998aaa97
|
vnDialog opens in body
|
2019-10-27 01:30:01 +02:00 |
|
Juan Ferrer
|
c7384bb3ac
|
API path prefix, repeated code removed from tests
|
2019-10-25 00:53:53 +02:00 |
|
Juan Ferrer
|
ee196df2ff
|
vnCompent with most common services as properties
|
2019-10-24 12:44:36 +02:00 |
|
Joan Sanchez
|
137f701434
|
changed order
|
2019-10-22 14:20:50 +02:00 |
|
Joan Sanchez
|
2ed4cf3e4a
|
Item request refactor #1818
|
2019-10-22 13:44:36 +02:00 |
|
Joan Sanchez
|
188f4ae3bf
|
mark item diary line
|
2019-10-21 11:08:41 +02:00 |
|
Bernat
|
6477a1458d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-21 07:24:56 +02:00 |
|
Juan Ferrer
|
72017a64ac
|
Date timezone offset properly handled from backend DB connector
|
2019-10-19 01:18:25 +02:00 |
|
Juan Ferrer
|
485bc43b13
|
Style fixes
|
2019-10-18 22:07:55 +02:00 |
|
Juan Ferrer
|
17a150370c
|
Style fixes
|
2019-10-18 21:54:13 +02:00 |
|
Juan Ferrer
|
457034daad
|
Tests fixed
|
2019-10-18 21:36:30 +02:00 |
|
Bernat
|
7a89ab5335
|
#1778 Refactor worker.phone
|
2019-10-18 08:36:33 +02:00 |
|
Joan Sanchez
|
e79456374c
|
fixed item-popover width
|
2019-10-14 14:54:11 +02:00 |
|
Juan Ferrer
|
a72c12e1c9
|
Tests passed
|
2019-10-11 17:38:04 +02:00 |
|
Juan Ferrer
|
a9d5e87078
|
vnField alpha with ngModel
|
2019-10-10 00:47:29 +02:00 |
|
Juan Ferrer
|
fc09d76422
|
Merge
|
2019-10-08 23:57:54 +02:00 |
|
Juan Ferrer
|
757fc6fe23
|
vnField stable & applied to all field except vnTextfield
|
2019-10-08 23:57:02 +02:00 |
|
Carlos Jimenez Ruiz
|
7db4945a6d
|
#1702 Autocomplete data refresh and #1754 watcher
|
2019-10-08 17:27:27 +02:00 |
|
Juan Ferrer
|
eeef468964
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-05 00:17:10 +02:00 |
|
Juan Ferrer
|
b12a666653
|
CSS padding/margin refactor, glob styles in core
|
2019-10-05 00:16:57 +02:00 |
|
Carlos Jimenez Ruiz
|
4fa532abb8
|
#1744 ticket.index ocultar columnas expendables
|
2019-10-04 17:49:51 +02:00 |
|
Juan Ferrer
|
c6e8498281
|
ModelProxy.status, Paging removed, locale fixes
|
2019-10-03 19:34:24 +02:00 |
|
Juan Ferrer
|
ec9797a4b3
|
vnDataViewer applied to all module indexes
|
2019-10-02 21:02:49 +02:00 |
|
Joan Sanchez
|
314b609060
|
fixed family translation
|
2019-09-24 08:34:14 +02:00 |
|
Carlos Jimenez Ruiz
|
7bcc908708
|
#1704 item.basicData
|
2019-09-20 16:39:20 +02:00 |
|
Bernat
|
526e4e34fa
|
skip e2e #1702
|
2019-09-19 09:05:11 +02:00 |
|
Bernat
|
86d793b9ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-18 11:11:53 +02:00 |
|
Bernat
|
7af4f3626d
|
#1691 item.basicData - Añadir campo hasKgPrice
|
2019-09-18 11:11:47 +02:00 |
|
Carlos Jimenez Ruiz
|
b12d0388c9
|
#1074 Undo changes button for forms
|
2019-09-18 09:41:25 +02:00 |
|
Carlos Jimenez Ruiz
|
206dec59a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-13 16:09:27 +02:00 |
|
Carlos Jimenez Ruiz
|
2251fb65ad
|
#1615 migrar karma a jest
|
2019-09-13 16:09:14 +02:00 |
|
Joan Sanchez
|
f6bd915ae6
|
Ticket dms CSS fixes #1692
|
2019-09-12 11:47:56 +02:00 |
|
Joan Sanchez
|
7ecb67052d
|
item.diary css chip fixed #1676
|
2019-09-10 08:47:46 +02:00 |
|
Joan Sanchez
|
176750046a
|
Scroll component #643
|
2019-09-05 13:06:40 +02:00 |
|
Bernat
|
b656db3a84
|
#1645 refactor search panel
|
2019-08-29 08:32:46 +02:00 |
|
Bernat
|
6daabed202
|
#1645 first part, delete hasVisible
|
2019-08-28 12:17:06 +02:00 |
|
Carlos Jimenez Ruiz
|
c2573d6853
|
css amends for item-request
|
2019-07-25 11:25:01 +02:00 |
|
Carlos Jimenez Ruiz
|
e1cbf781e1
|
#1608 item.request
|
2019-07-25 09:55:09 +02:00 |
|
Carlos Jimenez Ruiz
|
a2a9dfd7e5
|
#1567 refactor logs - worker descriptor
|
2019-07-03 11:08:44 +02:00 |
|
Joan Sanchez
|
bddfbc4b34
|
add new item from ticket.sale #1414, checkedLines fixed
|
2019-07-02 12:12:15 +02:00 |
|
Bernat
|
d742eef7c3
|
Tarea #1478 item.basicData
|
2019-05-30 08:04:46 +02:00 |
|
Carlos Jimenez Ruiz
|
2358c94aae
|
#1402 route.ticket
|
2019-05-15 13:07:32 +02:00 |
|
Bernat
|
83898c9ba7
|
1354 refactor item-descriptor-popover
|
2019-05-07 11:32:35 +02:00 |
|
Joan Sanchez
|
0dbed4e102
|
fixed translation
|
2019-05-02 10:40:46 +02:00 |
|
Joan Sanchez
|
a2fd8ddc8a
|
buy requests translation & default order
|
2019-05-02 10:04:02 +02:00 |
|
Carlos Jimenez Ruiz
|
511e33b835
|
#1350 route.index worker descriptor + filters
|
2019-04-25 14:24:02 +02:00 |
|
Bernat
|
bc005b2310
|
#1346 fix confirm.js and update item request
|
2019-04-18 11:02:28 +02:00 |
|
Carlos Jimenez Ruiz
|
bafbd92802
|
Bug/Test #1331 cambio de rol
|
2019-04-17 08:21:58 +02:00 |
|
Carlos Jimenez Ruiz
|
9baa37b833
|
#1306 Renombrar controladores, rutas y carpetas
|
2019-04-16 14:30:01 +02:00 |
|
Bernat
|
dbe56b2496
|
#1330 add info in the search panel
|
2019-04-12 14:33:08 +02:00 |
|
Joan Sanchez
|
b3c00e5a29
|
updated td-editable styles #1313
|
2019-04-09 13:47:13 +02:00 |
|
Joan Sanchez
|
4f1a1ae004
|
Merge branch 'master' into dev
|
2019-04-09 13:19:34 +02:00 |
|
Joan Sanchez
|
a6308c7f1e
|
input-number refactor #1311
|
2019-04-09 13:18:55 +02:00 |
Gerard
|
633ab28c41
|
#1315 item.ticketRequest
|
2019-04-05 15:20:12 +02:00 |
|
Gerard
|
d7c063f389
|
removed unused binding
|
2019-04-05 09:27:43 +02:00 |
|
Joan Sanchez
|
ccb2505896
|
Merge branch 'master' into dev
|
2019-04-03 12:58:59 +02:00 |
|
Joan Sanchez
|
eea4f53151
|
removed field acl for buyer on item tags
|
2019-04-03 12:58:30 +02:00 |