Merge ed88edc into 494c5f2

OCA · May 22, 2018 · 667d94f · 667d94f
2 parents 494c5f2 + ed88edc
commit 667d94f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/l10n_id_taxform_pph_21/__openerp__.py b/l10n_id_taxform_pph_21/__openerp__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Indonesia's PPh 21 Taxform Related Configuration and Computation",
-    "version": "8.0.1.0.0",
+    "version": "8.0.1.0.1",
     "category": "localization",
     "website": "https://opensynergy-indonesia.com/",
     "author": "OpenSynergy Indonesia,"

diff --git a/l10n_id_taxform_pph_21/models/res_partner.py b/l10n_id_taxform_pph_21/models/res_partner.py
@@ -4,6 +4,7 @@
 
 from openerp import models, api, fields
 from openerp.tools.translate import _
+from math import floor
 
 
 class ResPartner(models.Model):
@@ -80,8 +81,8 @@ def compute_pph_21_2110001(
         else:
             ptkp = 0.0
 
-        pkp = netto_setahun - ptkp
-        pkp_rutin = netto_setahun_rutin - ptkp
+        pkp = floor(netto_setahun - ptkp)
+        pkp_rutin = floor(netto_setahun_rutin - ptkp)
 
         obj_pph = self.env["l10n_id.pph_21_rate"]
         pph_setahun = obj_pph.find(tanggal_pemotongan).compute_tax(pkp)

diff --git a/l10n_id_taxform_pph_21_payslip/__openerp__.py b/l10n_id_taxform_pph_21_payslip/__openerp__.py
@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Indonesia's Taxform - PPh 21 Computation On Payslip",
-    "version": "8.0.1.0.0",
+    "version": "8.0.1.0.1",
     "category": "localization",
     "website": "https://opensynergy-indonesia.com/",
     "author": "OpenSynergy Indonesia,"

diff --git a/l10n_id_taxform_pph_21_payslip/tests/test_compute_payslip_tax_period.py b/l10n_id_taxform_pph_21_payslip/tests/test_compute_payslip_tax_period.py
@@ -93,7 +93,9 @@ def test_compute_payslip_tax_period(self):
         vals = {
             'employee_id': self.employee.id,
             'contract_id': self.contract.id,
-            'struct_id': self.struct.id
+            'struct_id': self.struct.id,
+            'date_start': time.strftime('%Y')+'03-01',
+            'date_end': time.strftime('%Y')+'-12-31',
         }
         new = self.obj_payslip.create(vals)