[tryton-debian-vcs] tryton-modules-account-invoice branch upstream-3.6 updated. upstream/3.6.5-1-g17b5b80
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Dec 19 18:42:09 UTC 2016
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=upstream/3.6.5-1-g17b5b80
commit 17b5b80f3222d5be62dd94ea053b7e01084b0b3c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Dec 19 11:20:54 2016 +0100
Adding upstream version 3.6.6.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index c77cf9c..3a46b99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.6 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.5 - 2016-07-05
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 9b45b30..fe850ab 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_invoice
-Version: 3.6.5
+Version: 3.6.6
Summary: Tryton module for invoicing
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/invoice.py b/invoice.py
index 17d8dc4..2b9b072 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2251,7 +2251,7 @@ class InvoiceTax(ModelSQL, ModelView):
res[field] = getattr(self, field)
for field in ('account', 'base_code', 'tax_code', 'tax'):
- res[field] = getattr(self, field).id
+ res[field] = getattr(getattr(self, field), 'id', None)
return res
@@ -2506,6 +2506,7 @@ class PayInvoice(Wizard):
if not x.reconciliation]
default['amount'] = self.start.amount
+ default['date'] = self.start.date
default['currency'] = self.start.currency.id
default['currency_digits'] = self.start.currency_digits
default['company'] = invoice.company.id
diff --git a/tryton.cfg b/tryton.cfg
index e03cb84..3d2e139 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.5
+version=3.6.6
depends:
account
account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index bcb251d..a92b2b4 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-invoice
-Version: 3.6.5
+Version: 3.6.6
Summary: Tryton module for invoicing
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account-invoice
More information about the tryton-debian-vcs
mailing list