 Carlos Jimenez Ruiz
|
52552ec502
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-26 11:07:38 +02:00 |
|
Carlos Jimenez Ruiz
|
2a2c5ae3c4
|
#1719 claim.detail cambiar descuento falla
|
2019-09-26 10:56:49 +02:00 |
 Juan Ferrer
|
c0f39ba87f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-26 10:09:07 +02:00 |
Bernat
|
f28305de9b
|
Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
gitea/salix/dev This commit looks good
Details
|
2019-09-26 09:13:18 +02:00 |
|
Carlos Jimenez Ruiz
|
156c9ec3ab
|
#1716 ticket.summary añadir link a la Ruta
gitea/salix/dev This commit looks good
Details
|
2019-09-26 09:05:54 +02:00 |
|
Carlos Jimenez Ruiz
|
65981099b6
|
#1719 claim.detail cambiar descuento falla
|
2019-09-26 09:05:18 +02:00 |
|
Juan Ferrer
|
91e4e62a1c
|
Merge branch 'test' into dev
|
2019-09-26 08:44:00 +02:00 |
|
Juan Ferrer
|
2a0cc1dc8b
|
Style/i18n fixes
|
2019-09-25 23:09:10 +02:00 |
|
Juan Ferrer
|
dba4ae14d5
|
Query delivery days by province
|
2019-09-25 22:35:21 +02:00 |
|
Juan Ferrer
|
54839782f3
|
Style fix
|
2019-09-25 20:14:43 +02:00 |
|
Juan Ferrer
|
91b5ad5a3e
|
Merge
|
2019-09-25 20:11:14 +02:00 |
|
Juan Ferrer
|
98cc3ce00e
|
Agency events, delivery days viewer
|
2019-09-25 20:06:42 +02:00 |
|
Carlos Jimenez Ruiz
|
1841e4edb0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-25 11:53:42 +02:00 |
|
Carlos Jimenez Ruiz
|
be65c5acad
|
#1719 claim.detail cambiar descuento falla
|
2019-09-25 11:53:12 +02:00 |
 Joan Sanchez
