diff --git a/maintenance.py b/maintenance.py
index 2854047..da75127 100644
--- a/maintenance.py
+++ b/maintenance.py
@@ -164,6 +164,9 @@ class MaintenanceService(ModelSQL, ModelView):
                               ('finished', "Finished")
                               ], "State",required=True, readonly=True, sort=False)
 
+    @staticmethod
+    def default_company():
+        return Transaction().context.get('company')
 
     @classmethod
     def default_state(self):
diff --git a/sale.py b/sale.py
index dc89e93..49640f2 100644
--- a/sale.py
+++ b/sale.py
@@ -46,7 +46,7 @@ class Sale(metaclass=PoolMeta):
                     propietary_address=cls.shipment_address,
                     state="draft"
                 )
-                #raise UserError(str(dir(maintenanceService)))
+                #raise UserError(str((maintenanceService)))
                 maintenanceService.save()
             cls.agended = True
             sale.save()
diff --git a/view/address_tree.xml b/view/address_tree.xml
new file mode 100644
index 0000000..ca8f425
--- /dev/null
+++ b/view/address_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//field[@name='name']" position="after">
+	<field name="street" expand="1"/>
+    </xpath>
+</data>
diff --git a/view/maintenance_calendar.xml b/view/maintenance_calendar.xml
new file mode 100644
index 0000000..2308197
--- /dev/null
+++ b/view/maintenance_calendar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<calendar
+    dtstart="estimated_agended"
+    dtend="estimated_agended">
+</calendar>
diff --git a/view/maintenance_service_form.xml b/view/maintenance_service_form.xml
new file mode 100644
index 0000000..d276371
--- /dev/null
+++ b/view/maintenance_service_form.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?> 
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+     this repository contains the full copyright notices and license terms. -->
+<form col="6">
+    <label name="maintenance_type"/>
+    <field name="maintenance_type"/>
+    <label name="propietary"/>
+    <field name="propietary"/>
+    <label name="propietary_address"/>
+    <field name="propietary_address"/>
+    <label name="code"/>
+    <field name="code"/>
+    <label name="description"/>
+    <field name="description" colspan="3"/>
+    <label name="reference"/>
+    <field name="reference"/>
+    <label name="sale_origin"/>
+    <field name="sale_origin"/>
+    <newline/>
+    <notebook colspan="6">
+	<page string="General" id="general">
+	    <label name="state_agended"/>
+	    <field name="state_agended"/>
+	    <label name="estimated_agended"/>
+	    <field name="estimated_agended"/>
+	    <label name="technical"/>
+	    <field name="technical"/>
+	</page>
+	<page string="Lines Of Mantenaince" id="lines_maintenance">
+	    <field name="lines"/>
+	</page>
+	<page string="Other Info" id="other_info">
+	    <label name="company"/>
+	    <field name="company"/>
+	</page>
+    </notebook>
+    <newline/>
+    <label name="state"/>
+    <field name="state"/>
+    <group id="button">
+      <button name="agended"/>
+      <button name="in_progress"/>
+      <button name="finished"/>
+    </group>
+</form>
diff --git a/view/maintenance_service_tree.xml b/view/maintenance_service_tree.xml
new file mode 100644
index 0000000..c1e9548
--- /dev/null
+++ b/view/maintenance_service_tree.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?> 
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+     this repository contains the full copyright notices and license terms.-->
+<tree>
+    <field name="code"/>
+    <field name="company"/>
+    <field name="propietary"/>
+    <field name="propietary_address"/>
+</tree>
diff --git a/view/sale_form.xml b/view/sale_form.xml
new file mode 100644
index 0000000..a230ef6
--- /dev/null
+++ b/view/sale_form.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+     this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//field[@name='reference']" position="after">
+	<newline/>
+    	<label name="sale_type"/>
+	<field name="sale_type"/>
+	<label name="agended"/>
+	<field name="agended"/>
+    </xpath>
+</data>