[tryton-debian-vcs] tryton-modules-account-fr branch upstream-3.8 updated. upstream/3.8.0-1-g5974d35

[Mathias Behrle]

The following commit has been merged in the upstream-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-fr.git;a=commitdiff;h=upstream/3.8.0-1-g5974d35

commit 5974d35d01bc0bbd48f55888bad2f3eec495c1c3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jun 11 22:56:46 2017 +0200

    Adding upstream version 3.8.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index a1e1422..134522c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.1 - 2017-06-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
 * Add FEC generation
diff --git a/COPYRIGHT b/COPYRIGHT
index 465d42f..ee66f8a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2010-2015 Cédric Krier.
+Copyright (C) 2010-2017 Cédric Krier.
 Copyright (C) 2010-2011 Bertrand Chenal.
-Copyright (C) 2010-2014 Nicolas Évrard.
-Copyright (C) 2010-2015 B2CK SPRL.
+Copyright (C) 2010-2017 Nicolas Évrard.
+Copyright (C) 2010-2017 B2CK SPRL.
 Copyright (C) 2014-2015 Raphaël Hertzog.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index f1c36f8..ce7101a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_fr
-Version: 3.8.0
+Version: 3.8.1
 Summary: Tryton module with French chart of accounts
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/account.py b/account.py
index 6ef7c07..f6c38a6 100644
--- a/account.py
+++ b/account.py
@@ -123,13 +123,16 @@ class AccountFrFEC(Wizard):
     def get_format_date(self):
         pool = Pool()
         Lang = pool.get('ir.lang')
-        fr, = Lang.search([('code', '=', 'fr_FR')])
-        return lambda value: Lang.strftime(value, fr.code, '%Y%m%d')
+        return lambda value: Lang.strftime(value, 'fr_FR', '%Y%m%d')
 
     def get_format_number(self):
         pool = Pool()
         Lang = pool.get('ir.lang')
-        fr, = Lang.search([('code', '=', 'fr_FR')])
+        fr = Lang(
+            decimal_point=',',
+            thousands_sep='',
+            grouping='[]',
+            )
         return lambda value: Lang.format(fr, '%.2f', value)
 
     def get_start_balance(self):
@@ -146,10 +149,15 @@ class AccountFrFEC(Wizard):
             accounts = Account.search([])
 
         for account in accounts:
-            if not account.credit and not account.debit:
+            if account.credit == account.debit:
                 continue
+            if account.debit > account.credit:
+                debit, credit = account.debit - account.credit, 0
+            else:
+                debit, credit = 0, account.debit - account.credit
             yield [
-                self.start.deferral_journal.code,
+                self.start.deferral_journal.code
+                or self.start.deferral_journal.name,
                 self.start.deferral_journal.name,
                 self.start.deferral_post_number,
                 format_date(self.start.fiscalyear.start_date),
@@ -157,11 +165,11 @@ class AccountFrFEC(Wizard):
                 account.name,
                 '',
                 '',
-                '',
+                '-',
                 format_date(self.start.fiscalyear.start_date),
-                '',
-                format_number(account.debit or 0),
-                format_number(account.credit or 0),
+                '-',
+                format_number(debit),
+                format_number(credit),
                 '',
                 '',
                 format_date(self.start.fiscalyear.start_date),
@@ -190,7 +198,7 @@ class AccountFrFEC(Wizard):
                 value += line.description
             return value
         return [
-            line.move.journal.code,
+            line.move.journal.code or line.move.journal.name,
             line.move.journal.name,
             line.move.post_number,
             format_date(line.move.date),
@@ -198,9 +206,9 @@ class AccountFrFEC(Wizard):
             line.account.name,
             line.party.code if line.party else '',
             line.party.name if line.party else '',
-            self.get_reference(line),
+            self.get_reference(line) or '-',
             format_date(self.get_reference_date(line)),
-            description(),
+            description() or '-',
             format_number(line.debit or 0),
             format_number(line.credit or 0),
             line.reconciliation.rec_name if line.reconciliation else '',
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/tryton.cfg b/tryton.cfg
index 704085a..de3afa2 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.0
+version=3.8.1
 depends:
     account
     party_siret
diff --git a/trytond_account_fr.egg-info/PKG-INFO b/trytond_account_fr.egg-info/PKG-INFO
index 8af0d7b..1dc3903 100644
--- a/trytond_account_fr.egg-info/PKG-INFO
+++ b/trytond_account_fr.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-fr
-Version: 3.8.0
+Version: 3.8.1
 Summary: Tryton module with French chart of accounts
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account_fr.egg-info/requires.txt b/trytond_account_fr.egg-info/requires.txt
index 3597ca8..c175147 100644
--- a/trytond_account_fr.egg-info/requires.txt
+++ b/trytond_account_fr.egg-info/requires.txt
@@ -1,3 +1,3 @@
 trytond_account >= 3.8, < 3.9
 trytond_party_siret >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond >= 3.8, < 3.9
-- 
tryton-modules-account-fr