[tryton-debian-vcs] tryton-modules-health-services branch debian updated. debian/2.8.1-1-12-g5eb8f8e

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon Mar 28 18:28:30 UTC 2016


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-health-services.git;a=commitdiff;h=debian/2.8.1-1-12-g5eb8f8e

commit 5eb8f8ea5a925194b27a542ec804d42afd3a5ab6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:33:46 2016 +0200

    Releasing debian version 3.0.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index bb00765..aa8449f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-health-services (3.0.1-1) unstable; urgency=medium
+
+  * Wrapping and sorting control files (wrap-and-sort -bts).
+  * Adapting section naming in gbp.conf to current git-buildpackage.
+  * Improving description why we can not run the module test suites.
+  * Updating copyright years.
+  * Merging upstream version 3.0.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 28 Mar 2016 01:33:46 +0200
+
 tryton-modules-health-services (2.8.1-1) unstable; urgency=medium
 
   * Initial packaging.
commit 811fd5ac3cc1cfdb2954211c3b84f8c6af06b8d7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:33:45 2016 +0200

    Merging upstream version 3.0.1.

diff --git a/PKG-INFO b/PKG-INFO
index 3e56606..78d2990 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_health_services
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Services Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/README b/README
index 4d62bf1..45f0f01 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-#    Copyright (C) 2008-2015 Luis Falcon
+#    Copyright (C) 2008-2016 Luis Falcon
 
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/__init__.py b/__init__.py
index 0b6254a..daa252c 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -34,6 +34,8 @@ def register():
         HealthServiceLine,
         CreateServiceInvoiceInit,
         Invoice,
