Merge branch 'odoo-backup' of bitbucket.org:altafixco/indoteknik-addons into odoo-backup

merge

4 files changed, 131 insertions, 4 deletions

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 8cadb1b6..039d18a5 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -155,6 +155,18 @@ class AdvancePaymentRequest(models.Model):
         compute='_compute_is_current_user_ap'
     )
 
+    estimate_line_ids = fields.One2many('advance.payment.request.estimate.line', 'request_id', string='Rincian Estimasi')
+
+    @api.constrains('nominal', 'estimate_line_ids')
+    def _check_nominal_vs_estimate_total(self):
+        for rec in self:
+            if rec.type_request == 'pum':
+                if not rec.estimate_line_ids:
+                    raise UserError("Rincian estimasi wajib diisi untuk PUM. Silakan tambahkan rincian estimasi.")
+                total_estimate = sum(line.nominal for line in rec.estimate_line_ids)
+                if round(total_estimate, 2) != round(rec.nominal, 2):
+                    raise UserError("Total estimasi harus sama dengan nominal PUM. Silakan sesuaikan rincian estimasi atau nominal PUM.")
+
     @api.onchange('grand_total_reimburse', 'type_request')
     def _onchange_reimburse_line_update_nominal(self):
         if self.type_request == 'reimburse':
@@ -751,7 +763,7 @@ class AdvancePaymentRequest(models.Model):
 
         pum_ids = self.search([
             ('user_id', '=', user.id),
-            ('status', '!=', 'reject'),
+            ('status', '!=', 'cancel'),
             ('type_request', '=', 'pum')
         ])
 
@@ -911,6 +923,35 @@ class AdvancePaymentUsageLine(models.Model):
         compute='_compute_is_current_user_ap'
     )
 
+    category_usage = fields.Selection([
+        ('parkir', 'Parkir'),
+        ('tol', 'Tol'),
+        ('bbm', 'BBM'),
+        ('kuli', 'Kuli'),
+        ('konsumsi', 'Konsumsi'),
+        ('lain_lain', 'Lain-lain'),
+    ], string='Kategori System', compute='_compute_category_usage')
+
+    @api.depends('account_id')
+    def _compute_category_usage(self):
+        for rec in self:
+            if not rec.account_id:
+                rec.category_usage = False
+                continue
+            name = rec.account_id.name.lower()
+            if 'bbm' in name or 'bahan bakar' in name:
+                rec.category_usage = 'bbm'
+            elif 'tol' in name:
+                rec.category_usage = 'tol'
+            elif 'parkir' in name:
+                rec.category_usage = 'parkir'
+            elif 'kuli' in name or 'bongkar' in name:
+                rec.category_usage = 'kuli'
+            elif 'konsumsi' in name or 'makan' in name or 'minum' in name:
+                rec.category_usage = 'konsumsi'
+            else:
+                rec.category_usage = 'lain_lain'
+
     def _compute_is_current_user_ap(self):
         ap_user_ids = [23, 9468, 16729]
         is_ap = self.env.user.id in ap_user_ids
@@ -1144,6 +1185,11 @@ class AdvancePaymentSettlement(models.Model):
         string="Is Current User AP",
         compute='_compute_is_current_user_ap'
     )
+    pum_estimate_line_ids = fields.One2many(
+        related='pum_id.estimate_line_ids',
+        string='Rincian Estimasi PUM',
+        readonly=True
+    )
 
     def _compute_is_current_user_ap(self):
         ap_user_ids = [23, 9468, 16729]
@@ -1612,4 +1658,50 @@ class CreateReimburseCabWizard(models.TransientModel):
             'type': 'ir.actions.act_window',
             'res_id': move.id,
             'target': 'current',
