diff --git a/account.xml b/account.xml
index 1d7d0fb7d7..e18d6cc862 100644
--- a/account.xml
+++ b/account.xml
@@ -285,7 +285,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
@@ -499,7 +499,7 @@ this repository contains the full copyright notices and license terms. -->
-
+
diff --git a/journal.py b/journal.py
index 3bfdf6390d..38a2dc073f 100644
--- a/journal.py
+++ b/journal.py
@@ -132,6 +132,9 @@ class Journal(OSV):
def default_update_posted(self, cursor, user, context=None):
return False
+ def default_sequence(self, cursor, user, context=None):
+ return False
+
def get_types(self, cursor, user, context=None):
type_obj = self.pool.get('account.journal.type')
type_ids = type_obj.search(cursor, user, [], context=context)
diff --git a/move.py b/move.py
index ecd0c709a6..c1ab084393 100644
--- a/move.py
+++ b/move.py
@@ -1094,7 +1094,8 @@ class Line(OSV):
if isinstance(ids, (int, long)):
ids = [ids]
- self.check_modify(cursor, user, ids, context=context)
+ if len(vals) > 1 or 'reconciliation' not in vals:
+ self.check_modify(cursor, user, ids, context=context)
lines = self.browse(cursor, user, ids, context=context)
move_ids = [x.move.id for x in lines]
res = super(Line, self).write(cursor, user, ids, vals, context=context)
diff --git a/party.py b/party.py
index b5a5a2f607..0dc04557c2 100644
--- a/party.py
+++ b/party.py
@@ -11,15 +11,15 @@ class Party(OSV):
relation='account.account', string='Account Payable',
domain="[('kind', '=', 'payable'), ('company', '=', company)]",
states={
- 'required': "company",
- 'invisible': "not company",
+ 'required': "bool(company)",
+ 'invisible': "not bool(company)",
})
account_receivable = fields.Property(type='many2one',
relation='account.account', string='Account Receivable',
domain="[('kind', '=', 'receivable'), ('company', '=', company)]",
states={
- 'required': "company",
- 'invisible': "not company",
+ 'required': "bool(company)",
+ 'invisible': "not bool(company)",
})
vat = fields.Property(type='many2one',
relation='account.tax', string='VAT',