changeset 3585220cad24 in modules/account_fr:default
details: 
https://hg.tryton.org/modules/account_fr?cmd=changeset;node=3585220cad24
description:
        Use stable order for FEC lines

        issue7983
        review49691002
diffstat:

 account.py    |  4 +++-
 tests/FEC.csv |  2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r e6eda2ef9d72 -r 3585220cad24 account.py
--- a/account.py        Thu Jan 17 17:14:44 2019 +0100
+++ b/account.py        Thu Jan 17 17:16:05 2019 +0100
@@ -225,7 +225,8 @@
                 & period.fiscalyear.in_(fiscalyear_ids),
                 group_by=[
                     account.id, account.code, account.name,
-                    party.code, party.name]))
+                    party.code, party.name],
+                order_by=account.code))
         cursor.execute(*query)
         for row in cursor:
             _, code, name, party_code, party_name, balance = row
@@ -271,6 +272,7 @@
             domain,
             order=[
                 ('move.post_number', 'ASC'),
+                ('id', 'ASC'),
                 ])
 
     def get_row(self, line, format_date, format_number):
diff -r e6eda2ef9d72 -r 3585220cad24 tests/FEC.csv
--- a/tests/FEC.csv     Thu Jan 17 17:14:44 2019 +0100
+++ b/tests/FEC.csv     Thu Jan 17 17:16:05 2019 +0100
@@ -1,5 +1,5 @@
 JournalCode    JournalLib      EcritureNum     EcritureDate    CompteNum       
CompteLib       CompAuxNum      CompAuxLib      PieceRef        PieceDate       
EcritureLib     Debit   Credit  EcritureLet     DateLet ValidDate       
Montantdevise   Idevise
+OUV    Balance Initiale        0       20180101        4967    Autres comptes 
débiteurs        2       Party   -       20180101        -       5,00    0,00   
                 20180101                
 OUV    Balance Initiale        0       20180101        797     Transferts de 
charges exceptionnelles                   -       20180101        -       0,00  
  5,00                    20180101                
-OUV    Balance Initiale        0       20180101        4967    Autres comptes 
débiteurs        2       Party   -       20180101        -       5,00    0,00   
                 20180101                
 REV    Revenue 1       20180101        797     Transferts de charges 
exceptionnelles                   -       20180101        -       0,00    10,00 
                  20180101                
 REV    Revenue 1       20180101        4967    Autres comptes débiteurs        
2       Party   -       20180101        -       10,00   0,00                    
20180101                

Reply via email to