verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
6,040 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

120 Commits

Author SHA1 Message Date
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