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 2024-01-03 12:25:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trytond_account (Old)
 and      /work/SRC/openSUSE:Factory/.trytond_account.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "trytond_account"

Wed Jan  3 12:25:58 2024 rev:42 rq:1135783 version:6.0.20

Changes:
--------
--- /work/SRC/openSUSE:Factory/trytond_account/trytond_account.changes  
2023-11-13 22:25:00.348637344 +0100
+++ 
/work/SRC/openSUSE:Factory/.trytond_account.new.28375/trytond_account.changes   
    2024-01-03 12:26:05.085881596 +0100
@@ -1,0 +2,5 @@
+Sat Dec 23 17:52:14 UTC 2023 - Axel Braun <axel.br...@gmx.de>
+
+- Version 6.0.20 - Bugfix Release
+
+-------------------------------------------------------------------

Old:
----
  trytond_account-6.0.19.tar.gz
  trytond_account-6.0.19.tar.gz.asc

New:
----
  trytond_account-6.0.20.tar.gz
  trytond_account-6.0.20.tar.gz.asc

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

Other differences:
------------------
++++++ trytond_account.spec ++++++
--- /var/tmp/diff_new_pack.aFfJEz/_old  2024-01-03 12:26:06.197922204 +0100
+++ /var/tmp/diff_new_pack.aFfJEz/_new  2024-01-03 12:26:06.201922351 +0100
@@ -19,7 +19,7 @@
 
 %define majorver 6.0
 Name:           trytond_account
-Version:        %{majorver}.19
+Version:        %{majorver}.20
 Release:        0
 Summary:        The "account" module for the Tryton ERP system
 License:        GPL-3.0-or-later

++++++ trytond_account-6.0.19.tar.gz -> trytond_account-6.0.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-6.0.19/CHANGELOG 
new/trytond_account-6.0.20/CHANGELOG
--- old/trytond_account-6.0.19/CHANGELOG        2023-11-03 19:13:11.000000000 
+0100
+++ new/trytond_account-6.0.20/CHANGELOG        2023-12-16 11:07:56.000000000 
+0100
@@ -1,4 +1,9 @@
 
+Version 6.0.20 - 2023-12-16
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.0.19 - 2023-11-03
 ---------------------------
 * Bug fixes (see mercurial logs for details)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-6.0.19/PKG-INFO 
new/trytond_account-6.0.20/PKG-INFO
--- old/trytond_account-6.0.19/PKG-INFO 2023-11-03 19:13:14.562682400 +0100
+++ new/trytond_account-6.0.20/PKG-INFO 2023-12-16 11:07:58.681235600 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trytond_account
-Version: 6.0.19
+Version: 6.0.20
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/6.0/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-6.0.19/account.py 
new/trytond_account-6.0.20/account.py
--- old/trytond_account-6.0.19/account.py       2023-10-30 15:17:37.000000000 
+0100
+++ new/trytond_account-6.0.20/account.py       2023-12-10 13:43:09.000000000 
+0100
@@ -413,8 +413,11 @@
                 if child.template:
                     if not child.template_override:
                         if child.template.parent:
+                            # Fallback to current parent
+                            # to keep under the same root
                             parent = template2type.get(
-                                child.template.parent.id)
+                                child.template.parent.id,
+                                child.parent)
                         else:
                             parent = None
                         old_parent = (
@@ -3041,14 +3044,16 @@
         account = Account(self.start.account.id)
         company = account.company
 
-        # Update account types
         template2type = {}
+        # Update account types
         account.type.update_type(template2type=template2type)
         # Create missing account types
         if account.type.template:
             account.type.template.create_type(
                 company.id,
                 template2type=template2type)
+            # Update again to set new parent
+            account.type.update_type(template2type=template2type)
 
         # Update accounts
         template2account = {}
@@ -3073,6 +3078,11 @@
                 account.template.id, account.company.id,
                 template2account=template2account,
                 template2tax=template2tax)
+            # Update again to set new parent
+            Tax.update_tax(
+                company.id,
+                template2account=template2account,
+                template2tax=template2tax)
 
         # Update tax codes
         template2tax_code = {}
@@ -3084,6 +3094,10 @@
             TaxCodeTemplate.create_tax_code(
                 account.template.id, company.id,
                 template2tax_code=template2tax_code)
+            # Update again to set new parent
+            TaxCode.update_tax_code(
+                company.id,
+                template2tax_code=template2tax_code)
 
         # Update tax code lines
         template2tax_code_line = {}
@@ -3100,7 +3114,7 @@
                 template2tax_code=template2tax_code,
                 template2tax_code_line=template2tax_code_line)
 
-        # Update taxes and replaced_by on accounts
+        # Update parent, taxes and replaced_by on accounts
         account.update_account2(template2account, template2tax)
 
         # Update tax rules
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-6.0.19/tax.py 
new/trytond_account-6.0.20/tax.py
--- old/trytond_account-6.0.19/tax.py   2023-05-17 23:03:30.000000000 +0200
+++ new/trytond_account-6.0.20/tax.py   2023-12-10 13:43:09.000000000 +0100
@@ -290,8 +290,8 @@
                 if child.template:
                     if not child.template_override:
                         if child.template.parent:
-                            parent = template2tax_code[
-                                child.template.parent.id]
+                            parent = template2tax_code.get(
+                                child.template.parent.id)
                         else:
                             parent = None
                         old_parent = (
@@ -1129,7 +1129,7 @@
                 if child.template:
                     if not child.template_override:
                         if child.template.parent:
-                            parent = template2tax[child.template.parent.id]
+                            parent = template2tax.get(child.template.parent.id)
                         else:
                             parent = None
                         old_parent = (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/trytond_account-6.0.19/tryton.cfg 
new/trytond_account-6.0.20/tryton.cfg
--- old/trytond_account-6.0.19/tryton.cfg       2023-09-06 23:38:24.000000000 
+0200
+++ new/trytond_account-6.0.20/tryton.cfg       2023-11-03 19:13:28.000000000 
+0100
@@ -1,5 +1,5 @@
 [tryton]
-version=6.0.19
+version=6.0.20
 depends:
     company
     currency
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/trytond_account-6.0.19/trytond_account.egg-info/PKG-INFO 
new/trytond_account-6.0.20/trytond_account.egg-info/PKG-INFO
--- old/trytond_account-6.0.19/trytond_account.egg-info/PKG-INFO        
2023-11-03 19:13:14.000000000 +0100
+++ new/trytond_account-6.0.20/trytond_account.egg-info/PKG-INFO        
2023-12-16 11:07:58.000000000 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trytond-account
-Version: 6.0.19
+Version: 6.0.20
 Summary: Tryton module for accounting
 Home-page: http://www.tryton.org/
 Download-URL: http://downloads.tryton.org/6.0/

Reply via email to