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

2 files changed, 39 insertions, 5 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index d157dc30..45134939 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -1048,7 +1048,7 @@ class PurchaseOrder(models.Model):
 
         for line in self.order_line:
             if line.taxes_id != reference_taxes:
-                raise UserError("PPN harus sama untuk semua baris pada line.")
+                raise UserError(f"PPN harus sama untuk semua baris pada line {line.product_id.name}")
             
     def check_data_vendor(self):
         vendor = self.partner_id
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 618036bb..7be0e8ff 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -365,6 +365,17 @@ class SaleOrder(models.Model):
         compute='_compute_advance_payment_move',
         string='Advance Payment Move',
     )
+    advance_payment_move_ids = fields.Many2many(
+        'account.move',
+        compute='_compute_advance_payment_moves',
+        string='All Advance Payment Moves',
+    )
+
+    advance_payment_move_count = fields.Integer(
+        string='Jumlah Jurnal Uang Muka',
+        compute='_compute_advance_payment_moves',
+        store=False
+    )
 
     def _has_ccm(self):
         if self.id:
@@ -3196,15 +3207,38 @@ class SaleOrder(models.Model):
                 ('state', '=', 'posted'),
             ], limit=1, order="id desc")
             order.advance_payment_move_id = move
+        
+    @api.depends('invoice_ids')
+    def _compute_advance_payment_moves(self):
+        for order in self:
+            moves = self.env['account.move'].search([
+                ('sale_id', '=', order.id),
+                ('journal_id', '=', 11),
+                ('state', '=', 'posted'),
+            ])
+            order.advance_payment_move_ids = moves
+
+    @api.depends('invoice_ids')
+    def _compute_advance_payment_moves(self):
+        for order in self:
+            moves = self.env['account.move'].search([
+                ('sale_id', '=', order.id),
+                ('journal_id', '=', 11),
+                ('state', '=', 'posted'),
+            ])
+            order.advance_payment_move_ids = moves
+            order.advance_payment_move_count = len(moves)
 
-    def action_open_advance_payment_move(self):
+    def action_open_advance_payment_moves(self):
         self.ensure_one()
-        if not self.advance_payment_move_id:
+        moves = self.advance_payment_move_ids
+        if not moves:
             return
         return {
             'type': 'ir.actions.act_window',
+            'name': 'Journals Sales Order',
             'res_model': 'account.move',
-            'res_id': self.advance_payment_move_id.id,
-            'view_mode': 'form',
+            'view_mode': 'tree,form',
+            'domain': [('id', 'in', moves.ids)],
             'target': 'current',
         }
\ No newline at end of file