(andri) change type field + add field PUM perjalanan

2 files changed, 15 insertions, 11 deletions

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 6a0929ae..a867ddae 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -21,11 +21,13 @@ class AdvancePaymentRequest(models.Model):
 
     number = fields.Char(string='No. Dokumen', default='New Draft', tracking=3)
 
-    applicant_name = fields.Char(string='Nama Pemohon', tracking=3, required=True)
+    applicant_name = fields.Many2one('res.users', string='Nama Pemohon', 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.Char(string='Nama Account', tracking=3, required=True)
+    account_name = fields.Many2one('res.users', string='Nama Account', 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)
 
@@ -92,7 +94,7 @@ class AdvancePaymentRequest(models.Model):
         ('marketing', 'Marketing'), 
         ('logistic', 'Logistic'), 
         ('procurement', 'Procurement'),
-        ('fat', 'FAT'), 
+        ('fat_it', 'FAT & IT'), 
         ('hr_ga', 'HR & GA'),
     ], string='Departement Type', tracking=3, required=True)
 
@@ -104,7 +106,7 @@ class AdvancePaymentRequest(models.Model):
     attachment_type = fields.Selection([
         ('pdf', 'PDF'),
         ('image', 'Image'),
-    ], string="Attachment Type", default='pdf')
+    ], 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')
@@ -130,6 +132,8 @@ class AdvancePaymentRequest(models.Model):
         ('settlement', 'Realisasi')
     ])
 
+    apr_perjalanan = fields.Boolean(string = "PUM Perjalanan?", default = False)
+
     @api.onchange('nominal')
     def _onchange_nominal_no_minus(self):
         if self.nominal and self.nominal < 0:
@@ -564,12 +568,12 @@ class AdvancePaymentRequest(models.Model):
     @api.onchange('applicant_name')
     def _onchange_applicant_name(self):
         if self.applicant_name:
-            self.account_name = 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
+            self.applicant_name = self.account_name.id
 
     @api.onchange('user_id')
     def _onchange_user_id_limit_check(self):
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 42736f6a..0ec5900a 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -63,7 +63,7 @@
                         </h1>
                     </div>
                     <group col="2">
-                        <group string="">
+                        <group string=" ">
                             <field name="type_request" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="applicant_name" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                             <field name="nominal" colspan="2" attrs="{'readonly': [('status', '=', 'approved')]}"/>
@@ -76,9 +76,9 @@
                             <field name="position_type" readonly="1"/>
                             <!-- <field name="partner_id" readonly="1"/> -->
                             <field name="departement_type"/>
-                            
-                            <field name="date_back_to_office"/>
-                            <field name="estimated_return_date"  readonly="1" widget="badge"/>
+                            <field name="apr_perjalanan" attrs="{'invisible': [('type_request', '=', 'reimburse')]}"/>
+                            <field name="date_back_to_office" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
+                            <field name="estimated_return_date" readonly="1" widget="badge" attrs="{'invisible': [('apr_perjalanan', '=', False)]}"/>
                             <field name="days_remaining" readonly="1" widget="badge"/>
                             <field name="approved_by" readonly="1"/>
                             <field name="create_date" readonly="1"/>
@@ -89,7 +89,7 @@
                                 widget="badge" invisible = "1"/>
                             <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
-                        <group>
+                        <group string="Bukti Transfer">
                             <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/>
                                 <field name="attachment_file_pdf" filename="attachment_filename"
                                     widget="pdf_viewer"