Merge remote-tracking branch 'origin/print-card-template'
Merge branch 'print-order-invoice'
Actualizada vista Distribution:list
Agregada accion delivered
Merge branch 'master' into distribution-ajax
Merge branch 'master' of https://github.com/inodata/flora
Agregadas funciones de Distribution:delivered y Distribution:closed
se agregan fixtures en modulo Order
Refactorizado javascript
Merge branch 'fixtures' into distribution-ajax
Refactorizado codigo de js y *.html.twig
Merge branch 'master' of https://github.com/inodata/flora into distribution-ajax
se agregan fixtures a modulos
composer Lock
Merge branch 'master' of https://github.com/inodata/flora into fixtures
Modificados algunos widgets
Merge branch 'master' of https://github.com/inodata/flora into distribution-ajax
Composer lock untracked
Merge branch 'master' of https://github.com/inodata/flora
Merge branch 'master' of https://github.com/inodata/flora into fixtures