diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-11-13 16:13:18 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-11-13 16:13:18 +0700 |
| commit | ee8f00646d8a1d6faa1d91c82e9c3778cc8e41f8 (patch) | |
| tree | 926f1a022fd5ca18ac23f53b32abcd370f0bf5c1 /indoteknik_custom/models/__init__.py | |
| parent | be2bc04768f9f423c66a612f4f183d20e70a3145 (diff) | |
| parent | e7a18de25926714222159cd9b9281b2fab62063b (diff) | |
Merge branch 'production' into iman/pengajuan-tempo
# Conflicts:
# indoteknik_custom/__manifest__.py
# indoteknik_custom/models/__init__.py
# indoteknik_custom/security/ir.model.access.csv
Diffstat (limited to 'indoteknik_custom/models/__init__.py')
| -rwxr-xr-x | indoteknik_custom/models/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py index a2a445bc..e98d0d41 100755 --- a/indoteknik_custom/models/__init__.py +++ b/indoteknik_custom/models/__init__.py @@ -133,4 +133,5 @@ from . import vendor_approval from . import partner from . import find_page from . import user_pengajuan_tempo_line -from . import user_pengajuan_tempo
\ No newline at end of file +from . import user_pengajuan_tempo +from . import approval_retur_picking |