diff --git a/golem_member/models/golem_member.py b/golem_member/models/golem_member.py
index da1af86..7c41db8 100644
--- a/golem_member/models/golem_member.py
+++ b/golem_member/models/golem_member.py
@@ -66,6 +66,7 @@ class ResPartner(models.Model):
         gm_obj = self.env['golem.member']
         gm_obj.create({'partner_id': self[0].id})
 
+
 class GolemMember(models.Model):
     """ GOLEM Member model """
     _name = 'golem.member'
@@ -102,6 +103,15 @@ class GolemMember(models.Model):
     is_number_manual = fields.Boolean('Is number manual?', store=False,
                                       compute='_compute_is_number_manual')
     image_permission = fields.Boolean('Image permission?', default=True)
+    currency_id = fields.Many2one('res.currency', compute='_get_company_currency',
+                                  string="Currency")
+
+    @api.one
+    def _get_company_currency(self):
+        if self.company_id:
+            self.currency_id = self.sudo().company_id.currency_id
+        else:
+            self.currency_id = self.env.user.company_id.currency_id
 
     @api.onchange('country_id')
     def _onchange_country_id(self):
diff --git a/golem_member/views/golem_member_views.xml b/golem_member/views/golem_member_views.xml
index 836c82c..81f9614 100644
--- a/golem_member/views/golem_member_views.xml
+++ b/golem_member/views/golem_member_views.xml
@@ -28,17 +28,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <sheet>
             <div colspan="2"
               style="background-color: #ccc; color: #fff; font-size: 150%; font-weight: bold; padding: 0.5%; text-align: center; margin-bottom: 1%;">Member form</div>
-              <div name="button_box" position="inside">
-                  <button type="object" class="oe_stat_button" id="invoice_button"
-                      icon="fa-pencil-square-o" name="open_partner_invoices"
-                      attrs="{'invisible': [('free_member', '=', True)]}"
-                      context="{'default_partner_id': active_id}">
-                      <div class="o_form_field o_stat_info">
-                          <span class="o_stat_value"><field name="total_invoiced" widget='monetary' options="{'currency_field': 'currency_id'}"/></span>
-                          <span class="o_stat_text">Invoiced</span>
-                      </div>
-                  </button>
-              </div>
+              <div class="oe_button_box" name="button_box">
+                <button type="object" class="oe_stat_button" id="invoice_button"
+                  icon="fa-pencil-square-o" name="open_partner_invoices"
+                  attrs="{'invisible': [('free_member', '=', True)]}"
+                  context="{'default_partner_id': active_id}">
+                  <div class="o_form_field o_stat_info">
+                    <span class="o_stat_value">
+                      <field name="total_invoiced" widget='monetary' options="{'currency_field': 'currency_id'}"/></span>
+                    <span class="o_stat_text">Invoiced</span>
+                  </div>
+                </button>
+            </div>
+
             <group>
               <div class="oe_title">
                 <h1>
@@ -53,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 <field name="season_ids" widget="many2many_tags" />
                 <field name="category_id" widget="many2many_tags"
                   placeholder="Tags..."/>
-                  <field name="partner_id" />
+                <field name="currency_id" invisible="1"/>
               </group>
             </group>
             <group string="Personal details">