[tryton-debian-vcs] tryton-modules-account branch upstream updated. upstream/3.4.0-1-gf08377b
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Dec 4 21:39:18 UTC 2014
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account.git;a=commitdiff;h=upstream/3.4.0-1-gf08377b
commit f08377bb203a0af5ad9c8d7fdbc599b7dc81abc4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Dec 4 19:25:41 2014 +0100
Adding upstream version 3.4.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 65a8a6a..354604b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2014-12-03
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
* Add option on Account for party required
diff --git a/PKG-INFO b/PKG-INFO
index 7284c22..e758884 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/TODO b/TODO
deleted file mode 100644
index 27c43ef..0000000
--- a/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Change code rules on taxes to use a one2many instead of fixed fields
-- Add a sequence on tax code
diff --git a/account.py b/account.py
index a424592..ecf25b5 100644
--- a/account.py
+++ b/account.py
@@ -401,6 +401,10 @@ class AccountTemplate(ModelSQL, ModelView):
def default_deferral():
return True
+ @staticmethod
+ def default_party_required():
+ return False
+
def get_rec_name(self, name):
if self.code:
return self.code + ' - ' + self.name
@@ -640,6 +644,10 @@ class Account(ModelSQL, ModelView):
return True
@staticmethod
+ def default_party_required():
+ return False
+
+ @staticmethod
def default_kind():
return 'view'
@@ -883,7 +891,7 @@ class Account(ModelSQL, ModelView):
current_type = self.type.id if self.type else None
template_type = (template2type.get(self.template.type.id)
if self.template.type else None)
- if current_type != template2type:
+ if current_type != template_type:
vals['type'] = template_type
if vals:
self.write([self], vals)
diff --git a/move.py b/move.py
index bddfa21..5e33006 100644
--- a/move.py
+++ b/move.py
@@ -1281,7 +1281,7 @@ class Line(ModelSQL, ModelView):
if not self.account.active:
self.raise_user_error('move_inactive_account', (
self.account.rec_name,))
- if bool(self.party) != self.account.party_required:
+ if bool(self.party) != bool(self.account.party_required):
error = 'party_set' if self.party else 'party_required'
self.raise_user_error(error, self.rec_name)
diff --git a/tryton.cfg b/tryton.cfg
index abe5265..18b170f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.1
depends:
company
currency
diff --git a/trytond_account.egg-info/PKG-INFO b/trytond_account.egg-info/PKG-INFO
index 062a845..77eb31c 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: 3.4.0
+Version: 3.4.1
Summary: Tryton module for accounting
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account.egg-info/SOURCES.txt b/trytond_account.egg-info/SOURCES.txt
index 603d7a6..1cf07a5 100644
--- a/trytond_account.egg-info/SOURCES.txt
+++ b/trytond_account.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-TODO
account.xml
aged_balance.odt
configuration.xml
--
tryton-modules-account
More information about the tryton-debian-vcs
mailing list