diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index d30276dae95..b126dbd537e 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -51,10 +51,10 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <field name="membership" readonly="1"/>
+                        <field name="membership" readonly="0"/>
                         <newline/>
-                        <field name="membership_date_from" readonly="1"/>
-                        <field name="membership_date_to" readonly="1"/>
+                        <field name="membership_date_from" readonly="0"/>
+                        <field name="membership_date_to" readonly="0"/>
                     </page>
                 </page>
             </field>
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
index 8eac255c610..5b5e3c44934 100644
--- a/addons/membership/wizard/invoice_membership.py
+++ b/addons/membership/wizard/invoice_membership.py
@@ -80,9 +80,9 @@ def _invoice_membership(self, cr, uid, data, context):
         invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]})
         invoice_list.append(invoice_id)
         if line_value['invoice_line_tax_id']:
-            invoice_obj.write(cr, uid, [invoice_id], {'tax_line':tax_tab})
-            tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()[0]
-            invoice_tax_obj.create(cr, uid, tax_value)
+            tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
+            for tax in tax_value:
+                invoice_tax_obj.create(cr, uid, tax, context=context)
 
     value = {
             'domain': [