diff options
| author | Azka Nathan <darizkyfaz@gmail.com> | 2024-02-02 13:35:08 +0700 |
|---|---|---|
| committer | Azka Nathan <darizkyfaz@gmail.com> | 2024-02-02 13:35:08 +0700 |
| commit | e8edbf3d6b2c2edd67a890a29fb6262794e730d9 (patch) | |
| tree | 63c36a17222088f7deb421edb9095499b4399bc8 | |
| parent | 8978868864925683d02342112020e7fc047a4acf (diff) | |
fix conflict
| -rwxr-xr-x | indoteknik_custom/__manifest__.py | 8 | ||||
| -rwxr-xr-x | indoteknik_custom/models/__init__.py | 10 | ||||
| -rwxr-xr-x | indoteknik_custom/security/ir.model.access.csv | 10 |
3 files changed, 1 insertions, 27 deletions
diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index 689103d8..b8a5f6f8 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -107,17 +107,9 @@ 'views/purchase_order_multi_update.xml', 'views/purchase_order_multi_confirm.xml', 'views/invoice_reklas_penjualan.xml', -<<<<<<< Updated upstream -<<<<<<< Updated upstream 'views/po_multi_cancel.xml', -======= 'views/logbook_sj.xml', 'views/report_logbook_sj.xml', ->>>>>>> Stashed changes -======= - 'views/logbook_sj.xml', - 'views/report_logbook_sj.xml', ->>>>>>> Stashed changes 'report/report.xml', 'report/report_banner_banner.xml', 'report/report_banner_banner2.xml', 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 diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv index c2bfaa10..31503dbe 100755 --- a/indoteknik_custom/security/ir.model.access.csv +++ b/indoteknik_custom/security/ir.model.access.csv @@ -89,18 +89,8 @@ access_purchase_order_multi_update,access.purchase.order.multi_update,model_purc access_invoice_reklas_penjualan,access.invoice.reklas.penjualan,model_invoice_reklas_penjualan,,1,1,1,1 access_invoice_reklas_penjualan_line,access.invoice.reklas.penjualan.line,model_invoice_reklas_penjualan_line,,1,1,1,1 access_purchase_order_multi_confirm,access.purchase.order.multi_confirm,model_purchase_order_multi_confirm,,1,1,1,1 -<<<<<<< Updated upstream -<<<<<<< Updated upstream access_po_multi_cancel,access.po.multi.cancel,model_po_multi_cancel,,1,1,1,1 -======= access_logbook_sj,access.logbook.sj,model_logbook_sj,,1,1,1,1 access_logbook_sj_line,access.logbook.sj.line,model_logbook_sj_line,,1,1,1,1 access_report_logbook_sj,access.report.logbook.sj,model_report_logbook_sj,,1,1,1,1 access_report_logbook_sj_line,access.report.logbook.sj.line,model_report_logbook_sj_line,,1,1,1,1 ->>>>>>> Stashed changes -======= -access_logbook_sj,access.logbook.sj,model_logbook_sj,,1,1,1,1 -access_logbook_sj_line,access.logbook.sj.line,model_logbook_sj_line,,1,1,1,1 -access_report_logbook_sj,access.report.logbook.sj,model_report_logbook_sj,,1,1,1,1 -access_report_logbook_sj_line,access.report.logbook.sj.line,model_report_logbook_sj_line,,1,1,1,1 ->>>>>>> Stashed changes |