merge

account.xml

@@ -285,7 +285,7 @@ this repository contains the full copyright notices and license terms. -->
                     <label name="kind"/>
                     <field name="kind"/>
                     <label name="type"/>
-                    <field name="type" widget="selection"/>
+                    <field name="type"/>
                     <newline/>
                     <label name="deferral"/>
                     <field name="deferral"/>
@@ -499,7 +499,7 @@ this repository contains the full copyright notices and license terms. -->
                             <label name="kind"/>
                             <field name="kind"/>
                             <label name="type"/>
-                            <field name="type" widget="selection"/>
+                            <field name="type"/>
                             <label name="deferral"/>
                             <field name="deferral"/>
                             <label name="reconcile"/>

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)

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)

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',