Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package trytond_account for openSUSE:Factory 
checked in at 2025-07-16 15:53:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trytond_account (Old)
 and      /work/SRC/openSUSE:Factory/.trytond_account.new.7373 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "trytond_account"

Wed Jul 16 15:53:22 2025 rev:54 rq:1293773 version:7.0.21

Changes:
--------
--- /work/SRC/openSUSE:Factory/trytond_account/trytond_account.changes  
2025-07-02 18:16:54.125900429 +0200
+++ 
/work/SRC/openSUSE:Factory/.trytond_account.new.7373/trytond_account.changes    
    2025-07-16 15:56:14.907968006 +0200
@@ -1,0 +2,5 @@
+Wed Jul  9 10:35:47 UTC 2025 - Axel Braun <axel.br...@gmx.de>
+
+- Version 7.0.21 - Bugfix Release
+
+-------------------------------------------------------------------

Old:
----
  trytond_account-7.0.20.tar.gz

New:
----
  trytond_account-7.0.21.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ trytond_account.spec ++++++
--- /var/tmp/diff_new_pack.a532qQ/_old  2025-07-16 15:56:15.627998066 +0200
+++ /var/tmp/diff_new_pack.a532qQ/_new  2025-07-16 15:56:15.627998066 +0200
@@ -28,7 +28,7 @@
 
 %define majorver 7.0
 Name:           trytond_account
-Version:        %{majorver}.20
+Version:        %{majorver}.21
 Release:        0
 Summary:        The "account" module for the Tryton ERP system
 License:        GPL-3.0-or-later

++++++ trytond_account-7.0.20.tar.gz -> trytond_account-7.0.21.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-7.0.20/CHANGELOG 
new/trytond_account-7.0.21/CHANGELOG
--- old/trytond_account-7.0.20/CHANGELOG        2025-05-15 19:51:02.000000000 
+0200
+++ new/trytond_account-7.0.21/CHANGELOG        2025-07-01 23:32:27.000000000 
+0200
@@ -1,4 +1,9 @@
 
+Version 7.0.21 - 2025-07-01
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.0.20 - 2025-05-15
 ---------------------------
 * Bug fixes (see mercurial logs for details)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-7.0.20/PKG-INFO 
new/trytond_account-7.0.21/PKG-INFO
--- old/trytond_account-7.0.20/PKG-INFO 2025-05-15 19:51:05.629272000 +0200
+++ new/trytond_account-7.0.21/PKG-INFO 2025-07-01 23:32:30.149278600 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trytond_account
-Version: 7.0.20
+Version: 7.0.21
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/7.0/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-7.0.20/move.py 
new/trytond_account-7.0.21/move.py
--- old/trytond_account-7.0.20/move.py  2025-05-14 18:51:10.000000000 +0200
+++ new/trytond_account-7.0.21/move.py  2025-06-29 00:34:45.000000000 +0200
@@ -64,9 +64,14 @@
     @classmethod
     def search_description_used(cls, name, clause):
         pool = Pool()
-        domain = ['OR', [
-                ('description', '!=', None),
-                ('description', '!=', ''),
+        operator = clause[1]
+        if operator.startswith('!') or operator.startswith('not '):
+            bool_op, bool_desc_op, desc_op = 'AND', 'OR', '='
+        else:
+            bool_op, bool_desc_op, desc_op = 'OR', 'AND', '!='
+        domain = [bool_op, [bool_desc_op,
+                ('description', desc_op, None),
+                ('description', desc_op, ''),
                 ('description', *clause[1:]),
                 ],
             ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-7.0.20/tax.py 
new/trytond_account-7.0.21/tax.py
--- old/trytond_account-7.0.20/tax.py   2025-05-05 10:54:28.000000000 +0200
+++ new/trytond_account-7.0.21/tax.py   2025-06-29 00:45:53.000000000 +0200
@@ -1307,14 +1307,20 @@
                         if self.currency:
                             taxline['base'] = self.currency.round(
                                 taxline['base'])
-                        if taxline not in taxes:
-                            taxes[taxline] = taxline
+                        if taxline not in current_taxes:
+                            current_taxes[taxline] = taxline
                         else:
-                            taxes[taxline]['base'] += taxline['base']
-                            taxes[taxline]['amount'] += taxline['amount']
-                        current_taxes[taxline] = taxes[taxline]
+                            current_taxes[taxline]['base'] += taxline['base']
+                            current_taxes[taxline]['amount'] += (
+                                taxline['amount'])
                     if tax_rounding == 'line':
                         self._round_taxes(current_taxes)
+                    for key, taxline in current_taxes.items():
+                        if key not in taxes:
+                            taxes[key] = taxline
+                        else:
+                            taxes[key]['base'] += taxline['base']
+                            taxes[key]['amount'] += taxline['amount']
                 if tax_rounding == 'document':
                     self._round_taxes(taxes)
                 for key, taxline in taxes.items():
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-7.0.20/tests/test_module.py 
new/trytond_account-7.0.21/tests/test_module.py
--- old/trytond_account-7.0.20/tests/test_module.py     2025-05-05 
10:54:28.000000000 +0200
+++ new/trytond_account-7.0.21/tests/test_module.py     2025-06-29 
00:45:53.000000000 +0200
@@ -1144,6 +1144,38 @@
         self.assertEqual(tax['amount'], Decimal('20.00'))
 
     @with_transaction()
+    def test_taxable_mixin_line2(self):
+        "Test TaxableMixin with rounding on line"
+        pool = Pool()
+        Tax = pool.get('account.tax')
+        Configuration = pool.get('account.configuration')
+        currency = create_currency('cur')
+
+        company = create_company()
+        with set_company(company):
+            create_chart(company, tax=True)
+            tax, = Tax.search([])
+            tax.rate = 1
+            tax.save()
+            config = Configuration(1)
+            config.tax_rounding = 'line'
+            config.save()
+
+            taxable = self.Taxable(
+                currency=currency,
+                taxable_lines=[
+                    ([tax], Decimal('1.070'), 1, None),
+                    ([tax], Decimal('1.005'), 1, None),
+                    ],
+                company=company)
+
+            taxes = taxable._get_taxes()
+
+        tax, = taxes
+        self.assertEqual(tax['base'], Decimal('2.07'))
+        self.assertEqual(tax['amount'], Decimal('2.07'))
+
+    @with_transaction()
     def test_taxable_mixin_document(self):
         "Test TaxableMixin with rounding on document"
         pool = Pool()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-7.0.20/tryton.cfg 
new/trytond_account-7.0.21/tryton.cfg
--- old/trytond_account-7.0.20/tryton.cfg       2025-05-05 10:54:28.000000000 
+0200
+++ new/trytond_account-7.0.21/tryton.cfg       2025-05-15 19:51:12.000000000 
+0200
@@ -1,5 +1,5 @@
 [tryton]
-version=7.0.20
+version=7.0.21
 depends:
     company
     currency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/trytond_account-7.0.20/trytond_account.egg-info/PKG-INFO 
new/trytond_account-7.0.21/trytond_account.egg-info/PKG-INFO
--- old/trytond_account-7.0.20/trytond_account.egg-info/PKG-INFO        
2025-05-15 19:51:04.000000000 +0200
+++ new/trytond_account-7.0.21/trytond_account.egg-info/PKG-INFO        
2025-07-01 23:32:29.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trytond_account
-Version: 7.0.20
+Version: 7.0.21
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/7.0/

Reply via email to