diff --git a/CHANGELOG b/CHANGELOG
index 044d8ed651..f7ea954a93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Allow to create manual payment
 * Add capture
 
 Version 4.4.0 - 2017-05-01
diff --git a/payment.py b/payment.py
index 0d4bc550f2..9a86dd6a7a 100644
--- a/payment.py
+++ b/payment.py
@@ -90,7 +90,12 @@ class Payment:
     stripe_capture_needed = fields.Function(
         fields.Boolean("Stripe Capture Needed"),
         'get_stripe_capture_needed')
-    stripe_token = fields.Char("Stripe Token", readonly=True)
+    stripe_token = fields.Char("Stripe Token",
+        states={
+            'invisible': ~Eval('stripe_journal') | Eval('stripe_customer'),
+            'readonly': ~Eval('state').in_(['draft', 'approved']),
+            },
+        depends=['stripe_journal', 'stripe_customer', 'state'])
     stripe_error_message = fields.Char("Stripe Error Message", readonly=True,
         states={
             'invisible': ~Eval('stripe_error_message'),
@@ -104,12 +109,16 @@ class Payment:
             'invisible': ~Eval('stripe_error_param'),
             })
     stripe_customer = fields.Many2One(
-        'account.payment.stripe.customer', "Stripe Customer", readonly=True,
+        'account.payment.stripe.customer', "Stripe Customer",
         domain=[
             ('party', '=', Eval('party', -1)),
             ('stripe_account', '=', Eval('stripe_account', -1)),
             ],
-        depends=['party', 'stripe_account'])
+        states={
+            'invisible': ~Eval('stripe_journal') | Eval('stripe_token'),
+            'readonly': ~Eval('state').in_(['draft', 'approved']),
+            },
+        depends=['party', 'stripe_account', 'stripe_journal', 'state'])
     stripe_account = fields.Function(fields.Many2One(
             'account.payment.stripe.account', "Stripe Account"),
         'on_change_with_stripe_account')
@@ -387,6 +396,10 @@ class Customer(ModelSQL, ModelView):
     def get_stripe_checkout_needed(self, name):
         return not self.stripe_token
 
+    def get_rec_name(self, name):
+        name = super(Customer, self).get_rec_name(name)
+        return self.stripe_token if self.stripe_token else name
+
     @classmethod
     def delete(cls, customers):
         cls.write(customers, {
diff --git a/view/customer_form.xml b/view/customer_form.xml
index d51a268837..0c97042a54 100644
--- a/view/customer_form.xml
+++ b/view/customer_form.xml
@@ -8,6 +8,9 @@ this repository contains the full copyright notices and license terms. -->
     <field name="active"/>
     <label name="stripe_account"/>
     <field name="stripe_account"/>
+    <newline/>
+    <label name="stripe_token"/>
+    <field name="stripe_token"/>
     <button string="Stripe Checkout" name="stripe_checkout" colspan="2"/>
     <field name="stripe_checkout_needed" colspan="4" invisible="1"/>
     <label name="stripe_error_message"/>
diff --git a/view/customer_list.xml b/view/customer_list.xml
index a8f8728df9..5697c737d0 100644
--- a/view/customer_list.xml
+++ b/view/customer_list.xml
@@ -3,6 +3,7 @@
 this repository contains the full copyright notices and license terms. -->
 <tree>
     <field name="party"/>
+    <field name="stripe_token"/>
     <field name="stripe_account"/>
     <button string="Stripe Checkout" name="stripe_checkout"/>
     <field name="stripe_checkout_needed" tree_invisible="1"/>
diff --git a/view/payment_form.xml b/view/payment_form.xml
index 3c54b2a4cd..29b1e25cbf 100644
--- a/view/payment_form.xml
+++ b/view/payment_form.xml
@@ -7,6 +7,11 @@ this repository contains the full copyright notices and license terms. -->
         <button string="Stripe Capture" name="stripe_capture_"/>
     </xpath>
     <xpath expr="//field[@name='date']" position="after">
+        <newline/>
+        <label name="stripe_customer"/>
+        <field name="stripe_customer" colspan="3"/>
+        <label name="stripe_token"/>
+        <field name="stripe_token" colspan="3"/>
         <label name="stripe_capture"/>
         <field name="stripe_capture"/>
     </xpath>