Merged in pum-v3 (pull request #453)

Pum v3

8 files changed, 2099 insertions, 1 deletions

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index d1229ffe..7a179ce3 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -175,6 +175,9 @@
         'views/stock_inventory.xml',
         'views/sale_order_delay.xml',
         'views/refund_sale_order.xml',
+        'views/advance_payment_request.xml',
+        'views/advance_payment_settlement.xml',
+        # 'views/refund_sale_order.xml',
         'views/tukar_guling.xml',
         # 'views/tukar_guling_return_views.xml'
         'views/tukar_guling_po.xml',
@@ -183,6 +186,7 @@
         'views/unpaid_invoice_view.xml',
         'views/letter_receivable.xml',
         'views/letter_receivable_mail_template.xml',
+        'views/mail_template_pum.xml',
         # 'views/reimburse.xml',
         'views/sj_tele.xml',
         'views/close_tempo_mail_template.xml',
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 5ac4d6ca..165dae4e 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -154,6 +154,7 @@ from . import approval_invoice_date
 from . import approval_payment_term
 from . import refund_sale_order
 # from . import patch
+from . import advance_payment_request
 from . import tukar_guling
 from . import tukar_guling_po
 from . import update_date_planned_po_wizard
diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
new file mode 100644
index 00000000..140e48bb
--- /dev/null
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -0,0 +1,1519 @@
+from odoo import models, api, fields, _
+from odoo.exceptions import UserError, ValidationError
+from datetime import date, datetime, timedelta
+# import datetime
+import logging
+_logger = logging.getLogger(__name__)
+from terbilang import Terbilang
+import pytz
+from pytz import timezone
+import base64
+
+
+class AdvancePaymentRequest(models.Model):
+    _name = 'advance.payment.request'
+    _description = 'Advance Payment Request or Reimburse'
+    _rec_name = 'number'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _order = 'create_date desc'
+
+    user_id = fields.Many2one('res.users', string='Diajukan Oleh', default=lambda self: self.env.user, tracking=3)
+    partner_id = fields.Many2one('res.partner', string='Partner', related='user_id.partner_id', readonly=True)
+
+    number = fields.Char(string='No. Dokumen', default='New Draft', tracking=3)
+
+    applicant_name = fields.Many2one('res.users', string='Nama Pemohon', default=lambda self: self.env.user, required=True, tracking=3, domain="[('groups_id', 'in', [1])]")
+    # applicant_name = fields.One2many(string='Nama Pemohon', related='res.users')
+    nominal = fields.Float(string='Nominal', tracking=3, required=True)
+
+    bank_name = fields.Char(string='Bank', tracking=3, required=True)
+    account_name = fields.Many2one('res.users', string='Nama Account', default=lambda self: self.env.user, required=True, tracking=3, domain="[('groups_id', 'in', [1])]")
+    # account_name = fields.Char(string='Nama Account', tracking=3, required=True)
+    bank_account = fields.Char(string='No. Rekening', tracking=3, required=True)
+    detail_note = fields.Text(string='Keterangan Penggunaan Rinci', tracking=3)
+
+    date_back_to_office = fields.Date(
+        string='Tanggal Kembali ke Kantor',
+        tracking=3
+    )
+
+    estimated_return_date = fields.Date(
+        string='Batas Pengajuan',
+        help='Tanggal batas maksimal pengajuan realisasi setelah kembali ke kantor. '
+            '7 hari setelah tanggal kembali.'
+    )
+
+    days_remaining = fields.Integer(
+        string='Sisa Hari Realisasi',
+        compute='_compute_days_remaining',
+        help='Sisa hari batas maksimal pengajuan realisasi setelah kembali ke kantor. '
+            '7 hari setelah tanggal kembali.'
+    )
+
+    status = fields.Selection([
+        ('draft', 'Draft'),
+        ('pengajuan1', 'Menunggu Approval Departement'),
+        ('pengajuan2', 'Menunggu Approval AP'),
+        ('pengajuan3', 'Menunggu Approval Pimpinan'),
+        ('approved', 'Approved'),
+    ], string='Status', default='draft', tracking=3, index=True, track_visibility='onchange')
+
+
+    status_pay_down_payment = fields.Selection([
+        ('pending', 'Pending'),
+        ('payment', 'Payment'),
+    ], string='Status Pembayaran', default='pending', tracking=3)
+
+    name_approval_departement = fields.Char(string='Approval Departement')
+    name_approval_ap = fields.Char(string='Approval AP')
+    email_ap = fields.Char(string = 'Email AP')
+    name_approval_pimpinan = fields.Char(string='Approval Pimpinan')
+
+    date_approved_department = fields.Datetime(string="Date Approved Department")
+    date_approved_ap = fields.Datetime(string="Date Approved AP")
+    date_approved_pimpinan = fields.Datetime(string="Date Approved Pimpinan")
+
+    position_department = fields.Char(string='Position Departement')
+    position_ap = fields.Char(string='Position AP')
+    position_pimpinan = fields.Char(string='Position Pimpinan')
+
+    approved_by = fields.Char(string='Approved By', tracking=True, track_visibility='always')
+
+    departement_type = fields.Selection([
+        ('sales', 'Sales'), 
+        ('merchandiser', 'Merchandiser'), 
+        ('marketing', 'Marketing'), 
+        ('logistic', 'Logistic'), 
+        ('procurement', 'Procurement'),
+        ('fat', 'FAT'),
+        ('it', 'IT'), 
+        ('hr_ga', 'HR & GA'),
+        ('pimpinan', 'Pimpinan')
+    ], string='Departement Type', tracking=3, required=True)
+
+    attachment_file_image = fields.Binary(string='Attachment Image', attachment_filename='attachment_filename_image')
+    attachment_file_pdf = fields.Binary(string='Attachment PDF', attachment_filename='attachment_filename_pdf')
+    attachment_filename_image = fields.Char(string='Filename Image')
+    attachment_filename_pdf = fields.Char(string='Filename PDF')
+
+    attachment_type = fields.Selection([
+        ('pdf', 'PDF'),
+        ('image', 'Image'),
+    ], string="Attachment Type")
+
+    move_id = fields.Many2one('account.move', string='Journal Entries', domain=[('move_type', '=', 'entry')])
+    is_cab_visible = fields.Boolean(string='Is Journal Uang Muka Visible', compute='_compute_is_cab_visible')
+
+
+    currency_id = fields.Many2one(
+        'res.currency', string='Currency',
+        default=lambda self: self.env.company.currency_id
+    )
+
+    type_request = fields.Selection([
+        ('pum', 'PUM'),
+        ('reimburse', 'Reimburse')], string='Tipe Pengajuan', tracking=3)
+    
+    position_type = fields.Selection([
+        ('staff', 'Staff'),
+        ('manager', 'Manager'),
+        ('pimpinan', 'Pimpinan')], string='Jabatan')
+
+    settlement_type = fields.Selection([
+        ('no_settlement', 'Belum Realisasi'),
+        ('settlement', 'Realisasi')
+    ])
+
+    is_represented = fields.Boolean(string='Nama Pemohon Berbeda?', default=False)
+
+    apr_perjalanan = fields.Boolean(string = "PUM Perjalanan?", default = False)
+    reimburse_line_ids = fields.One2many('reimburse.line', 'request_id', string='Rincian Reimburse')
+    upload_attachment_date = fields.Datetime(string='Upload Attachment Date', tracking=3)
+    settlement_ids = fields.One2many(
+        'advance.payment.settlement',
+        'pum_id',
+        string='Realisasi'
+    )
+    has_settlement = fields.Boolean(
+        string='Has Settlement',
+        compute='_compute_has_settlement'
+    )
+    settlement_name = fields.Char(
+        string="Nama Realisasi",
+        compute='_compute_settlement_name'
+    )
+
+    grand_total_reimburse = fields.Monetary(
+        string='Total Reimburse',
+        compute='_compute_grand_total_reimburse',
+        currency_field='currency_id'
+    )
+
+    is_current_user_ap = fields.Boolean(
+        string="Is Current User AP",
+        compute='_compute_is_current_user_ap'
+    )
+
+    def _compute_is_current_user_ap(self):
+        ap_user_ids = [23, 9468]
+        is_ap = self.env.user.id in ap_user_ids
+        for line in self:
+            line.is_current_user_ap = is_ap
+
+    @api.depends('reimburse_line_ids.total')
+    def _compute_grand_total_reimburse(self):
+        for request in self:
+            request.grand_total_reimburse = sum(request.reimburse_line_ids.mapped('total'))
+
+    def action_open_create_reimburse_cab(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Buat Jurnal Reimburse',
+            'res_model': 'create.reimburse.cab.wizard',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_request_id': self.id,
+                'default_total_reimburse': self.grand_total_reimburse,
+            }
+        }
+
+    @api.depends('settlement_ids')
+    def _compute_has_settlement(self):
+        for rec in self:
+            rec.has_settlement = bool(rec.settlement_ids)
+    
+    @api.depends('settlement_ids', 'settlement_ids.name')
+    def _compute_settlement_name(self):
+        for request in self:
+            if request.settlement_ids:
+                request.settlement_name = request.settlement_ids[0].name
+            else:
+                request.settlement_name = False
+
+    @api.onchange('is_represented')
+    def _onchange_is_represented(self):
+        if self.is_represented:
+            self.account_name = False
+            self.applicant_name = False
+        else:
+            self.account_name = self.env.user.id
+            self.applicant_name = self.env.user.id
+
+    @api.onchange('nominal')
+    def _onchange_nominal_no_minus(self):
+        if self.nominal and self.nominal < 0:
+            self.nominal = 0
+            return {
+                'warning': {
+                    'title': _('Nominal Tidak Valid'),
+                    'message': _(
+                        "Nominal tidak boleh diisi minus.\n"
+                        "Nilai di set menjadi nol."
+                    )
+                }
+            }
+    
+    def _get_jasper_attachment(self):
+        self.ensure_one()
+        report = self.env['ir.actions.report'].browse(1134)  # ID Downpayment Report
+        if not report:
+            raise UserError("Report Jasper tidak ditemukan.")
+        
+        data = report.render_jasper(self.ids, data={})[0]
+        filename = f"{self.number}.pdf"
+        return {
+            'name': filename,
+            'datas': base64.b64encode(data),
+            'type': 'binary',
+            'mimetype': 'application/pdf',
+            'filename': filename,
+        }
+
+    # def action_send_pum_reminder(self):
+    #     """
+    #     Kirim email reminder PUM otomatis.
+    #     - PUM Perjalanan:
+    #         - Hari H kembali ke kantor = template 'mail_template_pum_reminder_today'
+    #         - H-2 dari due date = template 'mail_template_pum_reminder_h_2'
+    #     - PUM Non-Perjalanan:
+    #         - H-2 dari due date = template 'mail_template_pum_reminder_h_2'
+    #     """
+    #     today = date.today()
+        
+    #     # Penyesuaian 1: Cari semua PUM yang sudah disetujui (bukan draft/reject)
+    #     # Kita tidak filter 'date_back_to_office' di sini lagi.
+    #     pum_ids = self.search([
+    #         ('status', 'not in', ['draft', 'reject']),
+    #         ('type_request', '=', 'pum')
+    #     ])
+
+    #     template_today = self.env.ref('indoteknik_custom.mail_template_pum_reminder_today', raise_if_not_found=False)
+    #     template_h2 = self.env.ref('indoteknik_custom.mail_template_pum_reminder_h_2', raise_if_not_found=False)
+
+    #     if not template_today or not template_h2:
+    #         _logger.warning("Salah satu template email PUM (today/h2) tidak ditemukan.")
+    #         return
+
+    #     for pum in pum_ids:
+    #         _logger.info(f"[REMINDER] Memproses PUM {pum.number}")
+
+    #         # Penyesuaian 2: Logika ini sudah benar (sesuai update kita sebelumnya)
+    #         # Jika realisasi sudah dibuat, PUM tidak aktif lagi, lewati.
+    #         realization = self.env['advance.payment.settlement'].search([('pum_id', '=', pum.id)], limit=1)
+    #         if realization:
+    #             _logger.info(f"[REMINDER] Lewati PUM {pum.number}, realisasi sudah dibuat.")
+    #             continue
+
+    #         if not pum.email_ap or not pum.user_id.partner_id.email:
+    #             _logger.warning(f"[REMINDER] Lewati PUM {pum.number} karena email_ap atau email user kosong.")
+    #             continue
+
+    #         # Penyesuaian 3: Logika penentuan Due Date (Wajib)
+    #         due_date = False
+    #         base_date_for_today_check = False # Khusus PUM Perjalanan
+
+    #         if pum.apr_perjalanan:
+    #             if pum.date_back_to_office:
+    #                 due_date = pum.date_back_to_office + timedelta(days=7)
+    #                 base_date_for_today_check = pum.date_back_to_office
+    #             else:
+    #                 _logger.warning(f"[REMINDER] Lewati PUM {pum.number} (perjalanan) karena tgl kembali kosong.")
+    #                 continue
+    #         else:
+    #             # Ini adalah PUM Non-Perjalanan
+    #             if not pum.create_date:
+    #                 _logger.warning(f"[REMINDER] Lewati PUM {pum.number} (non-perjalanan) karena create_date kosong.")
+    #                 continue
+    #             base_date = pum.create_date.date()
+    #             due_date = base_date + timedelta(days=7)
+
+    #         # Hitung sisa hari
+    #         days_remaining = (due_date - today).days
+
+    #         # Penyesuaian 4: Tentukan template berdasarkan sisa hari
+    #         template = False
+    #         if pum.apr_perjalanan and base_date_for_today_check == today:
+    #             # Hari H kembali ke kantor (HANYA PUM Perjalanan)
+    #             template = template_today
+    #         elif days_remaining == 2:
+    #             # H-2 due date (Untuk SEMUA jenis PUM)
+    #             template = template_h2
+    #         else:
+    #             _logger.info(f"[REMINDER] Lewati PUM {pum.number}, hari ini bukan tgl pengingat (Sisa hari: {days_remaining}).")
+    #             continue
+
+    #         # --- Sisanya (Generate attachment & kirim email) sudah aman ---
+            
+    #         # Generate attachment
+    #         try:
+    #             attachment_vals = pum._get_jasper_attachment()
+    #             attachment = self.env['ir.attachment'].create({
+    #                 'name': attachment_vals['name'],
+    #                 'type': 'binary',
+    #                 'datas': attachment_vals['datas'],
+    #                 'res_model': 'advance.payment.request',
+    #                 'res_id': pum.id,
+    #                 'mimetype': 'application/pdf',
+    #             })
+    #         except Exception as e:
+    #             _logger.error(f"[REMINDER] Gagal membuat attachment untuk PUM {pum.number}: {str(e)}")
+    #             continue
+
+    #         email_values = {
+    #             # 'email_to': pum.user_id.partner_id.email,
+    #             'email_to': 'andrifebriyadiputra@gmail.com', # Masih hardcode
+    #             'email_from': pum.email_ap,
+    #             'email_from': 'finance@indoteknik.co.id',
+    #             'attachment_ids': [(6, 0, [attachment.id])]
+    #         }
+
+    #         _logger.info(f"[REMINDER] Mengirim email PUM {pum.number} ke {email_values['email_to']} dari {email_values['email_from']}")
+
+    #         try:
+    #             body_html = template._render_field('body_html', [pum.id])[pum.id]
+    #             template.send_mail(pum.id, force_send=True, email_values=email_values)
+    #             _logger.info(f"[REMINDER] Email berhasil dikirim untuk PUM {pum.number}")
+
+    #             # Post info sederhana
+    #             pum.message_post(
+    #                 body="Email Reminder Berhasil dikirimkan",
+    #                 message_type="comment",
+    #                 subtype_xmlid="mail.mt_note",
+    #             )
+
+    #             user_system = self.env['res.users'].browse(25) 
+    #             system_id = user_system.partner_id.id if user_system else False
+
+    #             # Post isi email ke chatter
+    #             pum.message_post(
+    #                 body=body_html,
+    #                 message_type="comment",
+    #                 subtype_xmlid="mail.mt_note",
+    #                 author_id=system_id,
+    #             )
+    #         except Exception as e:
+    #             _logger.error(f"[REMINDER] Gagal mengirim email untuk PUM {pum.number}: {str(e)}")
+
+    #     return True
+
+
+    @api.depends('move_id.state')
+    def _compute_is_cab_visible(self):
+        for rec in self:
+            move = rec.move_id
+            rec.is_cab_visible = bool(move and move.state == 'posted')
+
+    def action_view_journal_uangmuka(self):
+        self.ensure_one()
+        
+        ap_user_ids = [23, 9468] 
+        if self.env.user.id not in ap_user_ids:
+            raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
+
+        if not self.move_id:
+            raise UserError("Journal Uang Muka belum tersedia.")
+
+        return {
+            'name': 'Journal Entry',
+            'view_mode': 'form',
+            'res_model': 'account.move',
+            'type': 'ir.actions.act_window',
+            'res_id': self.move_id.id,
+            'target': 'current',
+        }
+
+    @api.onchange('attachment_type')
+    def _onchange_attachment_type(self):
+        self.attachment_file_image = False
+        self.attachment_filename_image = False
+        self.attachment_file_pdf = False
+        self.attachment_filename_pdf = False
+
+    # Sales & MD : Darren ID 19
+    # Marketing : Iwan ID 216
+    # Logistic & Procurement : Rafly H ID 21
+    # FAT & IT : Stephan ID 28
+    # HR & GA : Akbar ID 7 / Pimpinan
+    # ---------------------------------------
+    # AP : Manzila (Finance) ID 23
+
+    def _get_approver_mapping(self):
+        return {
+            'sales': 19,
+            'merchandiser': 19,
+            'marketing': 216,
+            'logistic': 21,
+            'procurement': 21,
+            'fat': 28,
+            'it': 28,
+            'hr_ga': 7,
+        }
+
+    def _get_departement_approver(self):
+        mapping = self._get_approver_mapping()
+        return mapping.get(self.departement_type)
+
+    @api.constrains('apr_perjalanan', 'date_back_to_office')
+    def _check_date_back_to_office(self):
+        if self.apr_perjalanan and not self.date_back_to_office:
+            raise ValidationError("Tanggal Kembali ke Kantor wajib diisi jika PUM Perjalanan dicentang.")
+    
+    @api.onchange('applicant_name')
+    def _onchange_applicant_name_set_position(self):
+        if self.applicant_name:
+            user_id = self.applicant_name.id
+            mapping = self._get_approver_mapping()
+            manager_ids = set(mapping.values())
+            pimpinan_id = 7
+            if user_id == pimpinan_id:
+                self.position_type = 'pimpinan'
+            elif user_id in manager_ids:
+                self.position_type = 'manager'
+            else:
+                self.position_type = 'staff'
+        else:
+            self.position_type = False
+
+    # @api.model
+    # def default_get(self, fields_list):
+    #     defaults = super(AdvancePaymentRequest, self).default_get(fields_list)
+    #     user_id = defaults.get('user_id', self.env.uid)
+    #     mapping = self._get_approver_mapping()
+    #     manager_ids = set(mapping.values())
+    #     pimpinan_id = 7
+
+    #     position = 'staff'
+    #     if user_id == pimpinan_id:
+    #         position = 'pimpinan'
+    #     elif user_id in manager_ids:
+    #         position = 'manager'
+
+    #     defaults['position_type'] = position
+    #     return defaults
+
+    def action_realisasi_pum(self):
+        self.ensure_one()
+
+        realization = self.env['advance.payment.settlement'].search([('pum_id', '=', self.id)], limit=1)
+        
+        if realization:
+            return {
+                'type': 'ir.actions.act_window',
+                'name': 'Realisasi PUM',
+                'res_model': 'advance.payment.settlement',
+                'view_mode': 'form',
+                'target': 'current',
+                'res_id': realization.id,
+            }
+        else:
+            return {
+                'type': 'ir.actions.act_window',
+                'name': 'Realisasi PUM',
+                'res_model': 'advance.payment.settlement',
+                'view_mode': 'form',
+                'target': 'current',
+                'context': {
+                    'default_pum_id': self.id,
+                    # 'default_value_down_payment': self.nominal,
+                    'default_name': f'Realisasi - {self.number or ""}',
+                    # 'default_pemberian_line_ids': [
+                    #     (0, 0, {
+                    #         'date': self.create_date.date() if self.create_date else fields.Date.today(),
+                    #         'description': 'Uang Muka',
+                    #         'value': self.nominal
+                    #     })
+                    # ]
+                }
+            }
+
+
+    def action_confirm_payment(self):
+        # jakarta_tz = pytz.timezone('Asia/Jakarta')
+        # now = datetime.now(jakarta_tz).replace(tzinfo=None)
+        
+        ap_user_ids = [23, 9468]
+        if self.env.user.id not in ap_user_ids:
+            raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
+
+        for rec in self:
+            if not rec.attachment_file_image and not rec.attachment_file_pdf:
+                raise UserError(
+                    f'Tidak bisa konfirmasi pembayaran PUM {rec.name or ""} '
+                    f'karena belum ada bukti attachment (PDF/Image).'
+                )
+
+            rec.status_pay_down_payment = 'payment'
+            rec.upload_attachment_date = datetime.utcnow()
+
+            rec.message_post(
+                body="Bukti transfer telah di upload oleh <b>Finance AP</b>.",
+                message_type="comment",
+                subtype_xmlid="mail.mt_note",
+            )
+
+
+
+    # def action_approval_check(self):
+    #     for record in self:
+    #         # user = record.user_id
+    #         user = self.env['res.users'].browse(3401)
+    #         roles = sorted(set(
+    #             f"{group
+    #             .name} (Category: {group.category_id.name})"
+    #             for group in user.groups_id
+    #             if group.category_id.name == 'Roles'
+    #         ))
+    #         _logger.info(f"[ROLE CHECK] User: {user.name} (Login: {user.login}) Roles: {roles}")
+    #     return
+
+    def action_approval_check(self):
+        jakarta_tz = pytz.timezone('Asia/Jakarta')
+        now = datetime.now(jakarta_tz).replace(tzinfo=None)
+        formatted_date = now.strftime('%d %B %Y %H:%M')
+
+        for rec in self:
+            if not rec.departement_type:
+                raise UserError("Field 'departement_type' wajib diisi sebelum approval.")
+
+            approver_id = rec._get_departement_approver()
+
+            if rec.status == 'pengajuan1':
+                if self.env.user.id != approver_id:
+                    raise UserError("Hanya approver departement yang berhak menyetujui tahap ini.")
+                rec.name_approval_departement = self.env.user.name
+                rec.approved_by = (rec.approved_by + ', ' if rec.approved_by else '') + rec.name_approval_departement
+                rec.date_approved_department = now
+
+                # Mapping posisi berdasarkan departement_type
+                department_titles = {
+                    'sales': 'Sales Manager',
+                    'merchandiser': 'Merchandiser Manager',
+                    'marketing': 'Marketing Manager',
+                    'logistic': 'Logistic Manager',
+                    'procurement': 'Procurement Manager',
+                    'fat': 'Finance & Accounting Manager',
+                    'it': 'IT Manager',
+                    'hr_ga': 'HR & GA Manager',
+                    'pimpinan': 'Pimpinan',
+                }
+                rec.position_department = department_titles.get(rec.departement_type, 'Departement Manager')
+
+                rec.status = 'pengajuan2'
+
+                rec.message_post(
+                    body=f"Approval <b>Departement</b> oleh <b>{self.env.user.name}</b> "
+                        f"pada <i>{formatted_date}</i>."
+                )
+
+            elif rec.status == 'pengajuan2':
+                ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+                if self.env.user.id not in ap_user_ids:
+                    raise UserError("Hanya AP yang berhak menyetujui tahap ini.")
+                rec.name_approval_ap = self.env.user.name
+                rec.approved_by = (rec.approved_by + ', ' if rec.approved_by else '') + rec.name_approval_ap
+                rec.email_ap = self.env.user.email
+                rec.date_approved_ap = now
+                rec.position_ap = 'Finance AP'
+                if rec.position_type == 'pimpinan':
+                    rec.status = 'approved'
+                else:
+                    rec.status = 'pengajuan3'
+
+                rec.message_post(
+                    body=f"Approval <b>AP</b> oleh <b>{self.env.user.name}</b> "
+                         f"pada <i>{formatted_date}</i>."
+                )
+
+            elif rec.status == 'pengajuan3':
+                if self.env.user.id != 7:  # ID user Pimpinan
+                    raise UserError("Hanya Pimpinan yang berhak menyetujui tahap ini.")
+                rec.name_approval_pimpinan = self.env.user.name
+                rec.approved_by = (rec.approved_by + ', ' if rec.approved_by else '') + rec.name_approval_pimpinan
+                rec.date_approved_pimpinan = now
+                rec.position_pimpinan = 'Pimpinan'
+                rec.status = 'approved'
+
+                rec.message_post(
+                    body=f"Approval <b>Pimpinan</b> oleh <b>{self.env.user.name}</b> "
+                         f"pada <i>{formatted_date}</i>."
+                )
+
+            else:
+                raise UserError("Status saat ini tidak bisa di-approve lagi.")
+
+            # rec.message_post(body=f"Approval oleh {self.env.user.name} pada tahap <b>{rec.status}</b>.")
+
+
+
+    def action_ap_only(self):
+        self.ensure_one()
+
+        ap_user_ids = [23, 9468]  # Ganti sesuai kebutuhan
+        if self.env.user.id not in ap_user_ids:
+            raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
+
+        if self.move_id:
+            raise UserError('CAB / Jurnal sudah pernah dibuat untuk PUM ini.')
+
+        return {
+            'name': 'Create CAB AP Only',
+            'type': 'ir.actions.act_window',
+            'res_model': 'advance.payment.create.bill',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {
+                'default_nominal': self.nominal,
+                'default_apr_id': self.id,
+            }
+        }
+
+
+    @api.depends('date_back_to_office', 'status', 'apr_perjalanan', 'create_date', 'settlement_ids.status')
+    def _compute_days_remaining(self):
+        today = date.today()
+        for rec in self:
+            # if rec.status in ['approved'] and rec.days_remaining:
+            is_settlement_approved = any(s.status == 'approved' for s in rec.settlement_ids)
+            if is_settlement_approved:
+                continue
+
+            if rec.apr_perjalanan:
+                if rec.date_back_to_office:
+                    due_date = rec.date_back_to_office + timedelta(days=7)
+                    rec.estimated_return_date = due_date
+
+                    # Jika hari ini sebelum tanggal kembali, maka anggap belum mulai dihitung
+                    effective_today = max(today, rec.date_back_to_office)
+                    rec.days_remaining = (due_date - effective_today).days
+                else:
+                    rec.estimated_return_date = False
+                    rec.days_remaining = 0
+            else:   
+                base_date = rec.create_date.date() if rec.create_date else today
+                due_date = base_date + timedelta(days=7)
+                rec.estimated_return_date = due_date
+                rec.days_remaining = (due_date - today).days
+
+    @api.onchange('date_back_to_office')
+    def _onchange_date_back_to_office(self):
+        if self.date_back_to_office and self.date_back_to_office < date.today():
+            return {
+                'warning': {
+                    'title': _('Tanggal Tidak Valid'),
+                    'message': _('Tanggal kembali ke kantor tidak boleh lebih awal dari hari ini.')
+                }
+            }
+
+    @api.onchange('applicant_name')
+    def _onchange_applicant_name(self):
+        if self.applicant_name:
+            self.account_name = self.applicant_name.id
+
+    @api.onchange('account_name')
+    def _onchange_account_name(self):
+        if self.account_name:
+            self.applicant_name = self.account_name.id
+
+    @api.onchange('user_id')
+    def _onchange_user_id_limit_check(self):
+        if self.type_request != 'pum':
+            return
+        if not self.user_id:
+            return
+
+        pum_ids = self.search([
+            ('user_id', '=', self.user_id.id),
+            ('status', '!=', 'reject'),
+            ('type_request', '=', 'pum')
+        ])
+
+        active_pum_count = 0
+        for pum in pum_ids:
+            realization = self.env['advance.payment.settlement'].search([('pum_id', '=', pum.id)], limit=1)
+            if not realization:
+                active_pum_count += 1
+
+        if active_pum_count >= 2:
+            return {
+                'warning': {
+                    'title': 'Batas Pengajuan Tercapai',
+                    'message': 'User ini sudah memiliki 2 PUM aktif. Tidak dapat mengajukan lagi sampai salah satu direalisasi.',
+                }
+            }
+
+    def _get_department_titles_mapping(self):
+        return {
+            'sales': 'Sales Manager',
+            'merchandiser': 'Merchandiser Manager',
+            'marketing': 'Marketing Manager',
+            'logistic': 'Logistic Manager',
+            'procurement': 'Procurement Manager',
+            'fat': 'Finance & Accounting Manager',
+            'it': 'IT Manager',
+            'hr_ga': 'HR & GA Manager',
+        }
+
+    @api.model
+    def create(self, vals):
+        jakarta_tz = pytz.timezone('Asia/Jakarta')
+        now = datetime.now(jakarta_tz).replace(tzinfo=None)
+        user = self.env.user
+
+        pum_ids = self.search([
+            ('user_id', '=', user.id),
+            ('status', '!=', 'reject'),
+            ('type_request', '=', 'pum')
+        ])
+
+        active_pum_count = 0
+        for pum in pum_ids:
+            realization = self.env['advance.payment.settlement'].search([('pum_id', '=', pum.id)], limit=1)
+            if not realization:
+                active_pum_count += 1
+
+        if active_pum_count >= 2 and vals.get('type_request') == 'pum':
+            raise UserError("Anda hanya dapat mengajukan maksimal 2 PUM aktif. Silakan realisasikan salah satunya terlebih dahulu.")
+
+        if not vals.get('apr_perjalanan'):
+            if 'estimated_return_date' not in vals:
+                today = date.today()
+                due_date = today + timedelta(days=7)
+                vals['estimated_return_date'] = due_date
+
+        initial_status = ''
+        position = vals.get('position_type')
+        department = vals.get('departement_type')
+        if department == 'hr_ga' or position in ('manager', 'pimpinan'):
+            initial_status = 'pengajuan2'
+        else:
+            initial_status = 'pengajuan1'
+        
+        vals['status'] = initial_status
+
+        if initial_status == 'pengajuan2' and department != 'hr_ga':
+            applicant_name = vals.get('applicant_name')
+            vals['name_approval_departement'] =  self.env['res.users'].browse(applicant_name).name or ''
+            vals['date_approved_department'] = now
+            department_type = vals.get('departement_type')
+            department_titles = self._get_department_titles_mapping()
+            vals['position_department'] = department_titles.get(department_type, 'Departement Manager')
+        
+        if position == 'pimpinan' and department != 'hr_ga':
+            vals['name_approval_pimpinan'] =  self.env['res.users'].browse(vals.get('applicant_name')).name or ''
+            vals['position_pimpinan'] = 'Pimpinan'
+            vals['date_approved_pimpinan'] = now
+        # if position == 'staff':
+        #   initial_status = 'pengajuan1'
+        # elif position == 'manager':
+        #     initial_status = 'pengajuan2'
+        #     applicant_name = vals.get('applicant_name')
+        #     vals['name_approval_departement'] =  self.env['res.users'].browse(applicant_name).name or ''
+        #     vals['date_approved_department'] = now
+        #     department_type = vals.get('departement_type')
+        #     department_titles = self._get_department_titles_mapping()
+        #     vals['position_department'] = department_titles.get(department_type, 'Departement Manager')
+        # elif position == 'pimpinan':
+        #     initial_status = 'pengajuan2'
+        #     applicant_name = vals.get('applicant_name')
+        #     vals['name_approval_pimpinan'] =  self.env['res.users'].browse(applicant_name).name or ''
+        #     vals['position_pimpinan'] = 'Pimpinan'
+        #     vals['date_approved_pimpinan'] = now
+
+        # vals['status'] = initial_status
+        
+        if not vals.get('number') or vals['number'] == 'New Draft':
+            if vals.get('type_request') == 'reimburse':
+                vals['number'] = self.env['ir.sequence'].next_by_code('reimburse.request') or 'New Draft'
+            else:
+                vals['number'] = self.env['ir.sequence'].next_by_code('advance.payment.request') or 'New Draft'
+
+        # vals['status'] = 'pengajuan1'
+        return super(AdvancePaymentRequest, self).create(vals)
+
+
+class AdvancePaymentUsageLine(models.Model):
+    _name = 'advance.payment.usage.line'
+    _description = 'Advance Payment Usage Line'
+
+    realization_id = fields.Many2one('advance.payment.settlement', string='Realization')
+    date = fields.Date(string='Tanggal', required=True, default=fields.Date.today)
+    description = fields.Text(string='Description', required=True)
+    nominal = fields.Float(string='Nominal', required=True)
+    done_attachment = fields.Boolean(string='Checked', default=False)
+
+    lot_of_attachment = fields.Selection(
+        related='realization_id.lot_of_attachment',
+        string='Lot of Attachment (Related)',
+        store=False
+    )
+
+    attachment_type = fields.Selection([
+        ('pdf', 'PDF'),
+        ('image', 'Image'),
+    ], string="Attachment Type", default='pdf')
+
+    attachment_file_image = fields.Binary(string='Attachment Image', attachment_filename='attachment_filename_image')
+    attachment_file_pdf = fields.Binary(string='Attachment PDF', attachment_filename='attachment_filename_pdf')
+    attachment_filename_image = fields.Char(string='Filename Image')
+    attachment_filename_pdf = fields.Char(string='Filename PDF')
+
+    account_id = fields.Many2one(
+        'account.account', string='Jenis Biaya', tracking=3,
+        domain="[('id', 'in', [484, 486, 488, 506, 507, 625, 471, 519, 527, 528, 529, 530, 565])]" # ID Jenis Biaya yang dibutuhkan
+    )
+
+    is_current_user_ap = fields.Boolean(
+        string="Is Current User AP",
+        compute='_compute_is_current_user_ap'
+    )
+
+    def _compute_is_current_user_ap(self):
+        ap_user_ids = [23, 9468]
+        is_ap = self.env.user.id in ap_user_ids
+        for line in self:
+            line.is_current_user_ap = is_ap
+
+    # @api.onchange('account_id')
+    # def _onchange_account_id(self):
+    #     for rec in self:
+    #         if rec.account_id:
+    #             rec.description = rec.account_id.name + " - "
+
+    @api.onchange('attachment_type')
+    def _onchange_attachment_type(self):
+        self.attachment_file_image = False
+        self.attachment_filename_image = False
+        self.attachment_file_pdf = False
+        self.attachment_filename_pdf = False
+
+    @api.onchange('done_attachment')
+    def _onchange_done_attachment(self):
+        ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+        
+        if self.done_attachment and self.env.user.id not in ap_user_ids:
+            self.done_attachment = False
+            return {
+                'warning': {
+                    'title': _('Tidak Diizinkan'),
+                    'message': _('Hanya user AP yang bisa mencentang Done Attachment.')
+                }
+            }
+    
+    @api.onchange('nominal')
+    def _onchange_nominal_no_minus(self):
+        if self.nominal and self.nominal < 0:
+            self.nominal = 0
+            return {
+                'warning': {
+                    'title': _('Nominal Tidak Valid'),
+                    'message': _(
+                        "Nominal penggunaan PUM tidak boleh diisi minus.\n"
+                        "Nilai di Set menjadi nol."
+                    )
+                }
+            }
+
+class ReimburseLine(models.Model):
+    _name = 'reimburse.line'
+    _description = 'Reimburse Line'
+
+    request_id = fields.Many2one('advance.payment.request', string='Request')
+    date = fields.Date(string='Tanggal', required=True, default=fields.Date.today)
+    account_id = fields.Many2one(
+        'account.account', 
+        string='Jenis Biaya',  tracking=3,
+        domain="[('id', 'in', [484, 486, 527, 529, 530, 471, 473, 492, 493, 488, 625, 528, 533, 534])]"
+    )
+    description = fields.Text(string='Description', required=True, tracking=3)
+    distance_departure = fields.Float(string='Pergi (Km)', tracking=3)
+    distance_return = fields.Float(string='Pulang (Km)', tracking=3)
+    quantity = fields.Float(string='Quantity', tracking=3)
+    price_unit = fields.Float(string='Price', tracking=3)
+    total = fields.Float(string='Total', tracking=3, compute='_compute_total')
+    # total = fields.Float(string='Total', tracking=3)
+    currency_id = fields.Many2one(related='request_id.currency_id')
+ 
+    is_vehicle = fields.Boolean(string='Berkendara?')
+    vehicle_type = fields.Selection([
+        ('motor', 'Motor'),
+        ('car', 'Mobil'),
+    ], string='Tipe Kendaraan', tracking=3)
+
+    attachment_image = fields.Binary(string='Image', attachment_filename='attachment_name_image')
+    attachment_pdf = fields.Binary(string='PDF', attachment_filename='attachment_name_pdf')
+    attachment_name_image = fields.Char(string='Filename Image')
+    attachment_name_pdf = fields.Char(string='Filename PDF')
+
+    attachment_type = fields.Selection([
+        ('pdf', 'PDF'),
+        ('image', 'Image'),
+    ], string="Attachment Type")
+
+    is_checked = fields.Boolean(string='Checked', default=False)
+
+    is_current_user_ap = fields.Boolean(
+        string="Is Current User AP",
+        compute='_compute_is_current_user_ap'
+    )
+
+    def _compute_is_current_user_ap(self):
+        ap_user_ids = [23, 9468]
+        is_ap = self.env.user.id in ap_user_ids
+        for line in self:
+            line.is_current_user_ap = is_ap
+
+    @api.depends('quantity', 'price_unit', 'is_vehicle')
+    def _compute_total(self):
+        for line in self:
+            line.total = line.quantity * line.price_unit
+
+    @api.onchange('is_vehicle', 'vehicle_type', 'distance_departure', 'distance_return')
+    def _onchange_vehicle_data(self):
+        if not self.is_vehicle:
+            self.vehicle_type = False
+            self.distance_departure = 0
+            self.distance_return = 0
+            self.price_unit = 0
+            return
+
+        total_distance = self.distance_departure + self.distance_return
+            
+        if self.vehicle_type and total_distance > 0:
+            biaya_per_km = 0
+            if self.vehicle_type == 'car':
+                biaya_per_km = 1000  # Rp 10.000 / 10 km
+                self.price_unit = biaya_per_km
+            elif self.vehicle_type == 'motor':
+                biaya_per_km = 500   # Rp 10.000 / 20 km
+                self.price_unit = biaya_per_km
+            self.total = total_distance * biaya_per_km
+            self.quantity = total_distance
+        else:
+            self.total = 0
+
+class AdvancePaymentSettlement(models.Model):
+    _name = 'advance.payment.settlement'
+    _description = 'Advance Payment Settlement'
+    _inherit = ['mail.thread']
+    _rec_name = 'name'
+    _order = 'create_date desc'
+
+    pum_id = fields.Many2one('advance.payment.request', string='No PUM', ondelete='cascade')
+    name = fields.Char(string='Nama', readonly=True, tracking=3)
+    title = fields.Char(string='Judul', tracking=3)
+    goals = fields.Text(string='Tujuan', tracking=3)
+    related = fields.Char(string='Terkait', tracking=3)
+
+    # pemberian_line_ids = fields.One2many(
+    #     'advance.payment.settlement.line', 'realization_id', string='Rincian Pemberian'
+    # )
+    penggunaan_line_ids = fields.One2many(
+        'advance.payment.usage.line', 'realization_id', string='Rincian Penggunaan'
+    )
+
+    nominal_pum = fields.Float(
+        string='Nominal Pemberian PUM',
+        related='pum_id.nominal',
+        readonly=True )
+
+    # grand_total = fields.Float(string='Grand Total Pemberian', tracking=3, compute='_compute_grand_total')
+    grand_total_use = fields.Float(string='Grand Total Penggunaan', tracking=3, compute='_compute_grand_total_use')
+    # value_down_payment = fields.Float(string='PUM', tracking=3)
+    remaining_value = fields.Float(string='Sisa Uang PUM', tracking=3, compute='_compute_remaining_value')
+
+    note_approval = fields.Text(string='Note Persetujuan', tracking=3)
+
+    name_approval_departement = fields.Char(string='Approval Departement')
+    name_approval_ap = fields.Char(string='Approval AP')
+    name_approval_pimpinan = fields.Char(string='Approval Pimpinan')
+
+    date_approved_department = fields.Datetime(string="Date Approved Department")
+    date_approved_ap = fields.Datetime(string="Date Approved AP")
+    date_approved_pimpinan = fields.Datetime(string="Date Approved Pimpinan")
+
+    position_department = fields.Char(string='Position Departement')
+    position_ap = fields.Char(string='Position AP')
+    position_pimpinan = fields.Char(string='Position Pimpinan')
+
+    approved_by = fields.Char(string='Approved By', track_visibility='always')
+
+    status = fields.Selection([
+        ('pengajuan1', 'Menunggu Approval Departement'),
+        ('pengajuan2', 'Menunggu Approval AP'),
+        ('pengajuan3', 'Menunggu Approval Pimpinan'),
+        ('approved', 'Approved'),
+    ], string='Status', default='pengajuan1', tracking=3, index=True, track_visibility='onchange')
+
+    # --- DIHAPUS ---
+    # done_status = fields.Selection([
+    #     ('remaining', 'Remaining'),
+    #     ('done_not_realized', 'Done Not Realized'),
+    #     ('done_realized', 'Done Realized')
+    # ], string='Status Realisasi', tracking=3, default='remaining')
+    # date_done_not_realized = fields.Date(string='Tanggal Done Not Realized', tracking=3)
+    # --- BATAS DIHAPUS ---
+
+    currency_id = fields.Many2one(
+        'res.currency', string='Currency',
+        default=lambda self: self.env.company.currency_id
+    )
+
+    attachment_file_image = fields.Binary(string='Attachment Image', attachment_filename='attachment_filename_image')
+    attachment_file_pdf = fields.Binary(string='Attachment PDF', attachment_filename='attachment_filename_pdf')
+    attachment_filename_image = fields.Char(string='Filename Image')
+    attachment_filename_pdf = fields.Char(string='Filename PDF')
+
+    attachment_type = fields.Selection([
+        ('pdf', 'PDF'),
+        ('image', 'Image'),
+    ], string="Attachment Type", default='pdf')
+
+    lot_of_attachment = fields.Selection([
+        ('one_for_all_line', '1 Attachment Untuk Semua Line Penggunaan PUM'),
+        ('one_for_one_line', '1 Attachment per 1 Line Penggunaan PUM'),
+    ], string = "Banyaknya Attachment", default='one_for_one_line')
+
+    move_id = fields.Many2one('account.move', string='Journal Entries', domain=[('move_type', '=', 'entry')])
+    is_cab_visible = fields.Boolean(string='Is Journal Uang Muka Visible', compute='_compute_is_cab_visible')
+
+    user_id = fields.Many2one(
+        'res.users', 
+        string='Diajukan Oleh', 
+        related='pum_id.user_id', 
+        readonly=True
+    )
+    applicant_name = fields.Many2one(
+        'res.users', 
+        string='Nama Pemohon', 
+        related='pum_id.applicant_name', 
+        readonly=True
+    )
+    is_current_user_ap = fields.Boolean(
+        string="Is Current User AP",
+        compute='_compute_is_current_user_ap'
+    )
+
+    def _compute_is_current_user_ap(self):
+        ap_user_ids = [23, 9468]
+        is_ap = self.env.user.id in ap_user_ids
+        for line in self:
+            line.is_current_user_ap = is_ap
+
+    def action_toggle_check_attachment(self):
+        ap_user_ids = [23, 9468]
+        if self.env.user.id not in ap_user_ids:
+            raise UserError('Hanya User AP yang dapat menggunakan tombol ini.')
+
+        for rec in self:
+            if not rec.penggunaan_line_ids:
+                continue
+
+            if all(line.done_attachment for line in rec.penggunaan_line_ids):
+                for line in rec.penggunaan_line_ids:
+                    line.done_attachment = False
+            else:
+                for line in rec.penggunaan_line_ids:
+                    line.done_attachment = True
+
+    @api.onchange('lot_of_attachment')
+    def _onchange_lot_of_attachment(self):
+        if self.lot_of_attachment == 'one_for_all_line':
+            for line in self.penggunaan_line_ids:
+                line.attachment_file_pdf = False
+                line.attachment_file_image = False
+                line.attachment_filename_pdf = False
+                line.attachment_filename_image = False
+
+
+    @api.depends('move_id.state')
+    def _compute_is_cab_visible(self):
+        for rec in self:
+            move = rec.move_id
+            rec.is_cab_visible = bool(move and move.state == 'posted')
+
+    def action_view_journal_uangmuka(self):
+        self.ensure_one()
+
+        ap_user_ids = [23, 9468] 
+        if self.env.user.id not in ap_user_ids:
+            raise UserError('Hanya User AP yang dapat menggunakan fitur ini.')
+        
+        if not self.move_id:
+            raise UserError("Journal Uang Muka belum tersedia.")
+
+        return {
+            'name': 'Journal Entry',
+            'view_mode': 'form',
+            'res_model': 'account.move',
+            'type': 'ir.actions.act_window',
+            'res_id': self.move_id.id,
+            'target': 'current',
+        }
+
+
+    @api.onchange('attachment_type')
+    def _onchange_attachment_type(self):
+        self.attachment_file_image = False
+        self.attachment_filename_image = False
+        self.attachment_file_pdf = False
+        self.attachment_filename_pdf = False
+
+    # @api.depends('pemberian_line_ids.value')
+    # def _compute_grand_total(self):
+    #     for rec in self:
+    #         rec.grand_total = sum(line.value for line in rec.pemberian_line_ids)
+
+    @api.depends('penggunaan_line_ids.nominal')
+    def _compute_grand_total_use(self):
+        for rec in self:
+            rec.grand_total_use = sum(line.nominal for line in rec.penggunaan_line_ids)
+
+    @api.depends('nominal_pum', 'grand_total_use')
+    def _compute_remaining_value(self):
+        for rec in self:
+            rec.remaining_value = rec.nominal_pum - rec.grand_total_use
+        return
+
+    # --- DIHAPUS ---
+    # def action_validation(self):
+    #     self.ensure_one()
+        
+    #     # Validasi hanya AP yang bisa validasi
+    #     ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+    #     if self.env.user.id not in ap_user_ids:
+    #         raise UserError('Hanya AP yang dapat melakukan validasi realisasi.')
+
+    #     if self.done_status == 'remaining':
+    #         self.done_status = 'done_not_realized'
+    #         self.date_done_not_realized = fields.Date.today()
+    #     elif self.done_status == 'done_not_realized':
+    #         self.done_status = 'done_realized'
+    #     else:
+    #         raise UserError('Realisasi sudah berstatus Done Realized.')
+
+    #     # Opsional: Tambah log di chatter
+    #     self.message_post(body=f"Status realisasi diperbarui menjadi <b>{dict(self._fields['done_status'].selection).get(self.done_status)}</b> oleh {self.env.user.name}.")
+    # --- BATAS DIHAPUS ---
+
+    def action_cab(self):
+        self.ensure_one()
+
+        ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+        if self.env.user.id not in ap_user_ids:
+            raise UserError('Hanya User AP yang dapat menggunakan ini.')
+        if self.move_id:
+            raise UserError("CAB / Jurnal sudah pernah dibuat untuk Realisasi ini.")
+
+        if not self.pum_id or not self.pum_id.move_id:
+            raise UserError("PUM terkait atau CAB belum tersedia.")
+
+        partner_id = self.pum_id.user_id.partner_id.id
+        cab_move = self.pum_id.move_id
+
+        # Account Bank Intransit dari CAB: 
+        bank_intransit_line = cab_move.line_ids.filtered(lambda l: l.account_id.id in [573, 389, 392])
+        if not bank_intransit_line:
+            raise UserError("Account Bank Intransit dengan tidak ditemukan di CAB terkait.")
+        account_sisa_pum = bank_intransit_line[0].account_id.id
+
+        # Account Uang Muka Operasional
+        account_uang_muka = 403
+
+        # --- PENYESUAIAN LOGIKA ---
+        # Tanggal pakai create_date atau hari ini
+        account_date = fields.Date.context_today(self)
+        # --- BATAS PENYESUAIAN ---
+
+        ref_label = f"Realisasi {self.pum_id.number} {self.pum_id.detail_note} ({cab_move.name})"
+
+        label_sisa_pum = f"Sisa PUM {self.pum_id.detail_note} {self.pum_id.number} ({cab_move.name})"
+
+        lines = []
+
+        # Sisa PUM (Debit)
+        if self.remaining_value > 0:
+            lines.append((0, 0, {
+                'account_id': account_sisa_pum,
+                'partner_id': partner_id,
+                'name': label_sisa_pum,
+                'debit': self.remaining_value,
+                'credit': 0,
+            }))
+
+        # Biaya Penggunaan (Debit)
+        total_biaya = 0
+        for line in self.penggunaan_line_ids:
+            lines.append((0, 0, {
+                'account_id': line.account_id.id,
+                'partner_id': partner_id,
+                'name': f"{line.description} ({line.date})",
+                'debit': line.nominal,
+                'credit': 0,
+            }))
+            total_biaya += line.nominal
+
+        # Uang Muka Operasional (Credit)
+        total_credit = self.remaining_value + total_biaya
+        if total_credit > 0:
+            lines.append((0, 0, {
+                'account_id': account_uang_muka,
+                'partner_id': partner_id,
+                'name': ref_label,
+                'debit': 0,
+                'credit': total_credit,
+            }))
+
+        move = self.env['account.move'].create({
+            'ref': ref_label,
+            'date': account_date,
+            'journal_id': 11,  # MISC
+            'line_ids': lines,
+        })
+
+        # self.message_post(body=f"Jurnal CAB telah dibuat dengan nomor: <b>{move.name}</b>.")
+
+        self.move_id = move.id
+
+        return {
+            'name': _('Journal Entry'),
+            'view_mode': 'form',
+            'res_model': 'account.move',
+            'type': 'ir.actions.act_window',
+            'res_id': move.id,
+            'target': 'current',
+        }
+        
+    def action_approval_check(self):
+        jakarta_tz = pytz.timezone('Asia/Jakarta')
+        now = datetime.now(jakarta_tz).replace(tzinfo=None)
+        formatted_date = now.strftime('%d %B %Y %H:%M')
+
+        for rec in self:
+            if not rec.pum_id.departement_type:
+                raise UserError("Field 'departement_type' wajib diisi sebelum approval.")
+
+            approver_id = rec.pum_id._get_departement_approver()
+
+            if rec.status == 'pengajuan1':
+                if self.env.user.id != approver_id:
+                    raise UserError("Hanya approver departement yang berhak menyetujui tahap ini.")
+                rec.name_approval_departement = self.env.user.name
+                rec.approved_by = (rec.approved_by + ', ' if rec.approved_by else '') + rec.name_approval_departement
+                rec.date_approved_department = now
+
+                # Mapping posisi berdasarkan departement_type
+                department_titles = {
+                    'sales': 'Sales Manager',
+                    'merchandiser': 'Merchandiser Manager',
+                    'marketing': 'Marketing Manager',
+                    'logistic': 'Logistic Manager',
+                    'procurement': 'Procurement Manager',
+                    'fat': 'Finance & Accounting Manager',
+                    'it': 'IT Manager',
+                    'hr_ga': 'HR & GA Manager',
+                    'pimpinan': 'Pimpinan',
+                }
+                rec.position_department = department_titles.get(rec.pum_id.departement_type, 'Departement Manager')
+
+                rec.status = 'pengajuan2'
+
+                rec.message_post(
+                    body=f"Approval <b>Departement</b> oleh <b>{self.env.user.name}</b> "
+                        f"pada <i>{formatted_date}</i>."
+                )
+
+            elif rec.status == 'pengajuan2':
+                ap_user_ids = [23, 9468]  # List user ID yang boleh approve sebagai Finance AP
+                if self.env.user.id not in ap_user_ids:  
+                    raise UserError("Hanya AP yang berhak menyetujui tahap ini.")
+                rec.name_approval_ap = self.env.user.name
+                rec.approved_by = (rec.approved_by + ', ' if rec.approved_by else '') + rec.name_approval_ap
+                rec.date_approved_ap = now
+                rec.position_ap = 'Finance AP'
+                rec.status = 'pengajuan3'
+
+                rec.message_post(
+                    body=f"Approval <b>AP</b> oleh <b>{self.env.user.name}</b> "
+                        f"pada <i>{formatted_date}</i>."
+                )
+
+            elif rec.status == 'pengajuan3':
+                if self.env.user.id != 7:  # ID user Pimpinan
+                    raise UserError("Hanya Pimpinan yang berhak menyetujui tahap ini.")
+                rec.name_approval_pimpinan = self.env.user.name
+                rec.approved_by = (rec.approved_by + ', ' if rec.approved_by else '') + rec.name_approval_pimpinan
+                rec.date_approved_pimpinan = now
+                rec.position_pimpinan = 'Pimpinan'
+                rec.status = 'approved'
+                # --- DIHAPUS ---
+                # rec.done_status = 'done_not_realized'  # Set status done untuk realisasi
+                # --- BATAS DIHAPUS ---
+
+                rec.message_post(
+                    body=f"Approval <b>Pimpinan</b> oleh <b>{self.env.user.name}</b> "
+                        f"pada <i>{formatted_date}</i>."
+                )
+
+            else:
+                raise UserError("Status saat ini tidak bisa di-approve lagi.")
+
+            # rec.message_post(body=f"Approval oleh {self.env.user.name} pada tahap <b>{rec.status}</b>.")
+
+    def _check_remaining_value(self):
+        for rec in self:
+            # Cek sisa PUM
+            if rec.remaining_value < 0:
+                raise ValidationError(
+                    "Sisa uang PUM tidak boleh kurang dari Rp 0.\n"
+                    "Jika ada penggunaan uang pribadi, maka ajukan dengan sistem reimburse."
+                )
+
+    @api.model
+    def create(self, vals):
+        jakarta_tz = pytz.timezone('Asia/Jakarta')
+        # --- PENYESUAIAN LOGIKA WAKTU ---
+        now = datetime.now(jakarta_tz).replace(tzinfo=None)
+        # Gunakan fields.Datetime.now() agar konsisten
+        # now = fields.Datetime.now()
+        # --- BATAS PENYESUAIAN ---
+        
+        pum_id = vals.get('pum_id')
+        initial_status = ''
+        if pum_id:
+            pum_request = self.env['advance.payment.request'].browse(pum_id)
+            if pum_request:
+                position_dari_pum = pum_request.position_type
+                department_dari_pum = pum_request.departement_type
+                if position_dari_pum == 'staff':
+                    if department_dari_pum == 'hr_ga':
+                        initial_status = 'pengajuan2'
+                    else:
+                        initial_status = 'pengajuan1'
+                elif position_dari_pum == 'manager':
+                    initial_status = 'pengajuan2' 
+                    applicant_name_str = pum_request.applicant_name.name or ''
+                    department_type = pum_request.departement_type
+                    department_titles = pum_request._get_department_titles_mapping() 
+                    dept_position = department_titles.get(department_type, 'Departement Manager')
+                    vals['date_approved_department'] = now
+                    vals['name_approval_departement'] = applicant_name_str
+                    vals['position_department'] = dept_position
+                elif position_dari_pum == 'pimpinan':
+                    initial_status = 'pengajuan2'
+                    applicant_name_str = pum_request.applicant_name.name or ''
+                    vals['date_approved_pimpinan'] = now
+                    vals['name_approval_pimpinan'] = applicant_name_str
+                    vals['position_pimpinan'] = 'Pimpinan'
+        
+        # --- PENYESUAIAN LOGIKA: SET DEFAULT JIKA KOSONG ---
+        vals['status'] = initial_status or 'pengajuan1'
+        # --- BATAS PENYESUAIAN ---
+        
+        rec = super().create(vals)
+        rec._check_remaining_value()
+        return rec
+
+    def write(self, vals):
+        res = super().write(vals)
+        self._check_remaining_value()
+        return res
+
+
+class AdvancePaymentCreateBill(models.TransientModel):
+    _name = 'advance.payment.create.bill'
+    _description = 'Create Bill from Advance Payment'
+
+    apr_id = fields.Many2one('advance.payment.request', string='Advance Payment Request', required=True)
+    account_id = fields.Many2one(
+        'account.account', string='Bank Intransit', required=True,
+        domain="[('id', 'in', [573, 389, 392])]" # ID Bank Intransit
+    )
+    nominal = fields.Float(string='Nominal', related='apr_id.nominal')
+
+    def action_create_cab(self):
+        self.ensure_one()
+
+        # if self.env.user.id != 23:
+        #     raise UserError('Hanya AP yang dapat menggunakan ini.')
+
+        apr = self.apr_id
+        partner_id = apr.user_id.partner_id.id
+
+        ref_label = f'{apr.number} - {apr.detail_note or "-"}'
+
+        move = self.env['account.move'].create({
+            'ref': ref_label,
+            'date': fields.Date.context_today(self),
+            'journal_id': 11,  # Cash & Bank
+            'line_ids': [
+                (0, 0, {
+                    'account_id': 403,  # Uang Muka Operasional
+                    'partner_id': partner_id,
+                    'name': ref_label,
+                    'debit': apr.nominal,
+                    'credit': 0,
+                }),
+                (0, 0, {
+                    'account_id': self.account_id.id,  # Bank Intransit yang dipilih
+                    'partner_id': partner_id,
+                    'name': ref_label,
+                    'debit': 0,
+                    'credit': apr.nominal,
+                })
+            ]
+        })
+
+        apr.move_id = move.id  # jika ada field untuk menampung move_id
+
+        return {
+            'name': _('Journal Entry'),
+            'view_mode': 'form',
+            'res_model': 'account.move',
+            'type': 'ir.actions.act_window',
+            'res_id': move.id,
+            'target': 'current',
+        }
+
+class CreateReimburseCabWizard(models.TransientModel):
+    _name = 'create.reimburse.cab.wizard'
+    _description = 'Wizard untuk Membuat Jurnal Reimburse'
+
+    # Field untuk menampung ID request yang sedang diproses
+    request_id = fields.Many2one('advance.payment.request', string='Pengajuan', readonly=True)
+    
+    # Field untuk memilih salah satu dari dua bank Anda
+    account_id = fields.Many2one(
+        'account.account', 
+        string='Bank Intransit (Credit)', 
+        required=True,
+        # Domain untuk membatasi pilihan hanya pada ID 573 dan 389
+        domain="[('id', 'in', [573, 389])]"
+    )
+    
+    # Field untuk menampilkan total agar pengguna bisa konfirmasi
+    total_reimburse = fields.Monetary(
+        string='Total Reimburse', 
+        related='request_id.grand_total_reimburse', 
+    )
+    currency_id = fields.Many2one(related='request_id.currency_id', readonly=True)
+
+    def action_create_reimburse_cab(self):
+        """Metode ini yang akan membuat Journal Entry (CAB)."""
+        self.ensure_one()
+        request = self.request_id
+
+        # --- Validasi ---
+        if request.move_id:
+            raise UserError("Jurnal sudah pernah dibuat untuk pengajuan ini.")
+        if not request.reimburse_line_ids:
+            raise UserError("Tidak ada rincian reimburse yang bisa dijurnalkan.")
+
+        lines = []
+        partner_id = request.user_id.partner_id.id
+        
+        # 1. Buat Jurnal DEBIT dari setiap baris reimburse
+        for line in request.reimburse_line_ids:
+            if not line.account_id:
+                raise UserError(f"Jenis Biaya pada baris '{line.description}' belum diisi oleh AP.")
+            
+            lines.append((0, 0, {
+                'account_id': line.account_id.id,
+                'partner_id': partner_id,
+                'name': line.description,
+                'debit': line.total,
+                'credit': 0,
+            }))
+
+        # 2. Buat satu Jurnal CREDIT ke bank yang dipilih di wizard
+        lines.append((0, 0, {
+            'account_id': self.account_id.id,
+            'partner_id': partner_id,
+            'name': f'Reimburse {request.number}',
+            'debit': 0,
+            'credit': request.grand_total_reimburse,
+        }))
+
+        ref_label = f'{request.number} - {request.detail_note or "-"}'
+
+        # 3. Buat Journal Entry
+        move = self.env['account.move'].create({
+            'ref': ref_label,
+            'date': fields.Date.context_today(self),
+            'journal_id': 11,  # PENTING: Ganti 11 dengan ID Journal "Miscellaneous" Anda
+            'line_ids': lines,
+        })
+
+        # 4. Tautkan journal yang baru dibuat ke request
+        request.move_id = move.id
+
+        # 5. Buka tampilan form journal yang baru dibuat
+        return {
+            'name': _('Journal Entry'),
+            'view_mode': 'form',
+            'res_model': 'account.move',
+            'type': 'ir.actions.act_window',
+            'res_id': move.id,
+            'target': 'current',
+        }
\ 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 a6175b21..c01271d3 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -190,7 +190,12 @@ access_partial_delivery_wizard_line,access.partial.delivery.wizard.line,model_pa
 access_apo_domain_config,access.apo.domain.config,model_apo_domain_config,base.group_user,1,1,1,1
 access_refund_sale_order,access.refund.sale.order,model_refund_sale_order,base.group_user,1,1,1,1
 access_refund_sale_order_line,access.refund.sale.order.line,model_refund_sale_order_line,base.group_user,1,1,1,1
