[tryton-debian-vcs] tryton-modules-analytic-invoice branch upstream-2.6 created. 71bf3b16b6ff920dc38bc70687cea782e311f0d3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:58:18 UTC 2013
The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-invoice.git;a=commitdiff;h=71bf3b16b6ff920dc38bc70687cea782e311f0d3
commit 71bf3b16b6ff920dc38bc70687cea782e311f0d3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat May 4 02:12:21 2013 +0200
Adding upstream version 2.6.2.
diff --git a/CHANGELOG b/CHANGELOG
index 39c1db7..356ffb5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.1 - 2012-12-23
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 34f802f..f19fa53 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_analytic_invoice
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index ff38301..5bba8ca 100644
--- a/invoice.py
+++ b/invoice.py
@@ -191,7 +191,8 @@ class InvoiceLine:
vals['credit'] = value['credit']
vals['account'] = account.id
vals['journal'] = self.invoice.journal.id
- vals['date'] = self.invoice.invoice_date
+ vals['date'] = (self.invoice.accounting_date
+ or self.invoice.invoice_date)
vals['reference'] = self.invoice.reference
vals['party'] = self.invoice.party.id
value['analytic_lines'].append(('create', vals))
diff --git a/tryton.cfg b/tryton.cfg
index b14d8fc..35b37c8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.1
+version=2.6.2
depends:
account_invoice
analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index bd291ea..4bcd122 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-analytic-invoice
-Version: 2.6.1
+Version: 2.6.2
Summary: Tryton module to add analytic accounting on invoice
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-analytic-invoice
More information about the tryton-debian-vcs
mailing list