C:\Users\miguel\Desktop\KIGA\qualita-client>git checkout feature_8556
Switched to branch 'feature_8556'
Your branch is up to date with 'origin/feature_8556'.

C:\Users\miguel\Desktop\KIGA\qualita-client>git pull
Already up to date.

C:\Users\miguel\Desktop\KIGA\qualita-client>git merge develop
Merge made by the 'recursive' strategy.
 .../business/impl/CompraDetalleBusinessImpl.java   |  32 +-
 .../business/impl/ComprobanteBusinessImpl.java     |   2 +
 .../business/impl/MovimientoStockBusinessImpl.java |  17 +-
 .../business/impl/ProductoAlmacenBusinessImpl.java |  62 ++-
 .../client/model/MovimientoStockDetalle.java       |  14 +
 .../client/service/CustomReportsService.java       |  54 +++
 .../custom-reports/pedidoventa-template.html       | 268 +++++++++++
 .../pedidoventa-template.html_files/px             | Bin 0 -> 807 bytes
 .../custom-reports/pedidoventa-template.jasper     | Bin 0 -> 75523 bytes
 .../custom-reports/pedidoventa-template.jrxml      | 489 +++++++++++++++++++++
 ...3__alter_table_stk_movimiento_stock_detalle.sql |   8 +
 11 files changed, 919 insertions(+), 27 deletions(-)
 create mode 100644 src/main/resources/custom-reports/pedidoventa-template.html
 create mode 100644 src/main/resources/custom-reports/pedidoventa-template.html_files/px
 create mode 100644 src/main/resources/custom-reports/pedidoventa-template.jasper
 create mode 100644 src/main/resources/custom-reports/pedidoventa-template.jrxml
 create mode 100644 src/main/resources/db/migration/V1_20200210171141693__alter_table_stk_movimiento_stock_detalle.sql