summaryrefslogtreecommitdiff
path: root/indoteknik_custom/models/__init__.py
diff options
context:
space:
mode:
authorMqdd <ahmadmiqdad27@gmail.com>2026-02-14 11:14:01 +0700
committerMqdd <ahmadmiqdad27@gmail.com>2026-02-14 11:14:01 +0700
commit472f36669375d3d0bcecf137e07260fac25d12b3 (patch)
tree873a665fd8d3cc249a6460858e85272b838162d3 /indoteknik_custom/models/__init__.py
parent24b33148858c9827ad0b14e716562c377e1644ca (diff)
parent37e0beac646ee2e676ff935e8289cf3189b3c21b (diff)
Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into gudang-service
Diffstat (limited to 'indoteknik_custom/models/__init__.py')
-rwxr-xr-xindoteknik_custom/models/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index e6a59246..2b1851ce 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -165,4 +165,8 @@ 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