|
73eca9905e
|
fixed #1734 canHaveStowaway validation
gitea/salix/dev This commit looks good
Details
|
2019-09-25 11:26:12 +02:00 |
|
Carlos Jimenez Ruiz
|
92eef27f37
|
#1723 ticket.index si el total es menor de 50€
gitea/salix/dev This commit looks good
Details
|
2019-09-24 16:38:57 +02:00 |
|
Carlos Jimenez Ruiz
|
0c27b90c5d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:39:22 +02:00 |
|
Carlos Jimenez Ruiz
|
b3bd40e2dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 14:25:56 +02:00 |
|
Carlos Jimenez Ruiz
|
99ef8a6010
|
#1719 claim.detail cambiar descuento falla
|
2019-09-24 14:23:21 +02:00 |
|
Bernat
|
de0034f145
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:22:46 +02:00 |
|
Joan Sanchez
|
d627a8ba25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:03:42 +02:00 |
|
Joan Sanchez
|
d0fc74cefd
|
updated e2e and unit tests
|
2019-09-24 14:03:30 +02:00 |
|
Bernat
|
2b80c4f7bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 13:56:31 +02:00 |
|
Bernat
|
bf5a9967cf
|
Refactor #1682 modificar modelos componentRate y componentTypeRate
|
2019-09-24 13:45:54 +02:00 |
|
Carlos Jimenez Ruiz
|
d56c7ff540
|
#1727 ticlet.line foco en cambiar hora
gitea/salix/dev This commit looks good
Details
|
2019-09-24 13:25:18 +02:00 |
|
Bernat
|
faf355fab8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 12:38:26 +02:00 |
|
Bernat
|
7384fabec0
|
Tarea #1724 order/index buscar por alias
|
2019-09-24 12:10:03 +02:00 |
|
Joan Sanchez
|
3af26900e3
|
watcher preventing claim creation
gitea/salix/dev This commit looks good
Details
|
2019-09-24 11:55:36 +02:00 |
|
Joan Sanchez
|
5851784e41
|
Create new order now opens on new window
gitea/salix/dev This commit looks good
Details
|
2019-09-24 11:41:00 +02:00 |
|
Juan Ferrer
|
a319eed5f6
|
Zone.getLeaves() refactor
gitea/salix/dev This commit looks good
Details
|
2019-09-24 10:41:25 +02:00 |
|
Juan Ferrer
|
4b58078798
|
Zone.getLeaves refactor & fixes
|
2019-09-24 10:38:07 +02:00 |
|
Juan Ferrer
|
52a6221b59
|
recover getLeaves
|
2019-09-24 10:38:05 +02:00 |
|
Joan Sanchez
|
15183df65f
|
transfer sales error fixed
gitea/salix/dev This commit looks good
Details
|
2019-09-24 08:51:21 +02:00 |
|
Joan Sanchez
|
314b609060
|
fixed family translation
gitea/salix/dev This commit looks good
Details
|
2019-09-24 08:34:14 +02:00 |
|
Joan Sanchez
|
a091674f08
|
allowed numbers on fiscal name
gitea/salix/dev This commit looks good
Details
|
2019-09-24 07:47:06 +02:00 |
|
Carlos Jimenez Ruiz
|
6c1fdb444a
|
removed fdescribe
gitea/salix/dev This commit looks good
Details
|
2019-09-24 07:03:22 +02:00 |
|
Joan Sanchez
|
e55b8b7b6b
|
precio por kilo #1690
gitea/salix/dev This commit looks good
Details
|
2019-09-23 14:41:54 +02:00 |
|
Joan Sanchez
|
36d7e514ff
|
Allow spanish characters on socialName #1712
|
2019-09-23 09:27:58 +02:00 |
|
Carlos Jimenez Ruiz
|
0f04aed2fe
|
#1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-20 17:20:54 +02:00 |
|
Carlos Jimenez Ruiz
|
7bcc908708
|
#1704 item.basicData
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-20 16:39:20 +02:00 |
|
Juan Ferrer
|
6d50012fab
|
agency.location fixes
gitea/salix/master This commit looks good
Details
|
2019-09-19 18:00:40 +02:00 |
|
Juan Ferrer
|
40c555702d
|
Zone.getLeaves() refactor
gitea/salix/master This commit looks good
Details
|
2019-09-19 17:49:46 +02:00 |
|
Juan Ferrer
|
05fec10cf2
|
Zone.getLeaves refactor & fixes
gitea/salix/master This commit looks good
Details
|
2019-09-19 17:30:16 +02:00 |
|
Juan Ferrer
|
e0ffef70b1
|
Method ZoneGeo.getLeaves optimized
gitea/salix/master This commit looks good
Details
|
2019-09-19 15:51:39 +02:00 |
|
Juan Ferrer
|
afb06dd4a5
|
#1167 Fixed
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 12:32:34 +02:00 |
|
Joan Sanchez
|
d6d825ebf1
|
fixed automerge
gitea/salix/master This commit looks good
Details
|
2019-09-19 10:52:23 +02:00 |
|
Joan Sanchez
|
f67006e526
|
changed fiscal name translation
gitea/salix/master This commit looks good
Details
|
2019-09-19 09:44:50 +02:00 |
|
Joan Sanchez
|
9ce18fbd0a
|
double start pick
|
2019-09-19 09:44:18 +02:00 |
|
Joan Sanchez
|
4d894365eb
|
Fixed production errors #1699
|
2019-09-19 09:42:41 +02:00 |
|
Joan Sanchez
|
8cb10759d3
|
updated transactions
|
2019-09-19 09:42:32 +02:00 |
|
Joan Sanchez
|
2edfb66423
|
changed fiscal name translation
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 09:41:02 +02:00 |
|
Joan Sanchez
|
fa549630c4
|
Bug/Test #1700
gitea/salix/dev This commit has test failures
Details
|
2019-09-19 09:37:02 +02:00 |
|
Joan Sanchez
|
a85e653f34
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 09:24:27 +02:00 |
|
Joan Sanchez
|
5a4c6bf66f
|
updated back unit tests
|
2019-09-19 09:17:21 +02:00 |
|
Bernat
|
526e4e34fa
|
skip e2e #1702
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 09:05:11 +02:00 |
|
Joan Sanchez
|
73b1f18759
|
Fixed production errors #1699
|
2019-09-19 08:58:42 +02:00 |
|
Bernat
|
c773ddc499
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-19 06:56:47 +02:00 |
|
Joan Sanchez
|
335f92173c
|
updated transactions
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-18 15:11:09 +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 |
|
Joan Sanchez
|
f56e4f4b7d
|
pick
gitea/salix/master This commit looks good
Details
|
2019-09-18 10:37:54 +02:00 |
|
Joan Sanchez
|
86ef44c90d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-09-18 10:35:49 +02:00 |
|
Joan Sanchez
|
031dbcb63a
|
Unlocked from autocomplete city and postcode fields #1703
|
2019-09-18 10:35:46 +02:00 |
|
Carlos Jimenez Ruiz
|
4c33f07e42
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-18 09:42:45 +02:00 |
|
Carlos Jimenez Ruiz
|
b12d0388c9
|
#1074 Undo changes button for forms
|
2019-09-18 09:41:25 +02:00 |
|
Bernat
|
cbbce91def
|
#1693 export structure, data and fix back test
|
2019-09-17 13:52:29 +02:00 |
|
Joan Sanchez
|
c7423f5580
|
pick2
gitea/salix/master This commit looks good
Details
|
2019-09-17 07:15:34 +02:00 |
|
Joan Sanchez
|
dd0c34d31b
|
allowed null parent
|
2019-09-17 07:13:37 +02:00 |
|
Joan Sanchez
|
043fe80254
|
cherry 1
|
2019-09-17 07:12:45 +02:00 |
|
Carlos Jimenez Ruiz
|
206dec59a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
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
|
a529efc783
|
getleaves fix
gitea/salix/dev This commit looks good
Details
|
2019-09-13 13:26:50 +02:00 |
|
Joan Sanchez
|
a25652293d
|
changed initial leaves depth
gitea/salix/dev This commit looks good
Details
|
2019-09-13 12:26:37 +02:00 |
|
Joan Sanchez
|
7f23e006fa
|
allowed null parent
gitea/salix/dev This commit looks good
Details
|
2019-09-13 12:16:38 +02:00 |
|
Bernat
|
2e1b329584
|
#1681 delete comment
gitea/salix/dev This commit looks good
Details
|
2019-09-13 11:27:32 +02:00 |
|
Bernat
|
c6507fc2bb
|
#1681 crear test para el endpoint getPossibleStowaways
gitea/salix/dev This commit looks good
Details
|
2019-09-13 07:40:27 +02:00 |
|
Bernat
|
2172bdee4e
|
#1689
|
2019-09-12 12:27:19 +02:00 |
|
Joan Sanchez
|
8b8463e936
|
Updated dms colums size #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 12:12:39 +02:00 |
|
Joan Sanchez
|
f6bd915ae6
|
Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 11:47:56 +02:00 |
|
Joan Sanchez
|
e16d43b2fc
|
Allow disable log on model properties
gitea/salix/dev This commit looks good
Details
|
2019-09-12 09:49:02 +02:00 |
|
Joan Sanchez
|
9bf54f34dd
|
Added fruit translation
gitea/salix/dev This commit looks good
Details
|
2019-09-12 07:26:15 +02:00 |
|
Joan Sanchez
|
5d980f5129
|
Added fruit translation
gitea/salix/master This commit looks good
Details
|
2019-09-12 07:25:05 +02:00 |
|
Bernat
|
c344d8088b
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-09-11 14:18:21 +02:00 |
|
Joan Sanchez
|
ff626764d8
|
fixed back unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-11 08:24:28 +02:00 |
|
Joan Sanchez
|
342886942f
|
fixed sale loggable transaction error #1686
gitea/salix/dev This commit has test failures
Details
|
2019-09-11 08:12:27 +02:00 |
|
Bernat
|
03c44d4ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-10 14:43:10 +02:00 |
|
Bernat
|
ac6d1ed829
|
#1663 update ticketLog
|
2019-09-10 14:43:00 +02:00 |
|
Joan Sanchez
|
b36846994d
|
Server error on change paymethod #1687
gitea/salix/master This commit looks good
Details
|
2019-09-10 14:13:45 +02:00 |
|
Joan Sanchez
|
0ed240df0b
|
Server error on change paymethod #1687
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-10 14:12:03 +02:00 |
|
Bernat
|
8932aa4e5a
|
Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log
|
2019-09-10 13:27:41 +02:00 |
|
Joan Sanchez
|
7ecb67052d
|
item.diary css chip fixed #1676
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-10 08:47:46 +02:00 |
|
Joan Sanchez
|
197e89ae5a
|
Added fiscal data validate translation
gitea/salix/dev This commit looks good
Details
|
2019-09-09 12:45:09 +02:00 |
|
Joan Sanchez
|
73f438c300
|
reset watcher on changes #1678
|
2019-09-09 12:35:59 +02:00 |
|
Joan Sanchez
|
1f5a75b285
|
fixed karma unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-09 10:57:10 +02:00 |
|
Joan Sanchez
|
7a1ae9177b
|
Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-09 09:05:13 +02:00 |
|
Carlos Jimenez Ruiz
|
3c9fe334c9
|
#1655 e2e ticket.sale Añadir lineas
gitea/salix/dev This commit looks good
Details
|
2019-09-06 14:56:56 +02:00 |
|
Carlos Jimenez Ruiz
|
56c291a160
|
merge
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-06 11:45:55 +02:00 |
|
Carlos Jimenez Ruiz
|
ce9fb14b62
|
#1655 e2e ticket.sale Añadir lineas
|
2019-09-06 11:43:15 +02:00 |
|
Joan Sanchez
|
f31d544cd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-06 11:06:57 +02:00 |
|
Joan Sanchez
|
7fad401624
|
Send delivery note to client #1332
|
2019-09-06 11:06:44 +02:00 |
|
Bernat
|
e8cb57e27a
|
#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen
gitea/salix/dev This commit looks good
Details
|
2019-09-06 09:47:58 +02:00 |
|
Bernat
|
751c945575
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-06 09:35:27 +02:00 |
|
Bernat
|
ec2a457849
|
ticket.weekly add order
|
2019-09-06 08:00:19 +02:00 |
|
Joan Sanchez
|
176750046a
|
Scroll component #643
gitea/salix/dev This commit looks good
Details
|
2019-09-05 13:06:40 +02:00 |
|
Bernat
|
9db989d191
|
ticket.sale ok state fixed
gitea/salix/master This commit looks good
Details
|
2019-09-05 11:12:33 +02:00 |
|
Joan Sanchez
|
59c6952025
|
Implement watcher on ticket sales #1678
gitea/salix/dev This commit looks good
Details
|
2019-09-05 09:00:55 +02:00 |
|
Joan Sanchez
|
0d21519523
|
updated transfer css
gitea/salix/dev This commit looks good
Details
|
2019-09-04 14:37:29 +02:00 |
|
Joan Sanchez
|
db1113ab0b
|
added scrollbar to transfer popover
gitea/salix/dev This commit looks good
Details
|
2019-09-04 14:08:08 +02:00 |
|
Joan Sanchez
|
81072ce7e8
|
fixed claim refund
gitea/salix/master This commit looks good
Details
|
2019-09-04 13:49:16 +02:00 |
|
Joan Sanchez
|
6f508838c9
|
claim.action falla el boton import #1679
gitea/salix/dev This commit looks good
Details
|
2019-09-04 13:39:01 +02:00 |
 Javi Gallego