-
+access_advance_payment_request,access.advance.payment.request,model_advance_payment_request,,1,1,1,1
+access_reimburse_line,access.reimburse.line,model_reimburse_line,,1,1,1,1
+access_advance_payment_settlement,access.advance.payment.settlement,model_advance_payment_settlement,,1,1,1,1
+access_advance_payment_usage_line,access.advance.payment.usage.line,model_advance_payment_usage_line,,1,1,1,1
+access_advance_payment_create_bill,access.advance.payment.create.bill,model_advance_payment_create_bill,,1,1,1,1
+access_create_reimburse_cab_wizard_user,create.reimburse.cab.wizard user,model_create_reimburse_cab_wizard,,1,1,1,1
 access_purchasing_job_seen,purchasing.job.seen,model_purchasing_job_seen,,1,1,1,1
 
 access_tukar_guling_all_users,tukar.guling.all.users,model_tukar_guling,base.group_user,1,1,1,1
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
new file mode 100644
index 00000000..c33a2843
--- /dev/null
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_form_advance_payment_request" model="ir.ui.view">
+        <field name="name">advance.payment.request.form</field>
+        <field name="model">advance.payment.request</field>
+        <field name="arch" type="xml">
+            <form string="Advance Payment Request &amp; Reimburse">
+                <header>
+                    <button name="action_realisasi_pum"
+                        type="object"
+                        string="Realisasi"
+                        class="btn-primary"
+                        attrs="{'invisible': ['|',
+                            ('status', '!=', 'approved'), 
+                            '|', ('type_request', '!=', 'pum'),
+                            ('has_settlement', '=', True)]}"/>
+                    <button name="action_approval_check"
+                        type="object"
+                        string="Checking/Approval"
+                        class="btn-success"
+                         attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/>
+                    <button name="action_confirm_payment"
+                        type="object"
+                        string="Konfirmasi Pembayaran"
+                        class="btn-info"
+                        attrs="{'invisible': ['|', ('status', 'not in', ['approved']), ('status_pay_down_payment', '=', 'payment')]}"/>
+                    <button name="action_ap_only"
+                        type="object"
+                        string="Buat Jurnal PUM"
+                        class="btn-info"
+                        attrs="{'invisible': ['|', 
+                            ('status', 'not in', ['approved']), 
+                            '|', 
+                            ('is_cab_visible', '=', True), 
+                            ('type_request', '!=', 'pum')
+                        ]}"/>
+                    <button name="action_open_create_reimburse_cab"
+                        type="object"
+                        string="Buat Jurnal Reimburse"
+                        class="btn-info"
+                        attrs="{'invisible': ['|', 
+                            ('status', 'not in', ['approved']), 
+                            '|', 
+                            ('is_cab_visible', '=', True), 
+                            ('type_request', '!=', 'reimburse')
+                        ]}"/>
+                    <field name="status" widget="statusbar"
+                        statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved"
+                        statusbar_colors='{"reject":"red"}'
+                        readonly="1"/>
+                </header>
+                <sheet>
+                    <widget name="web_ribbon" title="Payment" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'payment'), ('status', '=', 'draft')]}"/>
+                    <widget name="web_ribbon" title="Pending" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/>
+                    <div class="oe_button_box" name="button_box" style="right: 150px;">
+                        <field name="has_settlement" invisible="1"/>
+                        <button name="action_realisasi_pum"
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-check-square-o"
+                                style="width: 280px;"
+                                attrs="{'invisible': ['|', ('status', '!=', 'approved'), ('has_settlement', '=', False)]}">
+                                <!-- <field name="settlement_ids" widget="statinfo" string="Realisasi PUM"/> -->
+                                <field name="settlement_name" widget="statinfo" string="Realisasi PUM"/>
+                        </button>
+                        <field name="is_cab_visible" invisible="1"/>
+                        <field name="is_current_user_ap" invisible="1"/>
+                        <button type="object"
+                            name="action_view_journal_uangmuka"
+                            class="oe_stat_button"
+                            icon="fa-book"
+                            attrs="{'invisible': [('is_cab_visible', '=', False)]}"
+                            style="width: 200px;">
+                            <field name="move_id" widget="statinfo" string="Journal Uang Muka"/>
+                            <span class="o_stat_text">
+                                <t t-esc="record.move_id.name"/>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="number" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group col="2">
+                        <group string=" ">
+                            <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="is_represented" attrs="{'readonly': [('status', '=', 'approved')], 'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="position_type" force_save="1" readonly="1"/>
+                            <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="bank_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="account_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="bank_account" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <field name="detail_note" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+                            <br/>
+                            <field name="user_id" readonly="1"/>
+                            <!-- <field name="position_type" readonly="1"/> -->
+                            <!-- <field name="partner_id" readonly="1"/> -->
+                            <field name="departement_type"/>
+                            <field name="apr_perjalanan" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="date_back_to_office" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
+                            <p style="font-size: 10px; color: grey; font-style: italic" attrs="{'invisible': [('apr_perjalanan', '=', False)]}">*Setelah tanggal kembali, pemohon diharapkan untuk segera memproses realisasi PUM</p>
+                            <field name="estimated_return_date" readonly="1" widget="badge" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="days_remaining" readonly="1" widget="badge" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="approved_by" readonly="1"/>
+                            <field name="create_date" readonly="1"/>
+                            <field name="status_pay_down_payment"
+                                readonly="1"
+                                decoration-success="status_pay_down_payment == 'payment'"
+                                decoration-danger="status_pay_down_payment == 'pending'"
+                                widget="badge" invisible = "1"/>
+                        </group>
+                        <group string="Bukti Transfer">
+                            <field name="upload_attachment_date" readonly="1"/>
+                            <field name="attachment_type" attrs="{'readonly': [('is_current_user_ap', '=', False)]}" />
+                                <field name="attachment_file_pdf" filename="attachment_filename"
+                                    widget="pdf_viewer"
+                                    attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('is_current_user_ap', '=', False)]}"/>
+
+                                <field name="attachment_file_image" filename="attachment_filename"
+                                    widget="image"
+                                    attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('is_current_user_ap', '=', False)]}"
+                                    style="max-width:250px; max-height:250px; object-fit:contain;"/>
+                                <br/>
+                        </group>
+                    </group>
+                    <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
+                        <page string="Rincian Reimburse">
+                            <field name="reimburse_line_ids">
+                                <tree>
+                                    <field name="date"/>
+                                    <field name="description"/>
+                                    <field name="account_id"/>
+                                    <!-- <field name="distance"/> -->
+                                    <field name="quantity"/>
+                                    <field name="price_unit"/>
+                                    <field name="total" sum="Total"/>
+                                    <field name="is_checked"/>
+                                    <field name="currency_id" invisible="1"/>
+                                </tree>
+                                <form>
+                                    <group col="2">
+                                        <group string="Form">
+                                            <field name="request_id" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="is_vehicle"/>
+                                            <field name="vehicle_type" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="description"/>
+                                            <field name="distance_departure" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="distance_return" attrs="{'invisible': [('is_vehicle', '=', False)]}"/>
+                                            <field name="quantity"/>
+                                            <field name="price_unit" attrs="{'readonly': [('is_vehicle', '=', True)]}" force_save ="1"/>
+                                            <field name="total" readonly="1"/>
+                                            <field name="currency_id" invisible="1"/>
+                                            <field name="attachment_type"/>
+                                            <field name="attachment_pdf" filename="attachment_filename"
+                                                widget="pdf_viewer"
+                                                attrs="{'invisible': [('attachment_type', '!=', 'pdf')]}"/>
+                                            <field name="attachment_image" filename="attachment_filename"
+                                                widget="image"
+                                                attrs="{'invisible': [('attachment_type', '!=', 'image')]}"
+                                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
+                                        </group>
+                                        <group string="Finance">
+                                            <field name="is_current_user_ap" invisible="1"/>
+                                            <field name="is_checked" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                            <field name="account_id" placeholder="Hanya Finance yang boleh isi" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                            <group class="oe_subtotal_footer oe_right" name="reimburse_total">
+                                <field name="currency_id" invisible="1"/>
+                                <field name="grand_total_reimburse" 
+                                    widget="monetary" 
+                                    options="{'currency_field': 'currency_id'}"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_tree_advance_payment_request" model="ir.ui.view">
+        <field name="name">advance.payment.request.tree</field>
+        <field name="model">advance.payment.request</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="number"/>
+                <field name="user_id" optional='hide'/>
+                <field name="applicant_name"/>
+                <field name="nominal"/>
+                <field name="departement_type" optional='hide'/>
+                <field name="status"
+                    readonly="1"
+                    decoration-success="status == 'approved'"
+                    decoration-danger="status == 'reject'"
+                    widget="badge" optional="show"/>
+                <field name="status_pay_down_payment"
+                    readonly="1"
+                    decoration-success="status_pay_down_payment == 'payment'"
+                    decoration-danger="status_pay_down_payment == 'pending'"
+                    widget="badge"/>
+                <field name="days_remaining" readonly="1" widget="badge" optional="hide"/>
+                <field name="estimated_return_date" widget="badge" optional="hide"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_advance_payment_request" model="ir.actions.act_window">
+        <field name="name">Pengajuan Uang Muka &amp; Reimburse</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">advance.payment.request</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="menu_advance_payment_request_acct"
+        name="Pengajuan Uang Muka &amp; Reimburse"
+        parent="account.menu_finance_entries"
+        sequence="114"
+        action="action_advance_payment_request"
+    />
+    
+    <menuitem id="menu_advance_payment_request_sales"
+        name="Pengajuan Uang Muka &amp; Reimburse"
+        parent="indoteknik_custom.menu_monitoring_in_sale"
+        sequence="101"
+        action="action_advance_payment_request"
+    />
+
+    <record id="view_advance_payment_create_bill_form" model="ir.ui.view">
+        <field name="name">advance.payment.create.bill.form</field>
+        <field name="model">advance.payment.create.bill</field>
+        <field name="arch" type="xml">
+            <form string="Create CAB AP Only">
+                <group>
+                    <field name="nominal"/>
+                    <field name="account_id"/>
+                </group>
+                <footer>
+                    <button name="action_create_cab" type="object" string="Create CAB" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_advance_payment_create_bill" model="ir.actions.act_window">
+        <field name="name">Create CAB AP Only</field>
+        <field name="res_model">advance.payment.create.bill</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_advance_payment_create_bill_form"/>
+        <field name="target">new</field>
+    </record>
+
+
+    <record id="view_form_create_reimburse_cab_wizard" model="ir.ui.view">
+        <field name="name">create.reimburse.cab.wizard.form</field>
+        <field name="model">create.reimburse.cab.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Buat Jurnal Reimburse">
+                <p>Pilih akun bank yang akan digunakan untuk jurnal kredit.</p>
+                <group>
+                    <field name="total_reimburse"/>
+                    <field name="account_id" options="{'no_create': True, 'no_open': True}"/>
+                    <field name="currency_id" invisible="1"/>
+                </group>
+                <footer>
+                    <button name="action_create_reimburse_cab" type="object" string="Buat Jurnal" class="btn-primary"/>
+                    <button string="Batal" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_create_reimburse_cab_wizard" model="ir.actions.act_window">
+        <field name="name">Buat Jurnal Reimburse</field>
+        <field name="res_model">create.reimburse.cab.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="view_form_create_reimburse_cab_wizard"/>
+        <field name="target">new</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
new file mode 100644
index 00000000..1a9d7908
--- /dev/null
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -0,0 +1,184 @@
+<odoo>
+    <record id="view_form_advance_payment_settlement" model="ir.ui.view">
+        <field name="name">advance.payment.settlement.form</field>
+        <field name="model">advance.payment.settlement</field>
+        <field name="arch" type="xml">
+            <form string="Advance Payment Settlement">
+                <header>
+                    <button name="action_cab"
+                        type="object"
+                        class="btn-info"
+                        attrs="{'invisible': [ '|', ('is_cab_visible', '=', True),('status', '!=', 'approved')]}"
+                        string="Buat Jurnal Realisasi"/>
+                    <button name="action_approval_check"
+                        type="object"
+                        string="Checking/Approval"
+                        class="btn-success"
+                        attrs="{'invisible': [('status', '=', 'approved')]}"/>
+                    <field name="status" widget="statusbar"
+                        statusbar_visible="pengajuan1,pengajuan2,pengajuan3,approved"
+                        statusbar_colors='{"reject":"red"}'
+                        readonly="1"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <field name="is_cab_visible" invisible="1"/>
+                        <field name="is_current_user_ap" invisible="1"/>
+                        <button type="object"
+                            name="action_view_journal_uangmuka"
+                            class="oe_stat_button"
+                            icon="fa-book"
+                            attrs="{'invisible': [('is_cab_visible', '=', False)], 'readonly': [('is_current_user_ap', '=', False)]}"
+                            style="width: 200px;">
+                            <field name="move_id" widget="statinfo" string="Journal Entries"/>
+                            <span class="o_stat_text">
+                                <t t-esc="record.move_misc_id.name"/>
+                            </span>
+                        </button>
+                    </div>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" readonly="1"/>
+                        </h1>
+                    </div>
+                    <group col="2">
+                        <group>
+                            <field name="pum_id" readonly="1"/>
+                            <field name="title" required="1"/>
+                            <field name="goals" required="1"/>
+                            <field name="related" required="1"/>
+                            <field name="note_approval" required="1"/>
+                            <field name="lot_of_attachment"/>
+                            <field name="approved_by" readonly="1"/>
+                            <field name="applicant_name" readonly="1"/>
+                            <field name="user_id" readonly="1"/>  
+                        </group>
+                        <group attrs="{'invisible': [('lot_of_attachment', '!=', 'one_for_all_line')]}">
+                            <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
+
+                            <field name="attachment_file_pdf" filename="attachment_filename"
+                                widget="pdf_viewer"
+                                attrs="{'invisible': [('attachment_type', '!=', 'pdf')], 'readonly': [('status', '=', 'approved')]}"/>
+
+                            <field name="attachment_file_image" filename="attachment_filename"
+                                widget="image"
+                                attrs="{'invisible': [('attachment_type', '!=', 'image')], 'readonly': [('status', '=', 'approved')]}"
+                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
+                            <br/>
+                        </group>
+                    </group>
+
+                    <notebook>
+                        <page string="Rincian Penggunaan">
+                            <field name="penggunaan_line_ids" nolabel="1">
+                                <tree>
+                                    <field name="date"/>
+                                    <field name="description"/>
+                                    <field name="nominal" sum="Total Penggunaan"/>
+                                    <field name="done_attachment"/>
+                                </tree>
+
+                                <form>
+                                    <group col="2">
+                                        <group string = "Form">
+                                            <field name="lot_of_attachment" invisible="1"/>
+                                            <field name="date"/>
+                                            <field name="description"/>
+                                            <field name="nominal"/>
+                                            <field name="attachment_type"
+                                                attrs="{
+                                                    'invisible': [('lot_of_attachment', '=', 'one_for_all_line')]
+                                                }"/>
+                                            <field name="attachment_file_pdf"
+                                                filename="attachment_filename_pdf"
+                                                widget="pdf_viewer"
+                                                attrs="{
+                                                    'invisible': [
+                                                        '|',
+                                                        ('lot_of_attachment', '=', 'one_for_all_line'),
+                                                        ('attachment_type', '!=', 'pdf')
+                                                    ]
+                                                }"/>
+                                            <field name="attachment_file_image"
+                                                filename="attachment_filename_image"
+                                                widget="image"
+                                                attrs="{
+                                                    'invisible': [
+                                                        '|',
+                                                        ('lot_of_attachment', '=', 'one_for_all_line'),
+                                                        ('attachment_type', '!=', 'image')
+                                                    ]
+                                                }"
+                                                style="max-width:250px; max-height:250px; object-fit:contain;"/>
+
+                                        </group>
+                                        <group string="Finance">
+                                            <field name="is_current_user_ap" invisible="1"/>
+                                            <field name="account_id" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                            <field name="done_attachment" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                        </group>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+
+                   <div style="text-align:right;">
+                        <button name="action_toggle_check_attachment"
+                                type="object"
+                                string="Check/Uncheck All Line Use PUM"
+                                class="btn-secondary"/>
+                    </div>
+
+                    <group col="2">
+                        <group class="oe_subtotal_footer oe_right">
+                            <field name="currency_id" invisible="1"/>
+                            <field name="grand_total_use" readonly="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                            <field name="nominal_pum" readonly="1" widget="monetary" options="{'currency_field': 'currency_id'}" style="font-weight: bold;"/>
+                            <field name="remaining_value" readonly="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                        </group>
+                    </group> 
+                </sheet>
+
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_advance_payment_settlement" model="ir.actions.act_window">
+        <field name="name">Realisasi Pengajuan Uang Muka</field>
+        <field name="res_model">advance.payment.settlement</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <record id="view_tree_advance_payment_settlement" model="ir.ui.view">
+        <field name="name">advance.payment.settlement.tree</field>
+        <field name="model">advance.payment.settlement</field>
+        <field name="arch" type="xml">
+            <tree create="false" delete="false">
+                <field name="name"/>
+                <field name="pum_id"/>
+                <field name="grand_total_use" string="Total Realisasi"/>
+                <field name="remaining_value" string="Sisa PUM"/>
+                <field name="status" widget="badge" decoration-success="status == 'approved'"/>
+                </tree>
+        </field>
+    </record>
+
+    <menuitem id="menu_advance_payment_settlement_acct"
+        name="Realisasi PUM"
+        parent="account.menu_finance_entries"
+        sequence="114"
+        action="action_advance_payment_settlement"
+    />
+    
+    <menuitem id="menu_advance_payment_settlement_sales"
+        name="Realisasi PUM"
+        parent="indoteknik_custom.menu_monitoring_in_sale"
+        sequence="101"
+        action="action_advance_payment_settlement"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/ir_sequence.xml b/indoteknik_custom/views/ir_sequence.xml
index 4b8fec53..dbdbc3c0 100644
--- a/indoteknik_custom/views/ir_sequence.xml
+++ b/indoteknik_custom/views/ir_sequence.xml
@@ -219,6 +219,26 @@
             <field name="number_increment">1</field>
         </record>
 
