diff options
Diffstat (limited to 'indoteknik_custom/models/__init__.py')
| -rwxr-xr-x | indoteknik_custom/models/__init__.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 4b29e71d..9678329a 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -98,14 +98,6 @@ from . import purchase_order_multi_update from . import invoice_reklas_penjualan from . import purchase_order_multi_confirm from . import stock_quant -<<<<<<< Updated upstream -<<<<<<< Updated upstream from . import po_multi_cancel -======= from . import logbook_sj -from . import report_logbook_sj ->>>>>>> Stashed changes -======= -from . import logbook_sj -from . import report_logbook_sj ->>>>>>> Stashed changes +from . import report_logbook_sj
\ No newline at end of file |