Commit Graph

242 Commits

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