|
2b14a9050e
|
Bug/Test #1679 claim.action falla el boton import
gitea/salix/dev This commit has test failures
Details
|
2019-09-04 12:17:33 +02:00 |
|
Joan Sanchez
|
93286663ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-04 09:41:27 +02:00 |
|
Bernat
|
a2228fa15f
|
Tarea #1673 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-09-04 09:06:08 +02:00 |
|
Joan Sanchez
|
693c204e21
|
Calendar last day selection fixed #1465
|
2019-09-04 08:42:01 +02:00 |
|
Joan Sanchez
|
d3441fa1b3
|
Ticket step one refactor #1669
gitea/salix/dev This commit looks good
Details
|
2019-09-04 08:04:31 +02:00 |
|
Bernat
|
f0447c18ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-03 14:54:29 +02:00 |
|
Carlos Jimenez Ruiz
|
c1cca30a26
|
bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good
Details
|
2019-09-03 14:42:52 +02:00 |
|
Bernat
|
fc872a2b21
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-03 14:38:40 +02:00 |
|
Carlos Jimenez Ruiz
|
219614b44f
|
#1656 ticket.regularizar eliminar ticket + tests
gitea/salix/dev This commit looks good
Details
|
2019-09-03 13:27:02 +02:00 |
|
Bernat
|
36d9d320c0
|
Tarea #1672 route.ticket
|
2019-09-03 10:54:52 +02:00 |
|
Carlos Jimenez Ruiz
|
e1b5b449ce
|
#1656 ticket.regularizar eliminar ticket
|
2019-09-03 09:57:53 +02:00 |
|
Joan Sanchez
|
7b40fe2942
|
ticket.basicData Update zone on changes + fixes #1668
gitea/salix/master This commit looks good
Details
|
2019-09-02 14:37:30 +02:00 |
|
Joan Sanchez
|
d93974f481
|
ticket.basicData Update zone on changes + fixes #1668
gitea/salix/dev This commit has test failures
Details
|
2019-09-02 14:36:54 +02:00 |
|
Joan Sanchez
|
50c989a267
|
Add attendedBy and salesPerson filters #1661
gitea/salix/dev This commit looks good
Details
|
2019-09-02 12:23:49 +02:00 |
|
Joan Sanchez
|
37b9c5c4ce
|
Added zone inflation field #1641
gitea/salix/dev This commit looks good
Details
|
2019-09-02 11:25:31 +02:00 |
|
Bernat
|
b6edcde589
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-02 09:43:30 +02:00 |
|
Bernat
|
2a21e9d60e
|
#1654
|
2019-09-02 09:43:22 +02:00 |
|
Joan Sanchez
|
8726aa70c5
|
removed autocompletion on change postal code #1638
gitea/salix/master This commit looks good
Details
|
2019-09-02 09:35:03 +02:00 |
|
Bernat
|
82c569cfc0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-02 09:25:25 +02:00 |
|
Bernat
|
fb62128a80
|
Refactor #1652 client.addres.index
|
2019-09-02 09:25:18 +02:00 |
|
Joan Sanchez
|
e2b972431a
|
removed autocompletion on change postal code #1638
gitea/salix/dev This commit looks good
Details
|
2019-09-02 09:11:40 +02:00 |
|
Carlos Jimenez Ruiz
|
8dbcf917a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-08-29 13:16:53 +02:00 |
|
Carlos Jimenez Ruiz
|
b9234fc1a8
|
#1642 order.summary en el descriptor
|
2019-08-29 13:16:38 +02:00 |
|
Bernat
|
b656db3a84
|
#1645 refactor search panel
gitea/salix/dev This commit looks good
Details
|
2019-08-29 08:32:46 +02:00 |
|
Bernat
|
6daabed202
|
#1645 first part, delete hasVisible
gitea/salix/dev This commit looks good
Details
|
2019-08-28 12:17:06 +02:00 |
|
Carlos Jimenez Ruiz
|
5e69fc0aa5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-08-28 08:10:49 +02:00 |
|
Carlos Jimenez Ruiz
|
5e3b8fe1f0
|
#1648 claim.detail add cambiar campos
|
2019-08-28 08:08:30 +02:00 |
|
Bernat
|
15097313a2
|
#1651 worker.json
gitea/salix/dev This commit looks good
Details
|
2019-08-27 11:12:17 +02:00 |
|
Carlos Jimenez Ruiz
|
11b99d9a5f
|
#1618 e2e ticket.basicData.stepOne
gitea/salix/dev This commit looks good
Details
|
2019-08-20 14:18:32 +02:00 |
|
Bernat
|
7eea9d1d2c
|
Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-19 07:56:20 +02:00 |
|
Bernat
|
4032bde243
|
fix bug ticket.sale
gitea/salix/dev This commit looks good
Details
|
2019-08-13 14:03:02 +02:00 |
|
Bernat
|
d9c63e3bc0
|
Tarea #1501 ticket / delete
gitea/salix/dev This commit looks good
Details
|
2019-08-13 12:44:34 +02:00 |
|
Bernat
|
b749cb80df
|
Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good
Details
|
2019-08-13 07:45:29 +02:00 |
|
Bernat
|
f05f3a3df7
|
Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good
Details
|
2019-08-12 14:58:46 +02:00 |
|
Bernat
|
d08a43bc23
|
#1630 state.isEditable
gitea/salix/dev This commit looks good
Details
|
2019-08-12 13:28:27 +02:00 |
|
Bernat
|
2e89af9795
|
#1630 state.isEditable
gitea/salix/dev This commit has test failures
Details
|
2019-08-12 13:26:44 +02:00 |
|
Bernat
|
b6cc769df3
|
Test #1636 refactor test de back isEditable y editableState
gitea/salix/dev This commit has test failures
Details
|
2019-08-12 12:31:31 +02:00 |
|
Joan Sanchez
|
0918f154e9
|
transfer partially sale #1251
gitea/salix/dev This commit looks good
Details
|
2019-08-09 08:04:44 +02:00 |
|
Joan Sanchez
|
a5486ec694
|
Get allowed content-types from model #1598
gitea/salix/dev This commit looks good
Details
|
2019-08-08 08:37:03 +02:00 |
|
Bernat
|
2f1472b9ee
|
Tarea #1574
gitea/salix/dev This commit looks good
Details
ticket.sale editableState
|
2019-08-08 08:33:27 +02:00 |
|
Bernat
|
8f519fd15b
|
Bug #900 Ticket.picture lineas vacias cuando no tiene tags
gitea/salix/dev This commit looks good
Details
|
2019-08-07 09:58:05 +02:00 |
|
Bernat
|
fa4fd15450
|
Tarea #1573 order.catalog No deben de mostrar familias vacias
|
2019-08-07 07:27:00 +02:00 |
|
Bernat
|
7e1eba53f1
|
Refactor #1627 worker.timeControl
|
2019-08-06 12:25:53 +02:00 |
|
Joan Sanchez
|
72a02112b5
|
fixed fiscal data postcode selection
gitea/salix/master There was a failure building this commit
Details
|
2019-08-06 12:12:51 +02:00 |
|
Joan Sanchez
|
3d88d41bd0
|
fixed fiscal data postcode selection
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-06 12:07:48 +02:00 |
|
Joan Sanchez
|
e011c120db
|
ticket.sale split show active tickets
gitea/salix/master This commit looks good
Details
|
2019-08-06 07:37:30 +02:00 |
|
Joan Sanchez
|
e52a0ac5da
|
ticket.sale split show active tickets
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-06 07:36:26 +02:00 |
|
Bernat
|
4e329a4201
|
Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/master This commit looks good
Details
|
2019-08-02 12:24:08 +02:00 |
|
Joan Sanchez
|
2ff374e7ba
|
postcode autocompletion fixes
gitea/salix/master This commit looks good
Details
|
2019-08-02 08:28:44 +02:00 |
|
Joan Sanchez
|
2c71a983e3
|
postcode autocompletion fixes
gitea/salix/dev This commit looks good
Details
|
2019-08-02 08:27:55 +02:00 |
|
Joan Sanchez
|
e7511aefdc
|
back errors fixed
gitea/salix/master This commit looks good
Details
|
2019-08-01 11:53:33 +02:00 |
|
Joan Sanchez
|
efeba38fb4
|
back errors fixed
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-01 11:52:53 +02:00 |
|
Joan Sanchez
|
e3c4536183
|
timeControl calendar fixed #1623
gitea/salix/master This commit looks good
Details
|
2019-08-01 10:29:26 +02:00 |
|
Joan Sanchez
|
31b5f689df
|
timeControl calendar fixed #1623
gitea/salix/dev This commit looks good
Details
|
2019-08-01 09:58:59 +02:00 |
|
Bernat
|
098dd7b235
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-07-31 10:45:03 +02:00 |
|
Joan Sanchez
|
77d8ac82a5
|
contabilize worker.calenday holidays, updated styles
gitea/salix/test This commit looks good
Details
|
2019-07-31 09:51:08 +02:00 |
|
Joan Sanchez
|
eccf381e56
|
contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures
Details
|
2019-07-31 09:50:47 +02:00 |
|
Bernat
|
116a34d04a
|
fix test
|
2019-07-31 09:17:26 +02:00 |
|
Bernat
|
7571cd6e1b
|
Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures
Details
|
2019-07-31 07:46:24 +02:00 |
|
Joan Sanchez
|
5974f6e0c2
|
ticket basicData change zone on date update
gitea/salix/test This commit looks good
Details
|
2019-07-30 12:44:25 +02:00 |
|
Joan Sanchez
|
82d3ac27cf
|
ticket basicData change zone on date update
gitea/salix/dev This commit looks good
Details
|
2019-07-30 12:43:21 +02:00 |
|
Joan Sanchez
|
fb4ce77c01
|
claim upload pictures #1593
gitea/salix/dev This commit looks good
Details
|
2019-07-30 08:51:38 +02:00 |
|
Joan Sanchez
|
07af2271c2
|
ticket.weekly Add ticket #1612
gitea/salix/dev This commit looks good
Details
|
2019-07-29 13:12:36 +02:00 |
|
Joan Sanchez
|
2c6ba0089b
|
merge
gitea/salix/test This commit looks good
Details
|
2019-07-29 08:35:58 +02:00 |
|
Joan Sanchez
|
f4a3b8e9b2
|
client.create not showing all postcodes, changed autocomplete #1619
gitea/salix/dev This commit looks good
Details
|
2019-07-26 13:05:22 +02:00 |
|
Joan Sanchez
|
64a4e5f43d
|
ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good
Details
|
2019-07-26 11:48:01 +02:00 |
|
Carlos Jimenez Ruiz
|
c2573d6853
|
css amends for item-request
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 11:25:01 +02:00 |
|
Carlos Jimenez Ruiz
|
e1cbf781e1
|
#1608 item.request
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 09:55:09 +02:00 |
|
Joan Sanchez
|
6d5412227a
|
Changed invoiceOut pdf to hasPdf
gitea/salix/dev This commit has test failures
Details
|
2019-07-24 12:42:33 +02:00 |
|
Bernat
|
8089c32ec2
|
Tarea #1611 export db roduction to local
gitea/salix/dev This commit looks good
Details
|
2019-07-23 14:56:57 +02:00 |
|
Bernat
|
97f2229090
|
Tarea #1603 ticket.index ticket.sales problems icon
gitea/salix/dev This commit looks good
Details
|
2019-07-23 11:15:06 +02:00 |
|
Bernat
|
16257e9918
|
fix test front
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-23 07:36:10 +02:00 |
|
Bernat
|
6a23a5429c
|
Tarea #1562 ticket.line isEditable
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-22 13:14:00 +02:00 |
|
Joan Sanchez
|
85049c126b
|
catalogFilter show items without color
gitea/salix/dev This commit looks good
Details
|
2019-07-19 09:25:59 +02:00 |
|
Joan Sanchez
|
970c8ab5ec
|
show dms order number #1601
gitea/salix/dev This commit looks good
Details
|
2019-07-19 08:13:52 +02:00 |
|
Joan Sanchez
|
51734db404
|
ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-17 15:01:38 +02:00 |
|
Joan Sanchez
|
f56423bac9
|
disabled hasFile checkbox for dms edit forms
gitea/salix/dev This commit looks good
Details
|
2019-07-17 10:55:58 +02:00 |
|
Joan Sanchez
|
c51c4383ce
|
fixed unit tests
gitea/salix/dev This commit looks good
Details
|
2019-07-17 07:39:08 +02:00 |
|
Joan Sanchez
|
e99bae89b4
|
fixed e2e tests
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-17 07:33:46 +02:00 |
|
Joan Sanchez
|
145e596d16
|
fixed dms unit tests
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 14:12:58 +02:00 |
|
Joan Sanchez
|
89a3c399c1
|
merge with dev
gitea/salix/test This commit looks good
Details
|
2019-07-16 13:41:34 +02:00 |
|
Joan Sanchez
|
4f73d1eb5a
|
dms fixes
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-16 13:37:25 +02:00 |
|
Joan Sanchez
|
3c3f4bfeae
|
address.edit fixed location autocompletion
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 08:26:57 +02:00 |
|
Joan Sanchez
|
72fcf807b0
|
7z mimetype
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 07:22:29 +02:00 |
|
Joan Sanchez
|
b85aa6d3da
|
fixed icons column size
gitea/salix/dev This commit has test failures
Details
|
2019-07-15 13:20:50 +02:00 |
|
Joan Sanchez
|
aa19e54a16
|
removed download file conditional
gitea/salix/test This commit looks good
Details
|
2019-07-15 11:56:46 +02:00 |
|
Joan Sanchez
|
dae49f52b6
|
removed download file conditional
gitea/salix/dev This commit looks good
Details
|
2019-07-15 11:56:17 +02:00 |
|
Joan Sanchez
|
fefb389872
|
dms update files
gitea/salix/test This commit looks good
Details
|
2019-07-15 11:48:03 +02:00 |
|
Joan Sanchez
|
588250b1c1
|
dms update files
gitea/salix/dev This commit looks good
Details
|
2019-07-15 11:40:11 +02:00 |
|
Joan Sanchez
|
88b698f3eb
|
merge with dev
gitea/salix/test This commit looks good
Details
|
2019-07-15 09:04:11 +02:00 |
|
Joan Sanchez
|
23f5ff0c5c
|
merge
gitea/salix/dev Something is wrong with the build of this commit
Details
|
2019-07-12 14:02:38 +02:00 |
|
Joan Sanchez
|
c21532e5f7
|
ticket.index filters
gitea/salix/master This commit looks good
Details
|
2019-07-12 14:00:32 +02:00 |
|
Joan Sanchez
|
eefa4b9f5b
|
apply default filters
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:56:00 +02:00 |
|
Joan Sanchez
|
6b9286d1b0
|
fixed ticket.index
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:32:02 +02:00 |
|
Joan Sanchez
|
c4fcaeb908
|
ticket.index filter by date if no filters were entered
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:20:55 +02:00 |
|
Joan Sanchez
|
29744c52f3
|
fixed ticket.index
gitea/salix/master This commit looks good
Details
|
2019-07-12 11:43:10 +02:00 |
|
Joan Sanchez
|
e135ae039a
|
changed closure field
gitea/salix/dev This commit looks good
Details
|
2019-07-12 09:42:06 +02:00 |
|
Joan Sanchez
|
25014654b1
|
changed closure field
gitea/salix/master This commit looks good
Details
|
2019-07-12 09:39:59 +02:00 |
|
Joan Sanchez
|
659a441f47
|
ticket index show zone closure hour
gitea/salix/master This commit looks good
Details
|
2019-07-12 09:29:22 +02:00 |
|
Joan Sanchez
|
6634cdf059
|
ticket.index show zone hour & minute. Show only tickets from today
|
2019-07-12 09:29:16 +02:00 |
|
Joan Sanchez
|
14a69e47c9
|
ticket index show zone closure hour
gitea/salix/dev This commit looks good
Details
|
2019-07-12 09:06:19 +02:00 |
|
Joan Sanchez
|
18ca64a7d9
|
ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/test This commit looks good
Details
|
2019-07-12 08:50:51 +02:00 |
|
Joan Sanchez
|
2a6de77e17
|
ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-12 08:49:44 +02:00 |
|
Joan Sanchez
|
1b8a407916
|
show expeditions fix
gitea/salix/master This commit looks good
Details
|
2019-07-11 11:21:12 +02:00 |
|
Joan Sanchez
|
62ef2dccd8
|
show expeditions fix
gitea/salix/dev This commit looks good
Details
|
2019-07-11 11:20:41 +02:00 |
|
Joan Sanchez
|
8ecc88b516
|
hide download button for dms without a file attached #1590
gitea/salix/master This commit looks good
Details
|
2019-07-11 09:54:42 +02:00 |
|
Joan Sanchez
|
3ce59c0b73
|
hide download button for dms without a file attached #1590
gitea/salix/dev This commit looks good
Details
|
2019-07-11 09:53:16 +02:00 |
|
Joan Sanchez
|
cb23fd28fa
|
updated unit tests
|
2019-07-11 07:18:07 +02:00 |
|
Joan Sanchez
|
8a5e0c5402
|
Notify password changes #1588
|
2019-07-11 07:06:53 +02:00 |
|
Javi Gallego
|
f79b638e49
|
#1564 client.summary defaulting cantidad
gitea/salix/test This commit looks good
Details
|
2019-07-09 09:31:08 +02:00 |
|
Joan Sanchez
|
6f3b023644
|
Create postcode form #1585
gitea/salix/dev This commit looks good
Details
|
2019-07-08 14:07:09 +02:00 |
|
Bernat
|
b98b534eec
|
Tarea #1583 exportar produccio a la local
gitea/salix/dev This commit looks good
Details
|
2019-07-05 14:16:33 +02:00 |
|
Joan Sanchez
|
8ec61bf31f
|
fixed unit test for weekends
gitea/salix/dev This commit looks good
Details
|
2019-07-05 11:18:08 +02:00 |
|
Bernat
|
061f0cb39c
|
Refactor #1581 client.balance.create
gitea/salix/dev This commit looks good
Details
|
2019-07-04 10:34:19 +02:00 |
|
Carlos Jimenez Ruiz
|
fc80848506
|
merge
|
2019-07-03 14:40:53 +02:00 |
|
Carlos Jimenez Ruiz
|
ea5cbf634b
|
#1392 order.catalog
|
2019-07-03 14:39:08 +02:00 |
|
Bernat
|
82a1d00b0c
|
Tarea #1516 order.index buscador avanzado añadir mi equipo
gitea/salix/dev This commit looks good
Details
|
2019-07-03 14:06:27 +02:00 |
|
Carlos Jimenez Ruiz
|
a35533687f
|
removed unused spec files
gitea/salix/dev This commit looks good
Details
|
2019-07-03 11:53:03 +02:00 |
|
Carlos Jimenez Ruiz
|
6b5acf5fe3
|
removed unused spec files
gitea/salix/test There was a failure building this commit
Details
|
2019-07-03 11:51:42 +02:00 |
|
Carlos Jimenez Ruiz
|
553b8e681b
|
#1567 refactor logs - worker descriptor
|
2019-07-03 11:18:01 +02:00 |
|
Carlos Jimenez Ruiz
|
a2a9dfd7e5
|
#1567 refactor logs - worker descriptor
|
2019-07-03 11:08:44 +02:00 |
|
Bernat
|
65ec629221
|
Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse
|
2019-07-03 08:29:40 +02:00 |
|
Carlos Jimenez Ruiz
|
4b0a71644f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-07-02 14:44:39 +02:00 |
|
Carlos Jimenez Ruiz
|
4ac419b419
|
#1528 e2e claim/detail
|
2019-07-02 14:44:36 +02:00 |
|
Joan Sanchez
|
bddfbc4b34
|
add new item from ticket.sale #1414, checkedLines fixed
|
2019-07-02 12:12:15 +02:00 |
|
Bernat
|
dd38a21e8d
|
Refactor #1569 claim.delete, update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-07-01 11:56:16 +02:00 |
|
Carlos Jimenez Ruiz
|
bd76840cb3
|
#1446 e2e ticket.summary
gitea/salix/dev This commit looks good
Details
|
2019-06-27 15:33:15 +02:00 |
|
Bernat
|
fb2545994c
|
Refactor #1563 fixtures item
gitea/salix/dev This commit looks good
Details
|
2019-06-27 12:38:30 +02:00 |
|
Joan Sanchez
|
507bc8c2ce
|
updated fonts & calendar acls
gitea/salix/dev This commit looks good
Details
|
2019-06-27 11:48:33 +02:00 |
|
Carlos Jimenez Ruiz
|
8c26a89516
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:44:29 +02:00 |
|
Carlos Jimenez Ruiz
|
a7c5a9e598
|
#1566 ticket.sales state autocomplete
|
2019-06-27 09:44:19 +02:00 |
|
Bernat
|
e945967762
|
Refactor #1563 fixtures item,sale,saleComponent
gitea/salix/dev This commit looks good
Details
|
2019-06-27 09:03:03 +02:00 |
|
Carlos Jimenez Ruiz
|
5270693bdd
|
#1387 e2e Ticket Edit sale path
gitea/salix/dev This commit looks good
Details
|
2019-06-26 15:27:58 +02:00 |
|
Carlos Jimenez Ruiz
|
c352a12d49
|
merge
|
2019-06-26 15:02:22 +02:00 |
|
Carlos Jimenez Ruiz
|
d27402d4e6
|
#1558 ticket.sales mark/unmark as reserved
|
2019-06-26 13:56:40 +02:00 |
|
Joan Sanchez
|
8ff61a5d3a
|
added zone prices, radio-group and calendar refactor #1320
gitea/salix/dev This commit looks good
Details
|
2019-06-26 13:35:38 +02:00 |
|
Javi Gallego
|
b0c34f8e29
|
#1564 client.summary defaulting cantidad
gitea/salix/dev This commit looks good
Details
|
2019-06-26 12:18:47 +02:00 |
|
Bernat
|
682a75ac76
|
#1533 update fixtures and fix test
gitea/salix/dev This commit looks good
Details
|
2019-06-25 14:00:55 +02:00 |
|
Carlos Jimenez Ruiz
|
2ce442a022
|
#1555 ticket.lines transer to a new ticket
gitea/salix/dev This commit looks good
Details
|
2019-06-25 11:17:58 +02:00 |
|
Bernat
|
1227f7ac83
|
Test #1549 Arreglar test de back
gitea/salix/dev This commit looks good
Details
|
2019-06-21 13:19:51 +02:00 |