diff options
| -rwxr-xr-x | indoteknik_custom/models/__init__.py | 5 | ||||
| -rwxr-xr-x | indoteknik_custom/security/ir.model.access.csv | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index 2b1851ce..3b3dcd9d 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -165,8 +165,5 @@ from . import partial_delivery from . import domain_apo from . import uom_uom from . import commission_internal -<<<<<<< HEAD from . import gudang_service -======= -from . import update_depreciation_move_wizard ->>>>>>> 37e0beac646ee2e676ff935e8289cf3189b3c21b +from . import update_depreciation_move_wizard
\ 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 50e2b382..9859b127 100755 --- a/indoteknik_custom/security/ir.model.access.csv +++ b/indoteknik_custom/security/ir.model.access.csv @@ -217,4 +217,4 @@ access_sj_tele,access.sj.tele,model_sj_tele,base.group_system,1,1,1,1 access_stock_picking_sj_document,stock.picking.sj.document,model_stock_picking_sj_document,base.group_user,1,1,1,1 access_gudang_service,gudang.service,model_gudang_service,base.group_user,1,1,1,1 access_gudang_service_line,gudang.service.line,model_gudang_service_line,base.group_user,1,1,1,1 -access_update_depreciation_move_wizard,access.update.depreciation.move.wizard,model_update_depreciation_move_wizard,,1,1,1,1 +access_update_depreciation_move_wizard,access.update.depreciation.move.wizard,model_update_depreciation_move_wizard,,1,1,1,1
\ No newline at end of file |