Bladeren bron

[FIX] Agregado vistas del clientes y correccion de detalles en el ticket

Rodney Elpidio Enciso Arias 7 jaren geleden
bovenliggende
commit
01e531c0b8
8 gewijzigde bestanden met toevoegingen van 92 en 81 verwijderingen
  1. 1 0
      __openerp__.py
  2. 5 5
      data/report_paperformat.xml
  3. 1 0
      models/__init__.py
  4. BIN
      models/__init__.pyc
  5. 29 0
      models/res_partner.py
  6. BIN
      models/res_partner.pyc
  7. 17 76
      reports/ticket.xml
  8. 39 0
      views/res_partner.xml

+ 1 - 0
__openerp__.py

@@ -19,6 +19,7 @@
         'reports/ticket.xml',
         'data/sequence.xml',
         'views/eiru_study_feature.xml',
+        'views/res_partner.xml',
     ],
     'test': [
     ],

+ 5 - 5
data/report_paperformat.xml

@@ -6,15 +6,15 @@
             <field name="default" eval="True"/>
             <field name="format">custom</field>
             <field name="page_height">150</field>
-            <field name="page_width">76</field>
+            <field name="page_width">60</field>
             <field name="orientation">Portrait</field>
             <field name="margin_top">1</field>
-            <field name="margin_bottom">1</field>
-            <field name="margin_left">1</field>
-            <field name="margin_right">1</field>
+            <field name="margin_bottom">3</field>
+            <field name="margin_left">3</field>
+            <field name="margin_right">3</field>
             <field name="header_line" eval="False" />
             <field name="header_spacing">0</field>
-            <field name="dpi">300</field>
+            <field name="dpi">130</field>
         </record>
     </data>
 </openerp>

+ 1 - 0
models/__init__.py

@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
 from . import eiru_study_feature
+from . import res_partner

BIN
models/__init__.pyc


+ 29 - 0
models/res_partner.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+from openerp import models, fields, api
+
+class ResPartnerMedicalFeature(models.Model):
+    _inherit = 'res.partner'
+
+    is_medic = fields.Boolean()
+    medic = fields.Many2one(
+        'res.partner',
+        string='Doctor',
+        ondelete='restrict',
+        domain=[('is_medic','=',True)]
+    )
+
+    study_feature_ids = fields.One2many(
+        'study.feature',
+        'partner_id',
+        string='Medical Feature',
+    )
+    study_feature_count = fields.Integer(
+        string='Numero de Estudios',
+        compute='_get_study_features_count',
+    )
+
+    @api.one
+    @api.depends('study_feature_ids')
+    def _get_study_features_count(self):
+        self.study_feature_count = len(self.study_feature_ids)

BIN
models/res_partner.pyc


+ 17 - 76
reports/ticket.xml