-        }
\ No newline at end of file
+        }
+
+class AdvancePaymentRequestEstimateLine(models.Model):
+    _name = 'advance.payment.request.estimate.line'
+    _description = 'Advance Payment Request Estimate Line'
+
+    request_id = fields.Many2one('advance.payment.request', string='Request')
+    category_estimate = fields.Selection([
+        ('parkir', 'Parkir'),
+        ('tol', 'Tol'),
+        ('bbm', 'BBM'),
+        ('kuli', 'Kuli'),
+        ('konsumsi', 'Konsumsi'),
+        ('lain_lain', 'Lain-lain'),
+    ], string='Kategori Estimasi', required=True)
+    description = fields.Text(string='Description', help='Deskripsi tambahan untuk estimasi biaya yang diperlukan.')
+    nominal = fields.Float(string='Nominal Estimasi', required=True, help='Masukkan nominal estimasi untuk kategori ini (tidak mesti akurat, hanya untuk gambaran umum).')
+    currency_id = fields.Many2one(related='request_id.currency_id')
+
+    total_actual = fields.Float(string='Nominal Realisasi', compute='_compute_actual_data')
+    frequency = fields.Integer(string='Qty Realisasi', compute='_compute_actual_data')
+
+    @api.depends('request_id.settlement_ids.penggunaan_line_ids.nominal',
+                'request_id.settlement_ids.penggunaan_line_ids.account_id')
+    def _compute_actual_data(self):
+        for rec in self:
+            total_act = 0
+            freq = 0
+            if rec.request_id and rec.request_id.settlement_ids:
+                all_usage_lines = rec.request_id.settlement_ids.mapped('penggunaan_line_ids')
+                valid_lines = all_usage_lines.filtered(lambda l: l.account_id and l.category_usage)
+                planned_category = rec.request_id.estimate_line_ids.mapped('category_estimate')
+                if rec.category_estimate == 'lain_lain':
+                    matched_lines = valid_lines.filtered(
+                        lambda l: l.category_usage == 'lain_lain' or \
+                            l.category_usage not in planned_category
+                    )
+                else:
+                    matched_lines = valid_lines.filtered(
+                        lambda l: l.category_usage == rec.category_estimate
+                    )
+                
+                total_act = sum(matched_lines.mapped('nominal'))
+                freq = len(matched_lines)
+            rec.total_actual = total_act
+            rec.frequency = freq
+
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 4ffefc68..b6583ed5 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -200,6 +200,7 @@ access_advance_payment_usage_line,access.advance.payment.usage.line,model_advanc
 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_advance_payment_cancel_wizard,advance.payment.cancel.wizard,model_advance_payment_cancel_wizard,,1,1,1,1
+access_advance_payment_request_estimate_line,advance.payment.request.estimate.line,model_advance_payment_request_estimate_line,,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
index 340e0caf..4faf905e 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -134,8 +134,28 @@
                                 <br/>
                         </group>
                     </group>
-                    <notebook attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
-                        <page string="Rincian Reimburse">
+                    <notebook>
+                        <page string="Rincian Estimasi PUM" attrs="{'invisible': [('type_request', '!=', 'pum')]}">
+                            <p style="font-size: 12px; color: grey; font-style: italic">*Masukkan estimasi alokasi biaya sebagai gambaran rencana penggunaan dana, tidak harus diisi dengan nominal yang akurat</p>
+                            <field name="estimate_line_ids">
+                                <tree>
+                                    <field name="category_estimate"/>
+                                    <field name="description"/>
+                                    <field name="nominal" sum="Total"/>
+                                    <field name="currency_id" invisible="1"/>
+                                </tree>
+                                <form>
+                                    <group col="2">
+                                        <field name="request_id" invisible="1"/>
+                                        <field name="category_estimate"/>
+                                        <field name="description" placeholder="Deskripsi tambahan untuk rincian estimasi..."/>
+                                        <field name="nominal"/>
+                                        <field name="currency_id" invisible="1"/>
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Rincian Reimburse" attrs="{'invisible': [('type_request', '!=', 'reimburse')]}">
                             <field name="reimburse_line_ids">
                                 <tree>
                                     <field name="sequence" widget="handle"/>
diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml
index a8bf1de7..352c5b96 100644
--- a/indoteknik_custom/views/advance_payment_settlement.xml
+++ b/indoteknik_custom/views/advance_payment_settlement.xml
@@ -118,12 +118,26 @@
                                         <group string="Finance">
                                             <field name="is_current_user_ap" invisible="1"/>
                                             <field name="account_id" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
+                                            <field name="category_usage" invisible="1"/>
                                             <field name="done_attachment" attrs="{'readonly': [('is_current_user_ap', '=', False)]}"/>
                                         </group>
                                     </group>
                                 </form>
                             </field>
                         </page>
+                        <page string="Rincian Estimasi PUM">
+                            <p style="font-size: 12px; color: grey; font-style: italic">*Rincian estimasi PUM ini hanya sebagai gambaran umum untuk realisasi yang dilakukan, tidak harus diisi dengan nominal yang akurat.</p>
+                            <field name="pum_estimate_line_ids" nolabel="1">
+                                <tree>
+                                    <field name="category_estimate"/>
+                                    <field name="description"/>
+                                    <field name="nominal" sum="Total Estimasi"/>
+                                    <field name="frequency"/>
+                                    <field name="total_actual" sum="Total Actual"/>
+                                    <field name="currency_id" invisible="1"/>
+                                </tree>
+                            </field>
+                        </page>
                     </notebook>
 
                    <div style="text-align:right;">