himport/cli.py

@@ -16,12 +16,10 @@ from himport.dolibarrAlchemyHledger import HledgerDolibarrSQLAlchemy
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger('hreport')
 
-sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout)
-
 
 def process_args():
     options = {}
-    usage = u'''Usage: himport -v -y <YEAR> [ -y <YEAR> ] ...
+    usage = '''Usage: himport -v -y <YEAR> [ -y <YEAR> ] ...
         options:
             -v         : verbose mode
             -y <YEAR>  : import the corresponding accounting year
@@ -82,7 +80,7 @@ def do_sqlalchemy(options):
     if len(pc_missing) > 0:
         print("WARNING: poste comptable manquant")
         for pc in pc_missing:
-            sys.stdout.write("%s\n" % (pc))
+            print("%s" % (pc))
 
     # On ecrie les fichiers hledger
     Writer.write("bank", bank_journal, options['years'])

himport/dolibarrAlchemyHledger.py

@@ -174,13 +174,13 @@ class HledgerBankEntry(HledgerEntry):
             s_nom = e.url_company.societe.nom
 
         if e.url_payment_supplier:
-            f_ids = [f.facture.ref_supplier for f in e.url_payment_supplier.payment_supplier.factures]
+            f_ids = sorted([f.facture.ref_supplier for f in e.url_payment_supplier.payment_supplier.factures])
             s_description = "Règlement facture fournisseur - %s - %s" % (
                 s_nom,
                 "|".join(f_ids),
             )
         if e.url_payment:
-            f_ids = [f.facture.facnumber for f in e.url_payment.payment.factures]
+            f_ids = sorted([f.facture.facnumber for f in e.url_payment.payment.factures])
             s_description = "Règlement facture client - %s - %s" % (
                 s_nom,
                 "|".join(f_ids),