@@ -44,7 +44,7 @@
                     }
                     .text-md {
                         display: inline-block;
-                        font-size: 18px;
+                        font-size: 14px;
                         font-weight: bold;
                     }
                     .bordered {
@@ -86,94 +86,35 @@
                 <section class="header">
                     <div class="row">
                         <div class="col-xs-12">
-                            <p class="text-center" style="margin-top: 10px; margin-bottom: 10px;"><span class="text-lg">COMPROBANTE SAT <span t-if="o.name" t-field="o.name"/></span></p>
-                           <!--  <div class="image-container">
-                                <div class="image-cropper">
-                                    <img class="top" t-att-src="'data:image/png;base64,%s' % printBarcode(o.id, 732, 472)"/>
-                                </div>
-                            </div> -->
+                            <p class="text-center" style="margin-top: 10px; margin-bottom: 10px;"><span class="text-lg">NUMERO DE ESTUDIO <span t-if="o.name" t-field="o.name"/></span></p>
                         </div>
                     </div>
                 </section>
                 <div class="row"><div class="col-xs-12"><div class="separator"/></div></div>
                 <div class="row">
                     <div class="col-xs-12">
-                        MATERIAL A RECOGER<br/>
-                        <!-- <t t-if="o.line_ids">
-                            <table class="order_lines" style="width: 100%;">
-                                <thead>
-                                    <tr>
-                                        <th style="width: 75%;">Concepto</th>
-                                        <th style="width: 25%;" class="text-right">Uds.</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <t t-foreach="o.line_ids" t-as="line">
-                                        <tr>
-                                            <td><span t-if="line.description" t-field="line.description"></span></td>
-                                            <td class="text-right"><span t-if="line.quantity" t-field="line.quantity"></span></td>
-                                        </tr>
-                                    </t>
-                                </tbody>
-                            </table>
-                        </t>
+                        <p class="text-center" style="margin-top: 10px; margin-bottom: 10px;"><span class="text-md">Información del paciente</span></p>
+                        <br/>
+                        Cliente: <span t-if="o.partner_id.name" t-field="o.partner_id.name"/>
+                        <br/>
+                        Teléfono: <span t-if="o.partner_id.phone" t-field="o.partner_id.phone"/><t t-if="o.partner_id.mobile"> - <span t-field="o.partner_id.mobile"/></t>
                         <br/>
-                        Cliente: <span t-if="o.partner_id.name" t-field="o.partner_id.name"/><br/>
-                        Teléfono: <span t-if="o.partner_id.phone" t-field="o.partner_id.phone"/><t t-if="o.partner_id.mobile"> - <span t-field="o.partner_id.mobile"/></t><br/>
-                        Fecha Entrada: <span t-if="o.order_date" t-field="o.order_date"/><br/>
-                        Fecha Recogida: <span t-if="o.planned_end_date" t-field="o.planned_end_date"/> -->
+                        Estudio Realizado: <span t-if="o.product_id" t-field="o.product_id"/>
+                        <br/>
+                        Fecha: <span t-if="o.order_date" t-field="o.order_date"/>
+                        <br/>
+                        Doctor: <span t-if="o.partner_id.medic.name" t-field="o.partner_id.medic.name"/>
                     </div>
                 </div>
-                <!-- <t t-if="o.consumed_ids">
-                    <div class="row"><div class="col-xs-12"><div class="separator"/></div></div>
-                    <table class="consumed_lines" style="width: 100%;">
-                        <thead>
-                            <tr>
-                                <th style="width: 45%;">Concepto</th>
-                                <th style="width: 15%;" class="text-right">Uds.</th>
-                                <th style="width: 20%;" class="text-right">Precio</th>
-                                <th style="width: 20%;" class="text-right">Subtotal</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <t t-foreach="o.consumed_ids" t-as="consumed">
-                                <tr>
-                                    <td><span t-if="consumed.description" t-field="consumed.description"/></td>
-                                    <td class="text-right"><span t-if="consumed.quantity" t-field="consumed.quantity"/></td>
-                                    <td class="text-right"><span t-if="consumed.price_unit" t-field="consumed.price_unit"/></td>
-                                    <td class="text-right"><span t-if="consumed.subtotal and consumed.price_unit" t-raw="consumed.quantity * consumed.price_unit"/></td>
-                                </tr>
-                            </t>
-                        </tbody>
-                    </table>
-                    <t t-set="total" t-value="get_total(o)"/>
-                    <p class="text-right" style="margin-top: 10px; margin-bottom: 0px;">Total <span class="text-md" t-esc="total"></span> EUR</p>
-
-                </t> -->
-                <section class="warning">
-                    <div class="row"><div class="col-xs-12"><div class="separator"/></div></div>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <p style="text-align: justify; margin-bottom: 0px;">
-                                <small class="warning-text">Presupuesto estimado, si durante la reparación el importe se modificara sustancialmente se consultará al cliente para su aprobación.</small>
-                            </p>
-                        </div>
-                    </div>
-                </section>
                 <t t-if="o.partner_id.company_id">
                     <div class="row"><div class="col-xs-12"><div class="separator"/></div></div>
                     <div class="row">
                         <div class="col-xs-12">
-                            <p class="company-info text-center">
-                                <t t-if="o.partner_id.company_id.name"><span t-field="o.partner_id.company_id.name"/></t>
-                                <t t-if="o.partner_id.company_id.street">- <span t-field="o.partner_id.company_id.street"/>,</t>
-                                <t t-if="o.partner_id.company_id.zip"> <span t-field="o.partner_id.company_id.zip"/></t>
-                                <t t-if="o.partner_id.company_id.city">- <span t-field="o.partner_id.company_id.city"/></t>
-                                <t t-if="o.partner_id.company_id.state_id">(<span t-field="o.partner_id.company_id.state_id.name"/>)</t>
-                                <t t-if="o.partner_id.company_id.phone">- <span t-field="o.partner_id.company_id.phone"/></t>
-                                <t t-if="o.partner_id.company_id.email">- <span t-field="o.partner_id.company_id.email"/></t>
-                                <t t-if="o.partner_id.company_id.website">- <span t-field="o.partner_id.company_id.website"/></t>
-                            </p>
+                            <p class="text-center" style="margin-top: 10px; margin-bottom: 10px;"><span class="text-md"><span t-if="o.partner_id.company_id.name" t-field="o.partner_id.company_id.name"/></span></p>
+                            <br/>
+                            Teléfono: <span t-if="o.partner_id.company_id.phone" t-field="o.partner_id.company_id.phone"/>
+                            <br/>
+                            Direccion: <span t-if="o.partner_id.company_id.street" t-field="o.partner_id.company_id.street"/><t t-if="o.partner_id.company_id.city">, <span t-field="o.partner_id.company_id.city"/></t><t t-if="o.partner_id.company_id.country_id.name">, <span t-field="o.partner_id.company_id.country_id.name"/></t>                       
                         </div>
                     </div>
                 </t>

+ 39 - 0
views/res_partner.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <act_window
+            id="action_open_study_feature"
+            name="Estudios"
+            res_model="study.feature"
+            view_type="form"
+            view_mode="tree,form"
+            domain="[('partner_id', '=', active_id)]"/>
+
+        <record id="res_partner_study_feature_form" model="ir.ui.view">
+            <field name="name">res.partner.study.feature.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="category_id" position="after">
+                    <field name="is_medic" class="oe_inline" attrs="{'invisible': [('is_company','=', True)]}"/><label for="is_medic" string="¿Es un Medico?" attrs="{'invisible': [('is_company','=', True)]}"/>
+                </field>
+                <field name="title" position="after">
+                     <field name="medic" attrs="{'invisible': [('is_medic','=', True)],'required': [('is_medic','=', False)]}"/>
+                </field>
+                <div name="buttons" position="after">
+                    <div class="oe_right oe_button_box">
+                        <button
+                            class="oe_inline oe_stat_button"
+                            type="action"
+                            name="%(action_open_study_feature)d"
+                            icon="fas fa-stethoscope"
+                            attrs="{'invisible': [('customer', '=', False)]}"
+                            context="{'default_partner_id': id}">
+                            <field name="study_feature_count" string="Estudios" widget="statinfo" />
+                        </button>
+                    </div>
+                </div>
+            </field>
+        </record>
+    </data>
+</openerp>