 Joan Sanchez
|
3d90e80c82
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-19 11:53:04 +01:00 |
|
Joan Sanchez
|
f9deb9f52d
|
send closure error by email
|
2019-11-19 11:53:01 +01:00 |
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-19 11:43:00 +01:00 |
|
Bernat
|
0b58b5d09a
|
update fixtures tblContadores
|
2019-11-19 11:40:46 +01:00 |
 Carlos Jimenez Ruiz
|
e74cb52867
|
Merge branch '1391-ticket_closure' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
LGTM
|
2019-11-19 07:02:12 +00:00 |
|
Joan Sanchez
|
06e4cbb783
|
renamed view atenderFk to
gitea/salix/dev This commit looks good
Details
|
2019-11-19 07:41:02 +01:00 |
|
Carlos Jimenez Ruiz
|
f5aacc804d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:46:51 +01:00 |
 Juan Ferrer
|
bdb03729b7
|
zone_getOptionsForShipment fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:36:08 +01:00 |
|
Carlos Jimenez Ruiz
|
04b4f60c48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 16:35:21 +01:00 |
|
Juan Ferrer
|
4d4e4f31f4
|
vnZoneEvents refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:31:37 +01:00 |
|
Joan Sanchez
|
8643030bf0
|
restructure router methods, added closure method
gitea/salix/1391-ticket_closure This commit looks good
Details
|
2019-11-18 15:04:51 +01:00 |
 Javi Gallego
