Merge PR #1324 into 11.0

Signed-off-by tafaRU
OCA · Jul 2, 2019 · deae973 · deae973
2 parents 7da5cc0 + 50159ce
commit deae973
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/l10n_it_withholding_tax/__manifest__.py b/l10n_it_withholding_tax/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Italian Withholding Tax',
-    'version': '11.0.1.0.0',
+    'version': '11.0.1.0.1',
     'category': 'Account',
     'author': 'Openforce, Odoo Italia Network, '
               'Odoo Community Association (OCA)',

diff --git a/l10n_it_withholding_tax/i18n/l10n_it_withholding_tax.pot b/l10n_it_withholding_tax/i18n/l10n_it_withholding_tax.pot
@@ -162,13 +162,13 @@ msgid "Due"
 msgstr ""
 
 #. module: l10n_it_withholding_tax
-#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:68
+#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:69
 #, python-format
 msgid "Error! Rates are required"
 msgstr ""
 
 #. module: l10n_it_withholding_tax
-#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:137
+#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:138
 #, python-format
 msgid "Error! You cannot have 2 rates that overlap!"
 msgstr ""
@@ -392,13 +392,13 @@ msgid "W.T."
 msgstr ""
 
 #. module: l10n_it_withholding_tax
-#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:276
+#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:277
 #, python-format
 msgid "WT %s - %s"
 msgstr ""
 
 #. module: l10n_it_withholding_tax
-#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:286
+#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:287
 #, python-format
 msgid "WT %s - %s - %s"
 msgstr ""
@@ -435,13 +435,13 @@ msgstr ""
 
 #. module: l10n_it_withholding_tax
 #: code:addons/l10n_it_withholding_tax/models/account.py:130
-#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:363
+#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:364
 #, python-format
 msgid "Warning! Only Withholding Tax moves in Due status                     can be deleted"
 msgstr ""
 
 #. module: l10n_it_withholding_tax
-#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:272
+#: code:addons/l10n_it_withholding_tax/models/withholding_tax.py:273
 #, python-format
 msgid "Warning! Wt account move already exists: %s"
 msgstr ""

diff --git a/l10n_it_withholding_tax/models/withholding_tax.py b/l10n_it_withholding_tax/models/withholding_tax.py
@@ -18,6 +18,7 @@ def _get_rate(self):
             SELECT tax, base FROM withholding_tax_rate
                 WHERE withholding_tax_id = %s
                  and (date_start <= current_date or date_start is null)
+                 and (date_stop >= current_date or date_stop is null)
                 ORDER by date_start LIMIT 1''',
                             (self.id,))
         rate = self.env.cr.fetchone()