Commit Graph

945 Commits

Author SHA1 Message Date
Juan cd94460168 Merge branch 'test' into dev 2018-06-12 17:01:56 +02:00
Juan cde2458404 nginx SSL 2018-06-12 14:38:27 +02:00
Juan e053515997 Config volume on all containers 2018-06-12 13:45:20 +02:00
Juan f24395f074 Lavels to compose services 2018-06-12 11:24:43 +02:00
Juan 8dbbaafa47 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 21:03:56 +02:00
Juan a860873819 Deploy speed inprovements 2018-06-11 14:03:40 +02:00
Juan 281f539aea Improved deploy speed 2018-06-11 12:31:11 +02:00
Juan bf909c6620 Deploy bugs solved 2018-06-11 09:09:47 +02:00
Javi Gallego 80b98f14e5 traduccion grade 2018-06-09 12:15:16 +02:00
Juan 2951a737a7 Merge 2018-06-07 23:56:16 +02:00
Juan 9fa12d4baf Automatic pagination with vnPagination, improved vnSearchbar 2018-06-07 23:47:19 +02:00
Bernat 61eb0d1551 update structure DB 2018-06-07 07:19:27 +02:00
Bernat 905122c864 update structure DB 2018-06-07 07:11:43 +02:00
gerard 8c34dba79e Tarea #296 seccion ticket.line menu de mover lineas 2018-06-06 16:54:40 +02:00
Bernat 16a9201302 update structure db 2018-06-06 15:08:22 +02:00
Bernat f7930ad664 update structure and fixtures 2018-06-06 14:49:31 +02:00
Bernat bde61a8509 update structure DB 2018-06-06 14:28:15 +02:00
Bernat 5c00931952 update ticket state 2018-06-06 09:32:00 +02:00
Bernat 0931cf2906 update structure DB 2018-06-05 12:49:33 +02:00
Bernat 8b7710746b update structure BD and clone.js error 2018-06-05 08:24:53 +02:00
gerard 5e28d0485c removed duplicated model 2018-06-04 12:00:47 +02:00
gerard e0256ccbf0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-04 09:48:52 +02:00
gerard c0c3925470 Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 09:48:32 +02:00
Bernat 61137e214b update itemDiary procedure 2018-06-04 08:41:58 +02:00
Bernat 7f99d370f3 update fixtures tbl buy tblContadores and container 2018-06-01 12:36:20 +02:00
Joan Sanchez d316b17899 Merge branch 'dev' into test 2018-05-31 14:58:51 +02:00
Joan Sanchez 4173180fde fixed eslint rules 2018-05-31 14:48:10 +02:00
Juan 3c9d8f32bb Merge 2018-05-31 11:56:52 +02:00
Juan a78bb24e09 Tests fixed, bugs solved, vnCrudModel, vnRestModel, UserError 2018-05-31 11:52:39 +02:00
Joan Sanchez c0167edc3e Credit insurance refactor #328 2018-05-31 07:59:42 +02:00
Joan Sanchez d6f0be2209 Remove ticket from route. Added warehouse to procedure. #326 2018-05-30 10:55:54 +02:00
Juan 3833339cc6 Merge 2018-05-29 17:46:10 +02:00
Joan Sanchez 16cab3579d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-28 14:57:23 +02:00
Joan Sanchez b97eac4978 Mailer & print config fix #257 2018-05-28 14:57:09 +02:00
Bernat 556e4c872f update BD structure 2018-05-28 14:02:17 +02:00
Joan Sanchez 222f7d6249 Printer & mailer volume path 2018-05-28 12:49:56 +02:00
Joan Sanchez 5199ca62f4 Send notification on payment method change. #257 2018-05-28 12:22:35 +02:00
Javi Gallego 1273f92e85 test back fixed 2018-05-28 09:35:05 +02:00
Javi Gallego 8b03ba420f #309 seccion ticket.volume con m3 y sumatorio CR juan 2018-05-28 09:16:06 +02:00
Joan Sanchez 74410d4045 getVolume route should return only data #324 CR: Juan 2018-05-28 08:52:18 +02:00
Juan 117bbdf146 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-28 08:19:46 +02:00
Bernat 8231a935d6 update fixtures and refactor test 2018-05-28 07:55:10 +02:00
Juan 30aea3d086 Tests fixed, watcher refactor, global error handling, angular 1.7 2018-05-25 17:25:35 +02:00
Bernat 756614bd27 update structure DB 2018-05-25 12:59:26 +02:00
Joan Sanchez 7a5d8bdd03 Added warehouse & isDeleted on ticket basic data #322 2018-05-25 11:40:04 +02:00
gerard 7b82c10a1b fixed bug in greuge 2018-05-24 16:03:16 +02:00
Joan Sanchez 6de70378c8 Docker timezone UTC+2 2018-05-24 11:20:32 +02:00
Bernat 0e077314a6 add new procedure in the BD 2018-05-23 08:54:37 +02:00
Juan ab60e78d1c #256 TIN validation only when isTaxDataChecked is set to true 2018-05-22 12:09:53 +02:00
Juan 518a82bf26 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-22 11:44:33 +02:00