 Carlos Jimenez Ruiz
|
c04640bd62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 09:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
52a8d5e0c2
|
#1891 tests for worker time control function
|
2019-11-21 09:19:03 +01:00 |
Bernat
|
0473f1de82
|
#1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-11-21 09:09:17 +01:00 |
|
Bernat
|
525e115781
|
#1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-11-21 07:24:31 +01:00 |
|
Bernat
|
a1784470cc
|
update scheme db
|
2019-11-20 12:42:10 +01:00 |
 Joan Sanchez
|
37618efb58
|
changed userPhone fkeys
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:37:13 +01:00 |
|
Joan Sanchez
|
5bb7f7f14a
|
deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:14:11 +01:00 |
|
Bernat
|
2bfa0873a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:24 +01:00 |
 Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:10 +01:00 |
|
Bernat
|
20088c6712
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-19 13:40:50 +01:00 |
|
Bernat
|
ee3a83ac0a
|
update structure and fixtures
|
2019-11-19 13:40:29 +01:00 |
|
Joan Sanchez
|
e499d44018
|
dont use payMethodId on view #1854
gitea/salix/dev This commit looks good
Details
|
2019-11-19 12:53:25 +01:00 |
|
Bernat
|
b608273510
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-19 12:51:11 +01:00 |
|
Bernat
|
99585b9cc9
|
fix fixtures
|
2019-11-19 12:50:50 +01:00 |
|
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 |