Bernat
|
18b5342609
|
update fixtures and structure db
|
2019-11-26 14:15:43 +01:00 |
|
Bernat
|
5040d1d4a8
|
#1711 Eliminar referencias al esquema vn2008
gitea/salix/dev This commit looks good
Details
|
2019-11-22 14:34:28 +01:00 |
 Bernat Exposito
|
6a153bd69d
|
Merge branch 'timeControl_calculate' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-22 09:55:31 +00:00 |
|
Bernat
|
1ce0c63bf2
|
1711Eliminar_referencias_vn2008
gitea/salix/1711Eliminar_referencias_vn2008 This commit looks good
Details
|
2019-11-22 08:23:31 +01:00 |
 Carlos Jimenez Ruiz
|
dca7dd5fc7
|
rejected last modifications
gitea/salix/timeControl_calculate This commit looks good
Details
|
2019-11-21 14:51:11 +01:00 |
|
Carlos Jimenez Ruiz
|
33e9cf9816
|
Javi validation
gitea/salix/timeControl_calculate This commit looks good
Details
|
2019-11-21 14:39:09 +01:00 |
|
Carlos Jimenez Ruiz
|
a45ca84e7f
|
workerTimeControlCalculate procedure refactor
gitea/salix/timeControl_calculate This commit looks good
Details
|
2019-11-21 14:23:22 +01:00 |
|
Bernat
|
038ba3edb2
|
1711 update structure db
|
2019-11-21 13:18:30 +01:00 |
|
Carlos Jimenez Ruiz
|
f4a62dfa86
|
Merge branch '1770-calculate_components' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-11-21 11:30:00 +00:00 |
 Juan Ferrer
|
30ac174b1e
|
SQL grouping quoted
gitea/salix/dev This commit looks good
Details
|
2019-11-21 12:01:21 +01:00 |
 Joan Sanchez
|
fd72f206bc
|
Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 12:00:56 +01:00 |
|
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 |
|
Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:10 +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 |
|
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 |
|
Juan Ferrer
|
bdb03729b7
|
zone_getOptionsForShipment fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:36:08 +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
|
4b51d607f7
|
error getLanded con drop temporary table
gitea/salix/dev This commit looks good
Details
|
2019-11-15 15:42:00 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
7bdb497976
|
#1773 travel.summary & #1774
|
2019-10-24 12:49:18 +02:00 |
|
Bernat
|
7a89ab5335
|
#1778 Refactor worker.phone
|
2019-10-18 08:36:33 +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 |
|
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 |
|
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 |
|
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 |
|
Carlos Jimenez Ruiz
|
e1b5b449ce
|
#1656 ticket.regularizar eliminar ticket
|
2019-09-03 09:57:53 +02:00 |
|
Joan Sanchez
|
67733e6e08
|
merge
gitea/salix/test This commit looks good
Details
|
2019-09-02 09:57:46 +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 |
|
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 |
|
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
|
64a4e5f43d
|
ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good
Details
|
2019-07-26 11:48:01 +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
|
6f3b023644
|
Create postcode form #1585
gitea/salix/dev This commit looks good
Details
|
2019-07-08 14:07:09 +02:00 |
|
Joan Sanchez
|
bddfbc4b34
|
add new item from ticket.sale #1414, checkedLines fixed
|
2019-07-02 12:12:15 +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 |
|
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 |
|
Joan Sanchez
|
9e03c5ff84
|
sql update dmsType codes
gitea/salix/dev This commit looks good
Details
|
2019-06-17 09:15: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 |
|
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 |