[tryton-debian-vcs] tryton-modules-account branch upstream-2.6 updated. upstream/2.6.10-1-g2fc3ca1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Mar 4 00:28:49 UTC 2015
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-account.git;a=commitdiff;h=upstream/2.6.10-1-g2fc3ca1
commit 2fc3ca1ab76d9b20ecf097cce22c981085886c94
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 3 12:30:26 2015 +0100
Adding upstream version 2.6.11.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 5282373..ef2a321 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.11 - 2015-03-02
+* Bug fixes (see mercurial logs for details)
+
Version 2.6.10 - 2014-12-03
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index c552c67..e6e5a37 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2014 Cédric Krier.
+Copyright (C) 2008-2015 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 1eb0f6e..ae47ee9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 2.6.10
+Version: 2.6.11
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/move.py b/move.py
index ba76fb3..f2436d5 100644
--- a/move.py
+++ b/move.py
@@ -144,6 +144,11 @@ class Move(ModelSQL, ModelView):
def on_change_with_date(self):
Line = Pool().get('account.move.line')
date = self.date
+ if date:
+ if self.period and not (
+ self.period.start_date <= date <= self.period.end_date):
+ date = self.period.start_date
+ return date
lines = Line.search([
('journal', '=', self.journal),
('period', '=', self.period),
diff --git a/tryton.cfg b/tryton.cfg
index a263ae6..258092a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.6.10
+version=2.6.11
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 329aa80..460cf36 100644
--- a/trytond_account.egg-info/PKG-INFO
+++ b/trytond_account.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account
-Version: 2.6.10
+Version: 2.6.11
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list