+        <record id="sequence_advance_payment_request" model="ir.sequence">
+            <field name="name">Advance Payment Request Sequence</field>
+            <field name="code">advance.payment.request</field>
+            <field name="prefix">PUM/%(year)s/%(month)s/</field>
+            <field name="padding">4</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+
+        <record id="sequence_reimburse_request" model="ir.sequence">
+            <field name="name">Reimburse Request Sequence</field>
+            <field name="code">reimburse.request</field> 
+            <field name="prefix">RMK/%(year)s/%(month)s/</field>
+            <field name="padding">4</field>
+            <field name="number_next">1</field>
+            <field name="number_increment">1</field>
+            <field name="active">True</field>
+        </record>
+
         <record id="seq_refund_sale_order" model="ir.sequence">
             <field name="name">Refund Sales Order</field>
             <field name="code">refund.sale.order</field>
diff --git a/indoteknik_custom/views/mail_template_pum.xml b/indoteknik_custom/views/mail_template_pum.xml
new file mode 100644
index 00000000..81f8ada8
--- /dev/null
+++ b/indoteknik_custom/views/mail_template_pum.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data noupdate="0">
+
+    <record id="mail_template_pum_reminder_today" model="mail.template">
+      <field name="name">Reminder PUM: Hari Ini</field>
+      <field name="model_id" ref="indoteknik_custom.model_advance_payment_request"/>
+      <field name="subject">Reminder Realisasi PUM - ${object.number}</field>
+      <field name="email_from">${object.email_ap}</field>
+      <field name="email_to">andrifebriyadiputra@gmail.com</field>
+      <field name="body_html" type="html">
+        <div>
+          <p><b>Dengan Hormat Bpk/Ibu ${object.user_id.display_name},</b></p>
+
+          <p>
+            Berikut terlampir pengajuan PUM <b>${object.number}</b> sebesar 
+            <b>${format_amount(object.nominal, object.currency_id)}</b> dari PT. INDOTEKNIK DOTCOM GEMILANG
+            pada tanggal ${format_date(object.create_date, 'd MMMM yyyy')}.<br/>
+            Tolong segera selesaikan realisasi PUM tersebut dengan menyertakan dokumen asli untuk mendukung realisasi tersebut 
+            <b>maksimal 7 hari dari sekarang</b>.<br/>
+            Terima Kasih
+          </p>
+
+          <br/><br/>
+
+          <p><b>Best Regards,</b></p>
+
+          <br/>
+          <p><b>
+            Dept. Finance<br/>
+            PT. INDOTEKNIK DOTCOM GEMILANG<br/>
+            <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 18%; height: auto;"></img><br/>
+          </b></p>
+          <p><i>Email ini dikirim otomatis, abaikan bila sudah melakukan realisasi.</i></p>
+        </div>
+      </field>
+      <field name="auto_delete" eval="True"/>
+    </record>
+
+    <record id="mail_template_pum_reminder_h_2" model="mail.template">
+      <field name="name">Reminder Realisasi PUM: H-2</field>
+      <field name="model_id" ref="indoteknik_custom.model_advance_payment_request"/>
+      <field name="subject">Reminder Realisasi PUM (H-2) - ${object.number}</field>
+      <field name="email_from">${object.email_ap}</field>
+      <field name="email_to">andrifebriyadiputra@gmail.com</field>
+      <field name="body_html" type="html">
+        <div>
+          <p><b>Dengan Hormat Bpk/Ibu ${object.user_id.display_name},</b></p>
+
+          <p>
+            Berikut terlampir pengajuan PUM <b>${object.number}</b> sebesar 
+            <b>${format_amount(object.nominal, object.currency_id)}</b> dari PT. INDOTEKNIK DOTCOM GEMILANG
+            pada tanggal ${format_date(object.create_date, 'd MMMM yyyy')}.<br/>
+            Tolong segera selesaikan realisasi PUM tersebut dengan menyertakan dokumen asli untuk mendukung PUM tersebut 
+            <b>batas waktu tersisa 2 hari lagi</b>.<br/>
+            Terima Kasih
+          </p>
+          
+          <br/><br/>
+
+          <p><b>Best Regards,</b></p>
+
+          <br/>
+          <p><b>
+            Dept. Finance<br/>
+            PT. INDOTEKNIK DOTCOM GEMILANG<br/>
+            <img src="https://erp.indoteknik.com/api/image/ir.attachment/datas/2135765" alt="Indoteknik" style="max-width: 18%; height: auto;"></img><br/>
+          </b></p>
+          <p><i>Email ini dikirim otomatis, abaikan bila sudah melakukan realisasi.</i></p>
+        </div>
+      </field>
+      <field name="auto_delete" eval="True"/>
+    </record>
+
+  </data>
+</odoo>
\ No newline at end of file