+        InvoiceLine,
+        PatientPrescriptionOrder,
         module='health_services', type_='model')
     Pool.register(
         CreateServiceInvoice,
diff --git a/health_services.py b/health_services.py
index 17a6cc9..475cc66 100644
--- a/health_services.py
+++ b/health_services.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #    Copyright (C) 2011  Adrián Bernardi, Mario Puntin (health_invoice)
 #
@@ -22,12 +22,13 @@
 #
 ##############################################################################
 import datetime
-from trytond.model import ModelView, ModelSQL, fields, ModelSingleton
+from trytond.model import ModelView, ModelSQL, fields, ModelSingleton, Unique
 from trytond.pyson import Eval, Equal
 from trytond.pool import Pool
 
 
-__all__ = ['GnuHealthSequences', 'HealthService', 'HealthServiceLine']
+__all__ = ['GnuHealthSequences', 'HealthService', 'HealthServiceLine',
+    'PatientPrescriptionOrder']
 
 
 class GnuHealthSequences(ModelSingleton, ModelSQL, ModelView):
@@ -44,9 +45,15 @@ class HealthService(ModelSQL, ModelView):
     'Health Service'
     __name__ = 'gnuhealth.health_service'
 
+    STATES = {'readonly': Eval('state') == 'invoiced'}
+
     name = fields.Char('ID', readonly=True)
-    desc = fields.Char('Description', required=True)
-    patient = fields.Many2One('gnuhealth.patient', 'Patient', required=True)
+    desc = fields.Char('Description')
+    patient = fields.Many2One('gnuhealth.patient',
+            'Patient', required=True,
+            states=STATES)
+    institution = fields.Many2One('gnuhealth.institution', 'Institution')
+
     service_date = fields.Date('Date')
     service_line = fields.One2Many('gnuhealth.health_service.line',
         'name', 'Service Line', help="Service Line")
@@ -59,8 +66,12 @@ class HealthService(ModelSQL, ModelView):
     @classmethod
     def __setup__(cls):
         super(HealthService, cls).__setup__()
-        cls._sql_constraints += [
-            ('name_uniq', 'UNIQUE(name)', 'The Service ID must be unique')]
+
+        t = cls.__table__()
+        cls._sql_constraints = [
+            ('name_unique', Unique(t,t.name),
+                'The Service ID must be unique'),
+            ]
         cls._buttons.update({
             'button_set_to_draft': {'invisible': Equal(Eval('state'),
                 'draft')}
@@ -74,6 +85,12 @@ class HealthService(ModelSQL, ModelView):
     def default_service_date():
         return datetime.date.today()
 
+    @staticmethod
+    def default_institution():
+        HealthInst = Pool().get('gnuhealth.institution')
+        institution = HealthInst.get_institution()
+        return institution
+
     @classmethod
     @ModelView.button
     def button_set_to_draft(cls, services):
@@ -115,7 +132,76 @@ class HealthServiceLine(ModelSQL, ModelView):
 
     @fields.depends('product', 'desc')
     def on_change_product(self, name=None):
-        res = {}
         if self.product:
-            res['desc'] = self.product.name
-        return res
+            self.desc = self.product.name
+
+
+    @classmethod
+    def validate(cls, services):
+        super(HealthServiceLine, cls).validate(services)
+        for service in services:
+            service.validate_invoice_status()
+
+    def validate_invoice_status(self):
+        if (self.name):
+            if (self.name.state == 'invoiced'):
+                self.raise_user_error(
+                    "This service has been invoiced.\n"
+                    "You can no longer modify service lines.")
+
+
+""" Add Prescription order charges to service model """
+
+class PatientPrescriptionOrder(ModelSQL, ModelView):
+    'Prescription Order'
+    __name__ = 'gnuhealth.prescription.order'
+
+    service = fields.Many2One(
+        'gnuhealth.health_service', 'Service',
+        domain=[('patient', '=', Eval('patient'))], depends=['patient'],
+        states = {'readonly': Equal(Eval('state'), 'done')},
+        help="Service document associated to this prescription")
+
+    @classmethod
+    def __setup__(cls):
+        cls._buttons.update({
+            'update_service': {
+                'readonly': Equal(Eval('state'), 'done'),
+            },
+            })
+
+
+    @classmethod
+    @ModelView.button
+    def update_service(cls, prescriptions):
+        pool = Pool()
+        HealthService = pool.get('gnuhealth.health_service')
+
+        hservice = []
+        prescription = prescriptions[0]
+
+        if not prescription.service:
+            cls.raise_user_error("Need to associate a service !")
+
+        service_data = {}
+        service_lines = []
+
+        # Add the prescription lines to the service document
+
+        for line in prescription.prescription_line:
+            service_lines.append(('create', [{
+                'product': line.medicament.name.id,
+                'desc': 'Prescription Line',
+                'qty': line.quantity
+                }]))
+
+            
+        hservice.append(prescription.service)
+        
+        description = "Services including " + \
+            prescription.prescription_id
+        
+        service_data ['desc'] =  description
+        service_data ['service_line'] = service_lines
+                
+        HealthService.write(hservice, service_data)
diff --git a/health_services_report.xml b/health_services_report.xml
new file mode 100644
index 0000000..f90af3b
--- /dev/null
+++ b/health_services_report.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tryton>
+    <data>
+        <record model="ir.action.report" id="report_health_services_report">
+            <field name="name">Services Report</field>
+            <field name="model">gnuhealth.health_service</field>
+            <field name="report_name">health_services.report</field>
+            <field name="report">health_services/report/health_services_report.odt</field>
+        </record>
+        <record model="ir.action.keyword" id="report_health_service_report_keyword">
+            <field name="keyword">form_print</field>
+            <field name="model">gnuhealth.health_service,-1</field>
+            <field name="action" ref="report_health_services_report"/>
+        </record>
+
+    </data>
+</tryton>
diff --git a/health_services_view.xml b/health_services_view.xml
index 10a0647..ca24ac7 100644
--- a/health_services_view.xml
+++ b/health_services_view.xml
@@ -72,6 +72,41 @@
             action="gnuhealth_action_health_service"
             id="gnuhealth_health_service_menu" icon="gnuhealth-list"/>
 
+<!-- Simple view of created health service invoices -->
+
+        <record model="ir.action.act_window" id="gnuhealth_action_health_service_invoices">
+            <field name="name">Created invoices</field>
+            <field name="res_model">account.invoice</field>
+            <field name="domain" eval="[('health_service', '!=', None)]" pyson="1"/>
+        </record>
+
+        <menuitem parent="gnuhealth_services_menu"
+            action="gnuhealth_action_health_service_invoices"
+            id="gnuhealth_health_service_invoices_menu" icon="gnuhealth-list"/>
+
+<!-- Shortcut to created invoice from health services -->
+
+        <record model="ir.action.act_window" id="act_invoice_related_form1">
+            <field name="name">Related Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="domain" eval="[('health_service', '=', Eval('active_id'))]" pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_invoice_related_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">gnuhealth.health_service,-1</field>
+            <field name="action" ref="act_invoice_related_form1"/>
+        </record>
+
+
+<!-- Extend prescription view to include the service -->
+
+        <record model="ir.ui.view" id="view_prescription_form">
+            <field name="model">gnuhealth.prescription.order</field>
+            <field name="inherit" ref="health.gnuhealth_prescription_view" />
+            <field name="type">form</field>
+            <field name="name">gnuhealth_prescription</field>
+        </record> 
 
     </data>
 </tryton>
diff --git a/invoice.py b/invoice.py
index de3fb8e..e88757d 100644
--- a/invoice.py
+++ b/invoice.py
@@ -2,17 +2,73 @@
 #this repository contains the full copyright notices and license terms.
 from trytond.model import fields
 from trytond.pool import PoolMeta
+from trytond.transaction import Transaction
+from trytond import backend
 
-__all__ = ['Invoice']
+__all__ = ['Invoice', 'InvoiceLine']
 __metaclass__ = PoolMeta
 
 
 class Invoice:
     __name__ = 'account.invoice'
-    health_service = fields.Many2One('gnuhealth.health_service',
-            'Health Service')
-    patient = fields.Many2One('gnuhealth.patient', 'Patient')
+
+    patient = fields.Function(
+            fields.Many2One('gnuhealth.patient', 'Patient',
+                help="Patient in the invoice"),
+                'get_patient')
+
+    health_service = fields.Function(
+            fields.Many2One('gnuhealth.health_service', 'Health Service',
+                help="The service entry"),
+                'get_health_service', searcher='search_health_service')
+
+    def get_patient(self, name):
+        try:
+            return self.lines[0].origin.name.patient.id
+        except:
+            return None
+
+    def get_health_service(self, name):
+        try:
+            return self.lines[0].origin.name.id
+        except:
+            return None
+
+    @classmethod
+    def search_health_service(cls, name, clause):
+        return [('lines.origin.name.id',
+                    clause[1],
+                    clause[2],
+                    'gnuhealth.health_service.line')]
+
 
     @classmethod
     def __setup__(cls):
         super(Invoice, cls).__setup__()
+
+    @classmethod
+    def __register__(cls, module_name):
+        cursor = Transaction().cursor
+        TableHandler = backend.get('TableHandler')
+        table = TableHandler(cursor, cls, module_name)
+
+        # We retrieve the patient
+        # from the invoice line origin
+        if table.column_exist('patient'):
+            table.drop_column('patient')
+
+        # Similarly, we retrieve the health_service
+        # from the invoice line origin
+        if table.column_exist('health_service'):
+            table.drop_column('health_service')
+
+        super(Invoice, cls).__register__(module_name)
+
+class InvoiceLine:
+    __name__ = 'account.invoice.line'
+
+    @classmethod
+    def _get_origin(cls):
+        return super(InvoiceLine, cls)._get_origin() + [
+            'gnuhealth.health_service.line'
+            ]
diff --git a/locale/it_IT.po b/locale/ar.po
similarity index 59%
copy from locale/it_IT.po
copy to locale/ar.po
index 57cd9d5..f996080 100644
--- a/locale/it_IT.po
+++ b/locale/ar.po
@@ -1,260 +1,254 @@
-# 
-# Translators:
-# Gabriele Meloncelli <gabriele.meloncelli at virgilio.it>, 2013
-# Giuseppe D. B. <giuped at gmail.com>, 2013
-# Selene <scordara at thymbra.com>, 2013
+# Nab3a <asn09 at aub.edu.lb>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/GNU_Health/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 12:33+0000\n"
+"Last-Translator: Nab3a <asn09 at aub.edu.lb>\n"
+"Language: ar\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452256434.0\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "L'identificazione del Servizio deve essere unico"
+msgstr "يجب أن يكون رقم هوية الخدمة مميّز"
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr ""
+msgstr "لا توجد خطة دفع آجل للمريض"
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr ""
+msgstr "لا يوجد عنوان للفاتورة"
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "Servizio già fatturato"
+msgstr "تم فوترة الخدمة"
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "Servizio Sanitario"
+msgstr "الخدمة الصحية"
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "Paziente"
+msgstr "المريض"
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr "إنشاء تاريخ"
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr "إنشاء مستخدم"
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "Descrizione"
+msgstr "الوصف"
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr "الهوية"
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
-msgstr ""
+msgstr "فاتورة بإسم"
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "Paziente"
+msgstr "المريض"
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr "الإسم"
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "Data"
+msgstr "تاريخ"
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Linea Servizio"
+msgstr "نوع الخدمة"
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "Stato"
+msgstr "الحالة"
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr "اكتب تاريخ"
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr "اكتب مستخدم"
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "Appuntamento"
+msgstr "موعد"
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr "إنشاء تاريخ"
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr "إنشاء مستخدم"
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "Descrizione"
+msgstr "الوصف"
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "Da"
+msgstr "من"
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "Servizio"
+msgstr "الخدمة"
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "Prodotto"
+msgstr "المنتج"
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "Quantità"
+msgstr "الكمية"
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr "الإسم"
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "A"
+msgstr "إلى"
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "Fattura"
+msgstr "فاتورة"
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr "اكتب تاريخ"
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "Scivere nome utente"
+msgstr "اكتب مستخدم"
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "Sequenza del Servizio Sanitario"
+msgstr "تسلسل الخدمة الصحية"
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr "الهوية"
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Linea Servizio"
+msgstr "نوع الخدمة"
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "Inserire o selezionare la data / Identificazione dell' appuntamento connesso alla valutazione"
+msgstr "أدخل أو حدّد التاريخ/الهوية للموعد المتعلق بهذا التقييم"
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "Servizio Sanitario"
+msgstr "الخدمة الصحية"
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "Servizio Sanitario"
+msgstr "الخدمة الصحية"
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "Creare Fattura Servizio Init"
+msgstr "إنشاء فاتورة أولية للخدمة"
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "Creare Fattura Servizio Sanitario"
+msgstr "إنشاء فاتورة الخدمة الصحية"
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "Servizi Sanitari"
+msgstr "الخدمات الصحية"
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Servizio Sanitario"
+msgstr "الخدمة الصحية"
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Servizio Sanitario"
+msgstr "الخدمة الصحية"
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "Servizi Sanitari"
+msgstr "الخدمات الصحية"
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "Servizi Sanitari"
+msgstr "الخدمات الصحية"
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "Amministrazione dei Servizi Sanitari"
+msgstr "إدارة الخدمات الصحية"
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "Bozza"
+msgstr "مسودة"
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "Fatturato"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "Health"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "Linea Servizio Sanitario"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "Linea Servizio"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "Servizio Sanitario"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "Impostato come bozza"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "Servizio"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "Creare Fatture"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "Vuole creare la fattura (e)?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "Fatture Servizi Sanitari"
+msgstr "مفوترة"
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "Creare Fattura"
+msgstr "إنشاء فاتورة"
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "Cancellare"
+msgstr "إلغاء"
diff --git a/locale/zh_CN.po b/locale/de_AT.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/de_AT.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/de_AT.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/el_GR.po b/locale/el_GR.po
index e4a397e..0f2c0d9 100644
--- a/locale/el_GR.po
+++ b/locale/el_GR.po
@@ -1,259 +1,245 @@
-# 
-# Translators:
-# kvisitor <kvisitor at gnugr.org>, 2013-2014
-# Vassilis Perantzakis <vaspervnp at yahoo.gr>, 2015
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-29 16:51+0000\n"
-"Last-Translator: Vassilis Perantzakis <vaspervnp at yahoo.gr>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/GNU_Health/language/el/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "Ο κωδικός ID υπηρεσίας πρέπει να είναι μοναδικός"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "Δεν έχει συνδεθεί κανείς Όρος πληρωμής με αυτό τον ασθενή"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "Δεν έχει συνδεθεί καμία διεύθυνση για την τιμολόγηση"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "Η υπηρεσία ήδη τιμολογήθηκε"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "Σύστημα Υγείας"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "Ασθενής"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "Δημιουργία ημερομηνίας"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "Δημιουργία χρήστη"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "Περιγραφή"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
-msgstr "Τιμολόγια προς"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "Ασθενής"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "Όνομα"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "Ημερομηνία"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Γραμμή υπηρεσίας"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "Περιοχή"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "Γράψτε την ημερομηνία"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "Γράψτε τον χρήστη"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "Ραντεβού"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "Δημιουργία ημερομηνίας"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "Δημιουργία Χρήστη"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "Περιγραφή"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "Από"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "Υπηρεσία"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "Προϊόν"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "Ποσότητα"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "Όνομα"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "Προς"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "Τιμολόγιο"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "Γράψτε την ημερομηνία"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "Γράψτε τον χρήστη"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "Σειρά υπηρεσιών υγείας"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Γραμμή υπηρεσίας"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "Εισάγετε ή επιλέξτε την ημερομηνία/ Κωδ. ραντεβού που σχετίζεται με αυτή την εκτίμηση"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "Σύστημα Υγείας"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "Σύστημα Υγείας"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "Δημιουργία Init για τιμολόγηση υπηρεσίας"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "Δημιουργία τιμολογίου υπηρεσιών υγείας"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "Υπηρεσίες υγείας"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Σύστημα Υγείας"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Σύστημα Υγείας"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "Υπηρεσίες υγείας"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "Υπηρεσίες υγείας"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "Διαχείριση υπηρεσιών υγείας"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "Πρόχειρο/ προσχέδιο"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "Τιμολογήθηκε"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "Υγεία"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "Γραμμή υπηρεσιών υγείας"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "Γραμμή υπηρεσίας"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "Υπηρεσία υγείας"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "Ορίσθηκε στο Πρόχειρο"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "υπηρεσία"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "Δημιουργία Τιμολογίων"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "Θέλετε να δημιουργήσετε το τιμολόγιοα(α);"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "Τιμολόγια υπηρεσιών υγείας"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "Δημιουργία Τιμολογίου"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "Διαγραφή"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/en_GB.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/en_GB.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/en_GB.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_AR.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/es_AR.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/es_AR.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_EC.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/es_EC.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/es_EC.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 46646f0..1810f38 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -1,22 +1,14 @@
-# 
-# Translators:
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2012
-# Sebastián Marró <smarro at thymbra.com>, 2014
+# Anonymous Pootle User, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-30 17:11+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/GNU_Health/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 11:19+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language: es_ES\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452251941.0\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
@@ -58,6 +50,10 @@ msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
+
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
 msgstr "Factura a"
@@ -150,6 +146,10 @@ msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
 msgstr "Secuencia para Servicio de Salud"
@@ -158,6 +158,14 @@ msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
+
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
 msgstr "Línea de Servicio"
@@ -165,7 +173,13 @@ msgstr "Línea de Servicio"
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "Introduzca o elija la fecha y la identificación de la cita relacionado con esta evaluación"
+msgstr ""
+"Introduzca o elija la fecha y la identificación de la cita relacionado con "
+"esta evaluación"
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
@@ -183,10 +197,22 @@ msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
 msgstr "Crear Factura desde Servicios"
 
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
 msgstr "Servicios de Salud"
 
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
 msgstr "Servicio de Salud"
@@ -195,6 +221,10 @@ msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
 msgstr "Servicio de Salud"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
 msgstr "Servicios de Salud"
@@ -215,42 +245,6 @@ msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
 msgstr "Facturado"
 
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "Salud"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "Línea de Servicio de Salud"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "Línea de Servicio"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "Servicio de Salud"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "Pasar a Borrador"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "servicio"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "Crear Facturas"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "¿Quiere generar la Factura(s)?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "Facturas de servicios de salud"
-
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
diff --git a/locale/zh_CN.po b/locale/es_MX.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/es_MX.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/es_MX.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_PE.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/es_PE.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/es_PE.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index e54b29d..0f2c0d9 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -1,260 +1,245 @@
-# 
-# Translators:
-# Eriam Schaffter <eriam at mediavirtuel.com>, 2012
-# Eric Vernichon <eric at vernichon.fr>, 2013,2015
-# rootio <david at vmail.me>, 2013
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Eric Vernichon <eric at vernichon.fr>\n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/GNU_Health/language/fr_FR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr_FR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "L'ID de service doit être unique"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "Pas de conditions de paiement associé au parent"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "Aucune adresse de facturation associée"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "Service déjà facturé"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "Service de santé"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "Patient"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "Créé par"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "Description"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
-msgstr "facture à "
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "Patient"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Ligne de service"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "Etat"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "Date de modification"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "Modifié par"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "Rendez-vous"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "Créé par"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "Description"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "De"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "Produit"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "Qté"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "A"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "Facture"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "Date de modification"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "Modifié par"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "Séquence service de santé"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Ligne de service"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "Entrez ou sélectionnez la date / l'ID du rendez-vous lié à cette évaluation"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "Service de santé"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "Service de santé"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "Créer facture init de service"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "Créer facture du service de santé"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "Services de santé"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Service de santé"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Service de santé"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "Services de santé"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "Services de santé"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "Administration des services de santé"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "Brouillon"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "Facturé"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "Santé"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "Ligne de service de santé"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "Ligne de service"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "Service de santé"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "Marquer comme brouillon"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "service"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "Créer Factures"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "Voulez vous générer le(s) facture(s) ?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "Factures du service de santé"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "Créer Facture"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "Annuler "
+msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 57cd9d5..137f333 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,21 +1,14 @@
-# 
-# Translators:
-# Gabriele Meloncelli <gabriele.meloncelli at virgilio.it>, 2013
-# Giuseppe D. B. <giuped at gmail.com>, 2013
-# Selene <scordara at thymbra.com>, 2013
+# Anonymous Pootle User, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/GNU_Health/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2016-01-08 11:15+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
 "Language: it\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452251723.0\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
@@ -57,6 +50,10 @@ msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
 msgstr "Identificazione"
 
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
+
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
 msgstr ""
@@ -149,6 +146,10 @@ msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
 msgstr "Scivere nome utente"
 
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
 msgstr "Sequenza del Servizio Sanitario"
@@ -157,6 +158,14 @@ msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
 msgstr "Identificazione"
 
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
+
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
 msgstr "Linea Servizio"
@@ -164,7 +173,13 @@ msgstr "Linea Servizio"
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "Inserire o selezionare la data / Identificazione dell' appuntamento connesso alla valutazione"
+msgstr ""
+"Inserire o selezionare la data / Identificazione dell' appuntamento connesso "
+"alla valutazione"
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
@@ -182,10 +197,22 @@ msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
 msgstr "Creare Fattura Servizio Sanitario"
 
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
 msgstr "Servizi Sanitari"
 
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
 msgstr "Servizio Sanitario"
@@ -194,6 +221,10 @@ msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
 msgstr "Servizio Sanitario"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
 msgstr "Servizi Sanitari"
@@ -214,42 +245,6 @@ msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
 msgstr "Fatturato"
 
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "Health"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "Linea Servizio Sanitario"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "Linea Servizio"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "Servizio Sanitario"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "Impostato come bozza"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "Servizio"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "Creare Fatture"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "Vuole creare la fattura (e)?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "Fatture Servizi Sanitari"
-
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
diff --git a/locale/zh_CN.po b/locale/kn.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/kn.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/kn.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/lo.po
similarity index 61%
copy from locale/zh_CN.po
copy to locale/lo.po
index 4c3abd8..0f2c0d9 100644
--- a/locale/zh_CN.po
+++ b/locale/lo.po
@@ -1,59 +1,50 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "服务ID不能重复"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "没有患者相关的付费项目"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "发票相关的地址不存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "服务发票已开好"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -61,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "预约"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "描写"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "服务"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "发票"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "卫生服务序列"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "服务热线"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "输入或者选择与这个评估相关的预约的日期或编号"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "创建初始的服务发票"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "创建卫生服务发票"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "卫生服务"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "卫生服务"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "卫生服务管理"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "草稿"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "发票"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "创建发票"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 233e8e3..0f2c0d9 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,61 +1,50 @@
-# 
-# Translators:
-# Daniel Linhares <danielinhares at gmail.com>, 2012
-# Diego de Souza Lopes <djkakaroto at gmail.com>, 2013
-# Flávio Veras <flaviove at gmail.com>, 2013
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/GNU_Health/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
-msgstr "O Código  do Serviço deve ser único"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No Payment Term associated to the Patient"
-msgstr "Nenhum Termo de Pagamento associado ao Paciente"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "No invoice address associated"
-msgstr "Nenhum endereço da fatura associado"
+msgstr ""
 
 msgctxt "error:gnuhealth.service.invoice.create:"
 msgid "Service already invoiced"
-msgstr "Serviço já faturado"
+msgstr ""
 
 msgctxt "field:account.invoice,health_service:"
 msgid "Health Service"
-msgstr "Serviço de Saúde"
+msgstr ""
 
 msgctxt "field:account.invoice,patient:"
 msgid "Patient"
-msgstr "Paciente"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_date:"
 msgid "Create Date"
-msgstr "Criar Agenda"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,create_uid:"
 msgid "Create User"
-msgstr "Criar Usuário"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,desc:"
 msgid "Description"
-msgstr "Descrição"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
-msgstr "Código "
+msgstr ""
+
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
@@ -63,198 +52,194 @@ msgstr ""
 
 msgctxt "field:gnuhealth.health_service,name:"
 msgid "ID"
-msgstr "Código "
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,patient:"
 msgid "Patient"
-msgstr "Paciente"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_date:"
 msgid "Date"
-msgstr "Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Linha de Serviço"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,state:"
 msgid "State"
-msgstr "Estado"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_date:"
 msgid "Write Date"
-msgstr "Inserir Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service,write_uid:"
 msgid "Write User"
-msgstr "Inserir Usuário"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,appointment:"
 msgid "Appointment"
-msgstr "Comentários"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_date:"
 msgid "Create Date"
-msgstr "Criar Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,create_uid:"
 msgid "Create User"
-msgstr "Criar Usuário"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,desc:"
 msgid "Description"
-msgstr "Descrição"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,from_date:"
 msgid "From"
-msgstr "De"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,id:"
 msgid "ID"
-msgstr "Código "
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,name:"
 msgid "Service"
-msgstr "Serviço"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,product:"
 msgid "Product"
-msgstr "Produto"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,qty:"
 msgid "Qty"
-msgstr "Qtd"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_date:"
 msgid "To"
-msgstr "Para"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,to_invoice:"
 msgid "Invoice"
-msgstr "Faturar"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_date:"
 msgid "Write Date"
-msgstr "Inserir Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
-msgstr "Inserir Usuário"
+msgstr ""
+
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
 
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
-msgstr "Ordem de Seviço da Saúde"
+msgstr ""
 
 msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
-msgstr "Código "
+msgstr ""
+
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
-msgstr "Linha de Serviço"
+msgstr ""
 
 msgctxt "help:gnuhealth.health_service.line,appointment:"
 msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
-msgstr "Entre ou selecione a data/ Código da agendamento relacionado com esta avaliação"
+msgstr ""
+
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
-msgstr "Serviço de Saúde"
+msgstr ""
 
 msgctxt "model:gnuhealth.health_service.line,name:"
 msgid "Health Service"
-msgstr "Serviço de Saúde"
+msgstr ""
 
 msgctxt "model:gnuhealth.service.invoice.init,name:"
 msgid "Create Service Invoice Init"
-msgstr "Criar Iniciar fatura do Serviço"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
-msgstr "Criar fatura do Serviço de Saúde"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
-msgstr "Serviços de Saúde"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Serviço de Saúde"
+msgstr ""
 
 msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
-msgstr "Serviço de Saúde"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
-msgstr "Serviços de Saúde"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_services_menu"
 msgid "Health Services"
-msgstr "Serviços de Saúde"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_services_admin"
 msgid "Health Services Administration"
-msgstr "Administração dos Serviços de Saúde"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Draft"
-msgstr "Em aberto"
+msgstr ""
 
 msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
-msgstr "Faturado"
-
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "Saúde"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "Linha de Serviços de Saúde"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "Linha de Serviço"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "Serviço de Saúde"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "Configurar para Rascunho"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "Serviço"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "Criar Faturas"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "Você quer gerar o faturamento(s)?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "Serviços de Faturamento de Saúde"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
-msgstr "Criar Faturamento"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.service.invoice.create,start,end:"
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 4c3abd8..248a076 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,19 +1,14 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+# Anonymous Pootle User, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-13 14:56+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 11:28+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language: zh_CN\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452252516.0\n"
 
 msgctxt "error:gnuhealth.health_service:"
 msgid "The Service ID must be unique"
@@ -55,6 +50,10 @@ msgctxt "field:gnuhealth.health_service,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "field:gnuhealth.health_service,institution:"
+msgid "Institution"
+msgstr ""
+
 msgctxt "field:gnuhealth.health_service,invoice_to:"
 msgid "Invoice to"
 msgstr ""
@@ -147,6 +146,10 @@ msgctxt "field:gnuhealth.health_service.line,write_uid:"
 msgid "Write User"
 msgstr "请您写用户"
 
+msgctxt "field:gnuhealth.prescription.order,service:"
+msgid "Service"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,health_service_sequence:"
 msgid "Health Service Sequence"
 msgstr "卫生服务序列"
@@ -155,6 +158,14 @@ msgctxt "field:gnuhealth.service.invoice.init,id:"
 msgid "ID"
 msgstr "ID"
 
+msgctxt "help:account.invoice,health_service:"
+msgid "The service entry"
+msgstr ""
+
+msgctxt "help:account.invoice,patient:"
+msgid "Patient in the invoice"
+msgstr ""
+
 msgctxt "help:gnuhealth.health_service,service_line:"
 msgid "Service Line"
 msgstr "服务热线"
@@ -164,6 +175,10 @@ msgid ""
 "Enter or select the date / ID of the appointment related to this evaluation"
 msgstr "输入或者选择与这个评估相关的预约的日期或编号"
 
+msgctxt "help:gnuhealth.prescription.order,service:"
+msgid "Service document associated to this prescription"
+msgstr ""
+
 msgctxt "model:gnuhealth.health_service,name:"
 msgid "Health Service"
 msgstr "卫生服务"
@@ -180,10 +195,22 @@ msgctxt "model:ir.action,name:act_create_health_service_invoice"
 msgid "Create Health Service Invoice"
 msgstr "创建卫生服务发票"
 
+msgctxt "model:ir.action,name:act_invoice_related_form1"
+msgid "Related Invoice"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_health_service"
 msgid "Health services"
 msgstr "卫生服务"
 
+msgctxt "model:ir.action,name:gnuhealth_action_health_service_invoices"
+msgid "Created invoices"
+msgstr ""
+
+msgctxt "model:ir.action,name:report_health_services_report"
+msgid "Services Report"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_health_service"
 msgid "Health Service"
 msgstr "卫生服务"
@@ -192,6 +219,10 @@ msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_health_service"
 msgid "Health Service"
 msgstr "卫生服务"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_invoices_menu"
+msgid "Created invoices"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_health_service_menu"
 msgid "Health services"
 msgstr "卫生服务"
@@ -212,42 +243,6 @@ msgctxt "selection:gnuhealth.health_service,state:"
 msgid "Invoiced"
 msgstr "发票"
 
-msgctxt "view:account.invoice:"
-msgid "Health"
-msgstr "健康"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Health Service Line"
-msgstr "卫生服务热线"
-
-msgctxt "view:gnuhealth.health_service.line:"
-msgid "Service Line"
-msgstr "服务热线"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Health service "
-msgstr "卫生服务"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "Set to Draft"
-msgstr "设为草稿"
-
-msgctxt "view:gnuhealth.health_service:"
-msgid "service "
-msgstr "服务"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Create Invoices"
-msgstr "创建发票"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Do you want to generate the Invoice(s) ?"
-msgstr "你想生成处方一张(或多张)发票?"
-
-msgctxt "view:gnuhealth.service.invoice.init:"
-msgid "Health Services Invoices"
-msgstr "卫生服务发票"
-
 msgctxt ""
 "wizard_button:gnuhealth.service.invoice.create,start,create_service_invoice:"
 msgid "Create Invoice"
diff --git a/report/health_services_report.odt b/report/health_services_report.odt
new file mode 100644
index 0000000..fb5891a
Binary files /dev/null and b/report/health_services_report.odt differ
diff --git a/setup.py b/setup.py
index f0e5480..498f1a3 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
     if key in info:
         info[key] = info[key].strip().splitlines()
-major_version, minor_version = 3, 4
+major_version, minor_version = 3, 8
 
 requires = []
 
diff --git a/tests/test_health_services.py b/tests/test_health_services.py
index ebff2c4..2191016 100644
--- a/tests/test_health_services.py
+++ b/tests/test_health_services.py
@@ -1,59 +1,17 @@
-#!/usr/bin/env python
-##############################################################################
-#
-#    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2011-2014 Sebastian Marro <smarro at gnusolidario.org>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import sys, os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
-    '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
-    sys.path.insert(0, os.path.dirname(DIR))
-
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
 
 
-class HealthServicesTestCase(unittest.TestCase):
+class HealthServicesTestCase(ModuleTestCase):
     '''
-    Test HealthServices module.
+    Test Health Services module.
     '''
+    module = 'health_services'
 
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('health_services')
-
-    def test0005views(self):
-        '''
-        Test views.
-        '''
-        test_view('health_services')
-
-    def test0006depends(self):
-        '''
-        Test depends.
-        '''
-        test_depends()
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
         HealthServicesTestCase))
     return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 3f1eb2d..43e31e0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,11 +1,12 @@
 [tryton]
-version=2.8.1
+version=3.0.1
 depends:
     health
     account_invoice
 xml:
     health_services_view.xml
     wizard/create_health_service_invoice.xml
+    health_services_report.xml
     data/health_service_sequences.xml
     security/access_rights.xml
     invoice.xml
diff --git a/trytond_health_services.egg-info/PKG-INFO b/trytond_health_services.egg-info/PKG-INFO
index 1bb6601..4ef1d6d 100644
--- a/trytond_health_services.egg-info/PKG-INFO
+++ b/trytond_health_services.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-health-services
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Services Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/trytond_health_services.egg-info/SOURCES.txt b/trytond_health_services.egg-info/SOURCES.txt
index b6e73e0..6bce84b 100644
--- a/trytond_health_services.egg-info/SOURCES.txt
+++ b/trytond_health_services.egg-info/SOURCES.txt
@@ -1,11 +1,13 @@
 COPYING
 MANIFEST.in
 README
+health_services_report.xml
 health_services_view.xml
 invoice.xml
 setup.py
 ./__init__.py
 ./health_services.py
+./health_services_report.xml
 ./health_services_view.xml
 ./invoice.py
 ./invoice.xml
@@ -13,13 +15,23 @@ setup.py
 ./data/health_service_sequences.xml
 ./doc/index.rst
 ./icons/folder-documents.svg
+./locale/ar.po
+./locale/de_AT.po
 ./locale/el_GR.po
+./locale/en_GB.po
+./locale/es_AR.po
+./locale/es_EC.po
 ./locale/es_ES.po
+./locale/es_MX.po
+./locale/es_PE.po
 ./locale/fr_FR.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/kn.po
+./locale/lo.po
 ./locale/pt_BR.po
 ./locale/zh_CN.po
+./report/health_services_report.odt
 ./security/access_rights.xml
 ./tests/__init__.py
 ./tests/test_health_services.py
@@ -27,6 +39,7 @@ setup.py
 ./view/gnuhealth_health_service_line.xml
 ./view/gnuhealth_health_service_line_tree.xml
 ./view/gnuhealth_health_service_tree.xml
+./view/gnuhealth_prescription.xml
 ./view/health_service_invoice.xml
 ./view/invoice_form.xml
 ./view/invoice_tree.xml
@@ -36,13 +49,23 @@ setup.py
 data/health_service_sequences.xml
 icons/README
 icons/folder-documents.svg
+locale/ar.po
+locale/de_AT.po
 locale/el_GR.po
+locale/en_GB.po
+locale/es_AR.po
+locale/es_EC.po
 locale/es_ES.po
+locale/es_MX.po
+locale/es_PE.po
 locale/fr_FR.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/kn.po
+locale/lo.po
 locale/pt_BR.po
 locale/zh_CN.po
+report/health_services_report.odt
 security/access_rights.xml
 trytond_health_services.egg-info/PKG-INFO
 trytond_health_services.egg-info/SOURCES.txt
@@ -55,6 +78,7 @@ view/gnuhealth_health_service.xml
 view/gnuhealth_health_service_line.xml
 view/gnuhealth_health_service_line_tree.xml
 view/gnuhealth_health_service_tree.xml
+view/gnuhealth_prescription.xml
 view/health_service_invoice.xml
 view/invoice_form.xml
 view/invoice_tree.xml
diff --git a/trytond_health_services.egg-info/requires.txt b/trytond_health_services.egg-info/requires.txt
index dbf00e1..76596f7 100644
--- a/trytond_health_services.egg-info/requires.txt
+++ b/trytond_health_services.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_health == 2.8.1
-trytond_account_invoice >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
+trytond_health == 3.0.1
+trytond_account_invoice >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
diff --git a/view/gnuhealth_health_service.xml b/view/gnuhealth_health_service.xml
index ce57af3..bcb7aaf 100644
--- a/view/gnuhealth_health_service.xml
+++ b/view/gnuhealth_health_service.xml
@@ -7,8 +7,11 @@
         <field name="service_date"/>
         <label name="name"/>
         <field name="name"/>
+        <newline/>
         <label name="desc"/>
-        <field name="desc" colspan="3"/>
+        <field name="desc"/>
+        <label name="institution"/>
+        <field name="institution"/>
         <label name="invoice_to"/>
         <field name="invoice_to"/>
     </group>
diff --git a/view/gnuhealth_prescription.xml b/view/gnuhealth_prescription.xml
new file mode 100644
index 0000000..d959b98
--- /dev/null
+++ b/view/gnuhealth_prescription.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<data>
+	<xpath expr="//field[@name="prescription_line"]" position="after">
+        <group id="group_prescription_services" colspan="4">
+            <label name="service"/>
+            <field name="service"/>
+            <button name="update_service" help="Update Service document with this prescription lines" string="Update Services" icon="tryton-go-next" confirm="Transfer medicaments to services ?"/>
+        </group>
+    </xpath>
+</data>
diff --git a/wizard/__init__.py b/wizard/__init__.py
index bc55984..15ee8fb 100755
--- a/wizard/__init__.py
+++ b/wizard/__init__.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #
 #    This program is free software: you can redistribute it and/or modify
diff --git a/wizard/wizard_health_services.py b/wizard/wizard_health_services.py
index f7bc51d..7f40787 100644
--- a/wizard/wizard_health_services.py
+++ b/wizard/wizard_health_services.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #
 #
@@ -65,7 +65,7 @@ class CreateServiceInvoice(Wizard):
         Journal = pool.get('account.journal')
 
         currency_id = Transaction().context.get('currency')
-        
+
         services = HealthService.browse(Transaction().context.get(
             'active_ids'))
         invoices = []
@@ -84,8 +84,6 @@ class CreateServiceInvoice(Wizard):
             invoice_data['type'] = 'out_invoice'
             invoice_data['invoice_date'] = datetime.date.today()
             invoice_data['account'] = party.account_receivable.id
-            invoice_data['patient'] = service.patient.id
-            invoice_data['health_service'] = service.id
 
             ctx = {}
             sale_price_list = None
@@ -119,7 +117,7 @@ class CreateServiceInvoice(Wizard):
                 self.raise_user_error('no_payment_term')
 
             invoice_data['payment_term'] = party.customer_payment_term.id
-            
+
             #Invoice Lines
             seq = 0
             invoice_lines = []
@@ -130,13 +128,14 @@ class CreateServiceInvoice(Wizard):
                 if sale_price_list:
                     with Transaction().set_context(ctx):
                         unit_price = sale_price_list.compute(party,
-                        line.product, line.product.list_price,
-                        line.qty, line.product.default_uom)
+                            line.product, line.product.list_price,
+                            line.qty, line.product.default_uom)
                 else:
                     unit_price = line.product.list_price
 
                 if line.to_invoice:
                     invoice_lines.append(('create', [{
+                            'origin': str(line),
                             'product': line.product.id,
                             'description': line.desc,
                             'quantity': line.qty,
commit 0f1800f7b30dcedd2be0b32a790bd3d53b99f1f7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Mar 25 21:58:40 2016 +0100

    Updating copyright years.

diff --git a/debian/copyright b/debian/copyright
index 66182f0..3200e56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-           2011-2015 GNU Solidario <health at gnusolidario.org>
+Copyright: 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+           2011-2016 GNU Solidario <health at gnusolidario.org>
 License: GPL-3+
 
 Files: setup.py
@@ -14,7 +14,7 @@ Copyright: Leonardo D'Acchille - GNU Solidario
 License: CC-BY-SA-3.0
 
 Files: debian/*
-Copyright: 2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2015-2016 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
-- 
tryton-modules-health-services



More information about the tryton-debian-vcs mailing list