|
60cdc1114c
|
#1602 back confirm.js
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-18 14:48:37 +01:00 |
|
Carlos Jimenez Ruiz
|
3c2ad2df48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 12:35:30 +01:00 |
|
Javi Gallego
|
4b51d607f7
|
error getLanded con drop temporary table
gitea/salix/dev This commit looks good
Details
|
2019-11-15 15:42:00 +01:00 |
|
Carlos Jimenez Ruiz
|
d1b114de59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-15 10:37:42 +01:00 |
|
Joan Sanchez
|
ddb19cb198
|
added event
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:03:46 +01:00 |
|
Juan Ferrer
|
64124376f0
|
Final fixes
|
2019-11-14 14:37:18 +01:00 |
|
Carlos Jimenez Ruiz
|
8629b72d55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-14 14:22:22 +01:00 |
|
Carlos Jimenez Ruiz
|
34bd35ce4e
|
#1852 worker.time-control
|
2019-11-14 14:20:05 +01:00 |
|
Javi Gallego
|
1301ea5962
|
test buyUltimateFromInterval arreglado
|
2019-11-14 13:40:53 +01:00 |
|
Javi Gallego
|
5da4722bdd
|
No borra warehouse de zone
|
2019-11-14 10:36:21 +01:00 |
|
Joan Sanchez
|
e0ed9072c9
|
unified LCR and CORE #1868
gitea/salix/dev This commit looks good
Details
|
2019-11-14 08:16:52 +01:00 |
|
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good
Details
|
2019-11-13 13:22:39 +01:00 |
|
Bernat
|
a3159f7dbd
|
dumped data updated
gitea/salix/dev This commit looks good
Details
|
2019-11-13 10:41:14 +01:00 |
|
Joan Sanchez
|
308c4dfb88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-13 08:09:54 +01:00 |
|
Joan Sanchez
|
c3962c3d78
|
updated test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 15:07:37 +01:00 |
|
Joan Sanchez
|
b320d64462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-12 14:54:13 +01:00 |
|
Joan Sanchez
|
1b70721b0e
|
#1864 added restrictions, send rocketchat message
|
2019-11-12 14:53:58 +01:00 |
|
Bernat
|
7cbbc4c18e
|
#1870 exportar produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-11-12 11:13:20 +01:00 |
|
Bernat
|
e8862b5b56
|
fix sql userPhone
gitea/salix/dev This commit looks good
Details
|
2019-11-12 08:52:09 +01:00 |
|
Joan Sanchez
|
6cedfceddd
|
Show ticket state #1836
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:51:30 +01:00 |
|
Joan Sanchez
|
963ac3ad77
|
dumpedfixtures rollback
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-11 11:56:13 +01:00 |
|
Joan Sanchez
|
6f7962935d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
|
2019-11-11 11:24:26 +01:00 |
|
Joan Sanchez
|
5705c37f92
|
show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-07 11:19:05 +01:00 |
|
Javi Gallego
|
bd630aa562
|
ticketCalculateClon
gitea/salix/dev This commit looks good
Details
|
2019-11-07 11:12:05 +01:00 |
|
Javi Gallego
|
eaa2ef4570
|
zone warehouse error
gitea/salix/dev This commit looks good
Details
|
2019-11-07 07:49:37 +01:00 |
|
Javi Gallego
|
729f6cb767
|
changes to zone
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-11-06 13:44:58 +01:00 |
|
Joan Sanchez
|
114e8c87d6
|
export sample table
gitea/salix/1466-print_refactor This commit has test failures
Details
|
2019-11-06 10:56:18 +01:00 |
|
Joan Sanchez
|
3cd92211a1
|
test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-06 10:55:04 +01:00 |
|
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good
Details
|
2019-10-31 12:54:16 +01:00 |
|
Javi Gallego
|
763f8f53f8
|
fixtures y algunos test de zone
gitea/salix/dev This commit has test failures
Details
|
2019-10-30 18:33:08 +01:00 |
|
Javi Gallego
|
700c092b90
|
merge
|
2019-10-29 12:58:26 +01:00 |
|
Javi Gallego
|
1a56f0af96
|
zoneRefactor
|
2019-10-29 12:29:38 +01:00 |
|
Bernat
|
cb90e86f64
|
#1846 exportar produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-10-29 11:28:35 +01:00 |
|
Bernat
|
9fd0ab0bd3
|
#1775 travel.log crear sección historial
|
2019-10-25 13:28:12 +02:00 |
|
Bernat
|
eb384425f2
|
#1777 travel.descriptor
gitea/salix/dev This commit looks good
Details
|
2019-10-24 14:43:11 +02:00 |
|
Bernat
|
afd7c5684a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good
Details
|
2019-10-24 12:49:23 +02:00 |
|
Bernat
|
7bdb497976
|
#1773 travel.summary & #1774
|
2019-10-24 12:49:18 +02:00 |
|
Carlos Jimenez Ruiz
|
c84625b0d5
|
#1713 route.tickets boton mas bajo derecha
gitea/salix/dev This commit looks good
Details
|
2019-10-23 09:25:28 +02:00 |
|
Bernat
|
939c507fba
|
#1810 El método listPackaging filtrar por isPackagingReturnable
|
2019-10-21 09:16:52 +02:00 |
|
Bernat
|
6adeb689eb
|
Tarea #1814 refactor fixtures userPhone
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:52:42 +02:00 |
|
Bernat
|
1cedd6cbfd
|
merge
|
2019-10-18 08:38:25 +02:00 |
|
Bernat
|
7a89ab5335
|
#1778 Refactor worker.phone
|
2019-10-18 08:36:33 +02:00 |
|
Carlos Jimenez Ruiz
|
bdbadaf61a
|
#1819 fixtures
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-17 14:30:52 +02:00 |
|
Joan Sanchez
|
6ed5695063
|
Added zoneFk to routes. solved #1713
gitea/salix/dev This commit looks good
Details
|
2019-10-16 07:18:05 +02:00 |
|
Bernat
|
25bd28990a
|
Refactor #1812 refactor phone
gitea/salix/dev This commit looks good
Details
|
2019-10-15 14:44:00 +02:00 |
|
Bernat
|
ed1ed7f50b
|
#1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-10-15 07:23:34 +02:00 |
|
Joan Sanchez
|
05d0f50606
|
changed warehouse from ticket id 17
gitea/salix/dev This commit looks good
Details
|
2019-10-10 09:58:34 +02:00 |
|
Joan Sanchez
|
eb655215f4
|
merge pull changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 09:23:29 +02:00 |
|
Joan Sanchez
|
9473636b5b
|
treeview refactor
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-02 09:54:52 +02:00 |
|
Joan Sanchez
|
183d770483
|
first changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-01 15:09:55 +02:00 |
|
Juan Ferrer
|
60f611b76b
|
Merge branch 'test' into dev
|
2019-09-26 12:47:45 +02:00 |
|
Juan Ferrer
|
445668d57f
|
Refactor agency SQL scripts
|
2019-09-26 12:47:16 +02:00 |
|
Juan Ferrer
|
5262cd7e43
|
Merge branch 'test' into dev
|
2019-09-26 10:09:17 +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 |
|
Juan Ferrer
|
3d4b7601be
|
SQL scripts
|
2019-09-26 10:08:37 +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 |
|
Juan Ferrer
|
91e4e62a1c
|
Merge branch 'test' into dev
|
2019-09-26 08:44:00 +02:00 |
|
Bernat
|
bf5a9967cf
|
Refactor #1682 modificar modelos componentRate y componentTypeRate
|
2019-09-24 13:45:54 +02:00 |
|
Joan Sanchez
|
bd8a1ee00e
|
merge with dev
gitea/salix/test This commit looks good
Details
|
2019-09-23 15:02:27 +02:00 |
|
Joan Sanchez
|
6910e6048b
|
fixed sql
gitea/salix/dev This commit looks good
Details
|
2019-09-23 14:50:30 +02:00 |
|
Joan Sanchez
|
f2d9323c4f
|
Deprecated ticketCalculate
gitea/salix/dev This commit looks good
Details
|
2019-09-23 14:47:27 +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
|
7daf2e4328
|
merge with master
gitea/salix/test This commit looks good
Details
|
2019-09-19 11:48:41 +02:00 |
|
Joan Sanchez
|
4d894365eb
|
Fixed production errors #1699
|
2019-09-19 09:42:41 +02:00 |
|
Joan Sanchez
|
73b1f18759
|
Fixed production errors #1699
|
2019-09-19 08:58:42 +02:00 |
|
Bernat
|
cbbce91def
|
#1693 export structure, data and fix back test
|
2019-09-17 13:52:29 +02:00 |
|
Bernat
|
40cfa19d01
|
bug claimDms
|
2019-09-16 12:51:51 +02:00 |
|
Bernat
|
a1e0da8905
|
Tarea #1689 exportat procedimientos a local desde produccion
|
2019-09-12 07:22:12 +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
|
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 |
|
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
|
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
|
d3441fa1b3
|
Ticket step one refactor #1669
gitea/salix/dev This commit looks good
Details
|
2019-09-04 08:04:31 +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
|
e1b5b449ce
|
#1656 ticket.regularizar eliminar ticket
|
2019-09-03 09:57:53 +02:00 |
|
Bernat
|
b9c13ac3a3
|
#1664 , table city deprecated
|
2019-09-02 14:58:58 +02:00 |
|
Joan Sanchez
|
67733e6e08
|
merge
gitea/salix/test This commit looks good
Details
|
2019-09-02 09:57:46 +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
|
3cea9cf405
|
#1637 update fixtures for dms
gitea/salix/dev This commit looks good
Details
|
2019-08-12 14:07:30 +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
|
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 |
|
Bernat
|
58ed37aa76
|
Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/test This commit looks good
Details
|
2019-08-02 12:23:50 +02:00 |
|
Joan Sanchez
|
07519a4369
|
mege from test branch
gitea/salix/master This commit looks good
Details
|
2019-07-31 11:34:54 +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
|
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 |
|
Bernat
|
4bc7d88162
|
refactor fixtures #1620
|
2019-07-30 11:57:28 +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 |
|
Bernat
|
46dac984ab
|
Refactor #1620 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-07-29 15:02:43 +02:00 |
|
Bernat
|
772095fc1e
|
Tarea #1617 eliminar vn2008.Gastos de export.data.sh
gitea/salix/dev This commit looks good
Details
|
2019-07-29 11:37:44 +02:00 |
|
Bernat
|
e6ac764762
|
Tarea #1617 eliminar tablas de export.data.sh
gitea/salix/dev This commit looks good
Details
|
2019-07-29 09:51:49 +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 |
|
Juan Ferrer
|
ab2a47d363
|
Docker size reduced
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 17:35:51 +02:00 |
|
Bernat
|
d608c80028
|
Bug #1616 fix db test
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 13:32:25 +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 |
|
Joan Sanchez
|
2c39103e93
|
fixed dms back unit tests
|
2019-07-17 07:45:43 +02:00 |
|
Joan Sanchez
|
a7b15c2dfc
|
fixed dms back unit tests
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-16 14:48:48 +02:00 |
|
Joan Sanchez
|
7b610d62b6
|
removed console.log
gitea/salix/dev This commit looks good
Details
|
2019-07-11 07:19:22 +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 |
|
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 |
|
Bernat
|
b3ade3c7f5
|
Tarea #1511
gitea/salix/dev This commit looks good
Details
refactr fixtures expedition
|
2019-06-27 13:20:30 +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 |
|
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
|
c352a12d49
|
merge
|
2019-06-26 15:02:22 +02:00 |
|
Carlos Jimenez Ruiz
|
fe7278af66
|
#1387 e2e Ticket Edit sale path
|
2019-06-26 14:19:08 +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 |
|
Bernat
|
13abed3d00
|
#1517 update ticketGetProblems
gitea/salix/dev This commit looks good
Details
|
2019-06-25 15:02:25 +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 |
|
Bernat
|
1227f7ac83
|
Test #1549 Arreglar test de back
gitea/salix/dev This commit looks good
Details
|
2019-06-21 13:19:51 +02:00 |
|
Bernat
|
7f2b61b39c
|
Test #1549 fix back test
|
2019-06-21 07:50:56 +02:00 |
|
Carlos Jimenez Ruiz
|
200488ab30
|
removed typo from fixtures sql
gitea/salix/dev There was a failure building this commit
Details
|
2019-06-20 14:42:47 +02:00 |
|
Carlos Jimenez Ruiz
|
73ccf9a107
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-19 14:42:59 +02:00 |
|
Carlos Jimenez Ruiz
|
560cce7c8c
|
#1537 refactor fixtures
|
2019-06-19 14:40:47 +02:00 |
|
Carlos Jimenez Ruiz
|
63febf8bd0
|
#1537 refactor fixtures + e2e fixes
|
2019-06-19 09:03:45 +02:00 |
|
Bernat
|
1336bf092d
|
Test #1540 Reparar test back db
gitea/salix/dev This commit looks good
Details
|
2019-06-19 07:20:02 +02:00 |
|
Joan Sanchez
|
9e03c5ff84
|
sql update dmsType codes
gitea/salix/dev This commit looks good
Details
|
2019-06-17 09:15:31 +02:00 |
|
Carlos Jimenez Ruiz
|
fcc0ad6098
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-06-14 12:27:54 +02:00 |
|
Carlos Jimenez Ruiz
|
b8a4861f01
|
#1526 refactor fixtures
|
2019-06-14 12:27:41 +02:00 |
|
Joan Sanchez
|
9c00e7e67c
|
Autocomplete geolocation from postcode #1519 and #1531
gitea/salix/dev This commit looks good
Details
|
2019-06-13 13:08:11 +02:00 |
|
Carlos Jimenez Ruiz
|
921af523f8
|
#1526 refactor fixtures
|
2019-06-12 11:38:31 +02:00 |
|
Bernat
|
4729a7e9a9
|
Bug #1514 route.volume No actualiza el volumen
gitea/salix/dev This commit looks good
Details
|
2019-06-11 12:25:17 +02:00 |
|
Bernat
|
2504d06bab
|
Bug/Test #1515 Dump structure de production a dev
|
2019-06-11 12:23:55 +02:00 |
|
Carlos Jimenez Ruiz
|
e0cc80277c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-07 14:13:49 +02:00 |
|
Joan Sanchez
|
43e87a1cb1
|
mege from test to dev - no structure
gitea/salix/dev This commit looks good
Details
|
2019-06-07 13:07:23 +02:00 |
|
Joan Sanchez
|
4545d1f649
|
merge from test to dev - no structure
|
2019-06-07 13:06:54 +02:00 |
|
Carlos Jimenez Ruiz
|
3ce4eafcee
|
merge
|
2019-06-07 09:24:27 +02:00 |
|
Carlos Jimenez Ruiz
|
777b0b3a38
|
#1400 report.sepaCore IBAN portugal
|
2019-06-07 09:18:54 +02:00 |
|
Bernat
|
ea38ff221d
|
#1467 ticket filter with hours
gitea/salix/dev This commit looks good
Details
|
2019-06-07 07:45:12 +02:00 |
|
Joan Sanchez
|
c28734ff61
|
added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit
Details
|
2019-06-06 13:59:11 +02:00 |
|
Bernat
|
3a338739d1
|
Tarea #1462 Route.descriptior Añadir menú - actualizar m3
gitea/salix/dev This commit looks good
Details
|
2019-06-05 13:51:34 +02:00 |
|
Joan Sanchez
|
59a958841e
|
fixed nodeAdd
gitea/salix/test This commit looks good
Details
|
2019-06-05 07:37:29 +02:00 |
|
Joan Sanchez
|
b9b1c2b2c7
|
added sql schema prefix
gitea/salix/test This commit looks good
Details
|
2019-06-05 07:31:23 +02:00 |
|
Joan Sanchez
|
16d91d0999
|
fixed zoneNest add new country
gitea/salix/test This commit looks good
Details
|
2019-06-04 21:05:43 +02:00 |
|
Juan Ferrer
|
47c47435fa
|
webZone SQL fixes
gitea/salix/test This commit looks good
Details
|
2019-06-04 13:23:36 +02:00 |
|
Javi Gallego
|
0f5ebf42ec
|
Tarea #1506 worker.pbx quitar campo password
gitea/salix/dev This commit has test failures
Details
|
2019-06-04 12:54:41 +02:00 |
|
Javi Gallego
|
78704995a2
|
comentarios de return
gitea/salix/test This commit looks good
Details
|
2019-06-04 12:20:33 +02:00 |
|
Juan Ferrer
|
50c25b42ce
|
SQL script moved to previous version
gitea/salix/test This commit looks good
Details
|
2019-06-04 09:23:50 +02:00 |
|
Juan Ferrer
|
5517ac265d
|
SQL webZone fixes
gitea/salix/test This commit looks good
Details
|
2019-06-04 09:14:42 +02:00 |
quique
|
a6a6ea5b06
|
WorkerTimerControl App
gitea/salix/test This commit looks good
Details
|
2019-06-03 09:41:54 +02:00 |
|
quique
|
b034333cdb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-06-03 09:20:35 +02:00 |
|
quique
|
8005b0a892
|
WorkerTimeControl App
|
2019-06-03 09:20:20 +02:00 |
|
Bernat
|
62fe9d760c
|
#1488 #1489 ticket sale updatePrice and backTest
gitea/salix/dev This commit looks good
Details
|
2019-06-03 08:01:24 +02:00 |
|
Bernat
|
97459bd7e6
|
1497
gitea/salix/test This commit looks good
Details
|
2019-05-31 11:33:28 +02:00 |
|
Carlos Jimenez Ruiz
|
a179cc8491
|
#1492 e2e proyecto Zone
gitea/salix/test This commit looks good
Details
|
2019-05-30 14:17:11 +02:00 |
|
Bernat
|
d4a3a1a72e
|
export production structure and fixtures updated
gitea/salix/test This commit looks good
Details
|
2019-05-30 13:45:13 +02:00 |
|
Javi Gallego
|
e01765e34e
|
test back-front fixed
gitea/salix/test This commit looks good
Details
|
2019-05-30 08:41:08 +02:00 |
|
Bernat
|
7a7ea03bff
|
1485 refactor updatePrice
gitea/salix/dev This commit has test failures
Details
|
2019-05-29 12:41:26 +02:00 |
|
Bernat
|
69434caa52
|
#1470 update fixtures, client.dms gestdoc
gitea/salix/dev This commit looks good
Details
|
2019-05-28 11:26:54 +02:00 |
|
Carlos Jimenez Ruiz
|
46a7661975
|
#1454 update table bi.tarifa_componentes
gitea/salix/dev This commit looks good
Details
|
2019-05-27 14:10:14 +02:00 |
|
Carlos Jimenez Ruiz
|
d041354210
|
#1454 update table bi.tarifa_componentes
|
2019-05-27 14:08:34 +02:00 |
|
Carlos Jimenez Ruiz
|
33f81ee4b7
|
#1472 update table vn2008.gesttip
gitea/salix/dev This commit looks good
Details
|
2019-05-27 11:04:57 +02:00 |
|
Bernat
|
59069749a2
|
1461 fix test back
gitea/salix/dev This commit looks good
Details
|
2019-05-27 09:19:23 +02:00 |
|
Javi Gallego
|
f871879ee5
|
merge fixtures dinamicas para zoneCalendar
|
2019-05-23 13:33:06 +02:00 |
|
Bernat
|
7bbabffc26
|
merge update fixtures zones
|
2019-05-23 13:29:24 +02:00 |
|
Javi Gallego
|
c5743ce37a
|
fallos de tablas
|
2019-05-23 13:25:26 +02:00 |
|
Bernat
|
e12d29ad62
|
merge fixtures for zone
|
2019-05-23 13:24:31 +02:00 |
|
Javi Gallego
|
c311b0ae65
|
dump y procedimientos volcados
|
2019-05-23 13:18:15 +02:00 |
|
Joan Sanchez
|
34542ce12f
|
message send ACL fix #1464
gitea/salix/dev This commit looks good
Details
|
2019-05-23 11:39:14 +02:00 |
|
Bernat
|
ae2fa8d0af
|
1459 export production to local
gitea/salix/dev This commit looks good
Details
|
2019-05-23 09:31:37 +02:00 |
|
Bernat
|
443feef673
|
#1456 fixtores for dms and model
gitea/salix/dev This commit looks good
Details
|
2019-05-23 09:30:29 +02:00 |
|
Bernat
|
33b1cca215
|
#1456 update fixtures and add dms view
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:09:15 +02:00 |
|
Carlos Jimenez Ruiz
|
66ddd56dec
|
removed string format from id field
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:02:25 +02:00 |
|
Carlos Jimenez Ruiz
|
4c8aa7ff6e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-22 11:59:14 +02:00 |
|
Carlos Jimenez Ruiz
|
e474abbc3a
|
ACL error fixed
|
2019-05-22 11:59:07 +02:00 |
|
Joan Sanchez
|
fe250b8269
|
fixed workerTimeControl fixtures
gitea/salix/dev This commit looks good
Details
|
2019-05-21 13:48:19 +02:00 |
|
Bernat
|
2636e2d221
|
#1454 update table bi.tarifa_componentes
gitea/salix/dev This commit looks good
Details
|
2019-05-21 12:46:22 +02:00 |
|
Carlos Jimenez Ruiz
|
28057ecf3f
|
#1445 e2e ticket.services
gitea/salix/dev This commit looks good
Details
|
2019-05-20 11:16:56 +02:00 |
|
Joan Sanchez
|
183bf137f6
|
added workerTimeControl #1360
gitea/salix/dev This commit has test failures
Details
|
2019-05-17 13:27:51 +02:00 |
|
Bernat
|
d0c4a4d478
|
update worker fixtures
gitea/salix/dev This commit looks good
Details
|
2019-05-17 11:09:24 +02:00 |
|
Javi Gallego
|
0d0f354902
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-09 11:25:51 +02:00 |
|
Javi Gallego
|
ac5b17be31
|
ticket View
|
2019-05-09 11:25:46 +02:00 |
|
Bernat
|
1f128797c3
|
export production to local, fix test and add fixtures
gitea/salix/dev This commit looks good
Details
|
2019-05-09 09:32:04 +02:00 |
|
Javi Gallego
|
4281181602
|
alter table ticket
gitea/salix/dev This commit looks good
Details
|
2019-05-08 15:34:10 +02:00 |
|
Carlos Jimenez Ruiz
|
189cefe327
|
#1407 email core francia LCR
gitea/salix/dev This commit has test failures
Details
|
2019-05-08 11:09:27 +02:00 |
|
Carlos Jimenez Ruiz
|
c9521d1024
|
#1407 email core francia LCR
|
2019-05-08 10:42:26 +02:00 |
|
Carlos Jimenez Ruiz
|
62550b76f6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-08 08:48:57 +02:00 |
|
Carlos Jimenez Ruiz
|
92b171cfce
|
#1407 email core francia LCR
|
2019-05-08 08:48:47 +02:00 |
|
Javi Gallego
|
810f4462f6
|
fixtures acl
gitea/salix/dev This commit looks good
Details
|
2019-05-07 10:41:20 +02:00 |
|
Bernat
|
86e0d66f55
|
#926 update fixtures and model claimState
gitea/salix/dev This commit looks good
Details
|
2019-05-07 08:18:14 +02:00 |
|
Carlos Jimenez Ruiz
|
8771098045
|
#1350 route.index
gitea/salix/dev This commit looks good
Details
|
2019-05-03 18:23:44 +02:00 |
|
Carlos Jimenez Ruiz
|
b60ee825ba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-05-03 17:38:47 +02:00 |
|
Bernat
|
91e8b1f81b
|
update fixtures, #1388 ticket descript change shiiped hour
gitea/salix/dev This commit looks good
Details
|
2019-05-03 12:23:57 +02:00 |
|
Carlos Jimenez Ruiz
|
8bfcdf435f
|
#1351 e2e order.catalog + extensions refactor
|
2019-05-02 11:23:54 +02:00 |
|
Joan Sanchez
|
599f6b467e
|
fixed ticketConfig sql script
gitea/salix/dev This commit looks good
Details
|
2019-05-01 19:23:05 +02:00 |
|
Joan Sanchez
|
2b7287dabb
|
added ticket.dms #1373
gitea/salix/dev This commit looks good
Details
|
2019-05-01 18:49:39 +02:00 |
|
Joan Sanchez
|
1a524e33b1
|
regenerate invoiceOut ACL
gitea/salix/dev This commit looks good
Details
|
2019-04-30 11:29:57 +02:00 |
|
Bernat
|
a81e705251
|
#1341 invoiceOut.descriptor book invoiceOut
gitea/salix/dev This commit looks good
Details
|
2019-04-30 11:03:48 +02:00 |
|
Joan Sanchez
|
69403223d8
|
fixed treeview #1374
gitea/salix/dev This commit looks good
Details
|
2019-04-29 11:49:43 +02:00 |
|
Bernat
|
a8a5193a86
|
1389 update fixtures for invoiceOut and fix test
gitea/salix/dev This commit looks good
Details
|
2019-04-29 11:40:54 +02:00 |
|
Bernat
|
ed8705a50c
|
#1340 invoiceOut.descriptor delete invoiceOut
gitea/salix/dev This commit looks good
Details
|
2019-04-26 12:05:49 +02:00 |
|
Javi Gallego
|
a920bc1d8f
|
tablas dms
|
2019-04-25 18:30:11 +02:00 |
|
Bernat
|
94480a8189
|
#1329 fix test and fixtures, update ticket-service
gitea/salix/dev This commit looks good
Details
|
2019-04-24 07:43:11 +02:00 |
|
Carlos Jimenez Ruiz
|
8d5cc93ddb
|
#1359 refactor absences
|
2019-04-23 13:29:52 +02:00 |
|
Bernat
|
bc005b2310
|
#1346 fix confirm.js and update item request
gitea/salix/dev This commit looks good
Details
|
2019-04-18 11:02:28 +02:00 |
|
Carlos Jimenez Ruiz
|
e34cb8ce84
|
#1351 e2e order.catalog
gitea/salix/dev This commit looks good
Details
|
2019-04-17 09:37:55 +02:00 |
|
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
|
Javi Gallego
|
ce2615e2d0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-16 08:09:20 +02:00 |
|
Javi Gallego
|
28bbc024b2
|
#1195 claim.action regularize
|
2019-04-16 08:09:16 +02:00 |
|
Carlos Jimenez Ruiz
|
9c596b06c8
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-04-15 14:37:12 +02:00 |
|
Carlos Jimenez Ruiz
|
82ed0078d2
|
#1339 Print - Hoja de rutas
|
2019-04-15 14:34:33 +02:00 |
|
Joan Sanchez
|
45055034dc
|
invoiceOutMake in prod
|
2019-04-15 11:35:00 +02:00 |
|
Joan Sanchez
|
ac8a27d2f4
|
Added ticket invoice #1310
gitea/salix/dev This commit has test failures
Details
|
2019-04-12 13:54:31 +02:00 |
|
Bernat
|
c6203a0654
|
fix test ticketservice, update selectors and acl
gitea/salix/dev This commit looks good
Details
|
2019-04-11 12:25:01 +02:00 |
|
Bernat
|
6d9fee06f6
|
new models and cau 10507
|
2019-04-11 11:44:34 +02:00 |
|
Javi Gallego
|
50d70f0f6f
|
Tarea #1259 crear modelo ticketServiceType
|
2019-04-10 14:44:41 +02:00 |
|
Carlos Jimenez Ruiz
|
0343aea2a5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-10 09:48:52 +02:00 |
|
Carlos Jimenez Ruiz
|
17f5e46497
|
#1284 Print - Informe zona
|
2019-04-10 09:45:45 +02:00 |
|
Joan Sanchez
|
20ba05a655
|
item filter by id or barcode
|
2019-04-10 09:32:29 +02:00 |
|
Juan Ferrer
|
f46d50fc48
|
DB versioning fixes
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-08 09:38:38 +02:00 |
|
Bernat
|
ad830e52fc
|
update structure db from production
gitea/salix/dev This commit looks good
Details
|
2019-04-05 09:20:22 +02:00 |
Gerard
|
cfdeb387a1
|
#1241 routes.tickets
gitea/salix/dev This commit looks good
Details
|
2019-04-04 13:06:41 +02:00 |
|
Bernat
|
eaa3a36fde
|
update fixtures and structure
gitea/salix/dev This commit looks good
Details
|
2019-04-04 09:02:39 +02:00 |
|
Carlos Jimenez Ruiz
|
09288c2c12
|
merge
|
2019-04-03 15:19:05 +02:00 |
|
Carlos Jimenez Ruiz
|
971a2ab891
|
#1270
ticket.index advanced search mostrar dias en el futuro
|
2019-04-03 15:16:32 +02:00 |
|
Juan Ferrer
|
eab2a29cb5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-04-03 13:40:35 +02:00 |
|
Juan Ferrer
|
b7092d97d3
|
DB versioning fixes
|
2019-04-03 13:39:35 +02:00 |
|
Joan Sanchez
|
3a19141d58
|
added smsConfig fixture
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-03 12:27:08 +02:00 |
|
Juan Ferrer
|
a12ef2c290
|
DB versioning fixes
|
2019-04-03 12:09:45 +02:00 |
|
Juan Ferrer
|
479b4c68c8
|
DB versioning fixes
gitea/salix/dev This commit looks good
Details
|
2019-04-03 11:21:54 +02:00 |
|
Juan Ferrer
|
836f210f6c
|
DB versioning code refactor
gitea/salix/dev This commit looks good
Details
|
2019-04-03 11:02:19 +02:00 |
|
Juan Ferrer
|
13ca2f7e52
|
DB versioning
gitea/salix/dev This commit looks good
Details
|
2019-04-03 10:29:05 +02:00 |
|
Carlos Jimenez Ruiz
|
0334b8f24e
|
moved sql only local files outside of changes
|
2019-04-02 12:32:09 +02:00 |
|
Joan Sanchez
|
377f38b10d
|
moved procedures to only-local
gitea/salix/dev This commit looks good
Details
|
2019-04-02 11:40:18 +02:00 |
|
Joan Sanchez
|
48cd9e2919
|
price fixes
gitea/salix/dev This commit looks good
Details
|
2019-04-01 09:13:24 +02:00 |
|
Joan Sanchez
|
5898d07822
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-01 09:02:13 +02:00 |
|
Joan Sanchez
|
dfe1a68d35
|
fix ticket basic data allow change company #1277
gitea/salix/test This commit looks good
Details
|
2019-04-01 09:01:11 +02:00 |
|
Bernat
|
6fb94188f5
|
cau 10246 add new procedure
gitea/salix/dev This commit looks good
Details
|
2019-03-29 13:15:55 +01:00 |
|
Bernat
|
7e2f07aa83
|
cau 10249 update structure
gitea/salix/dev This commit has test failures
Details
|
2019-03-29 12:07:48 +01:00 |
|
Joan Sanchez
|
8110325af8
|
send sms from ticket descriptor & ticket line #991
gitea/salix/dev This commit looks good
Details
|
2019-03-29 07:29:09 +01:00 |