Merge lp:~vauxoo/addons-vauxoo/rico_contract_fix_email_and_more_dev_ernesto into lp:~vauxoo/addons-vauxoo/rico_contract_dev_rodo

[Luis Ernesto García Medina - http://www.vauxoo.com]

Se corrigio el correo y se cambiaron los datos de la tabla para que mostrara el lote en el numero de serie

=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.py'
--- account_analytic_analysis_rent/report/account_analytic_analysis_report.py	2013-08-15 21:45:21 +0000
+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.py	2013-08-27 22:26:03 +0000
@@ -30,6 +30,8 @@
         self.localcontext.update({
             'accesory': self._accesory,
             'type_payment' : self._type_payment,
+            'get_data_features' : self._get_data_features,
+            'get_type_features' : self._get_type_features,
         })
     def _accesory(self,product_id):
         if product_id.type == 'accesory':
@@ -39,7 +41,19 @@
         if feature_id.name and feature_id.name.name == 'Copias Bco y Negro' or feature_id.name.name == 'Copias Color' :
             return 'Por copia procesada'
         return 'Mensual'
-
+    def _get_data_features(self, product_id, obj_features):
+        list_data = []
+        if product_id == obj_features.product_line_id.id:
+            list_data.append(obj_features.product_line_id.name)
+            list_data.append(obj_features.counter)
+            list_data.append(obj_features.name.name)
+            list_data.append(obj_features.cost)
+            return list_data
+        return ['','','','']
+    def _get_type_features(self, product_id, obj_features):
+        if product_id == obj_features.product_line_id.id:
+            return self._type_payment(obj_features)
+        return []
 
 report_sxw.report_sxw('report.account.analytic.account.report','account.analytic.account','addons/account_analytic_analysis_rent/report/account_analytic_analysis_report.rml',
     parser=account_analytic_account_report, header=False)

=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.rml'
--- account_analytic_analysis_rent/report/account_analytic_analysis_report.rml	2013-08-16 16:34:03 +0000
+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.rml	2013-08-27 22:26:03 +0000
@@ -36,7 +36,7 @@
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
+      <blockValign value="MIDDLE"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
@@ -99,7 +99,7 @@
       <para style="Standard">[[repeatIn(objects,'o')]]</para>
       <para style="P1">No. Contrato:[[o.name]]</para>
       <para style="P2">CONTRATO DE ARRENDAMIENTO</para>
-      <para style="P6">Contrato de arrendamiento a ser celebrado entre <font face="Helvetica-Bold">Rico Copiadoras Fax, SA de CV</font>, a ser identificado en este contrato como “el proveedor” y <font face="Helvetica-Bold">CTE</font>, a ser identificado en este contrato como “el cliente”.</para>
+      <para style="P6">Contrato de arrendamiento a ser celebrado entre <font face="Helvetica-Bold">Rico Copiadoras Fax, SA de CV</font>, a ser identificado en este contrato como “el proveedor” y <font face="Helvetica-Bold">[[o.partner_id.name]]</font>, a ser identificado en este contrato como “el cliente”.</para>
       <para style="P6">El precio de este contrato quedará estipulado por los siguientes productos y costos, por un período obligatorio de [[o.term_id.name]], a ser facturados mensualmente previa lectura del contador de impresiones.</para>
       <section>
         <blockTable colWidths="138.0,55.0,55.0,85.0,48.0,58.0" style="Table1">
@@ -126,30 +126,49 @@
         </blockTable>
       </section>
       <section>
-        <para style="P3">[[repeatIn(o.feature_ids, 'features')]]</para>
-      
-      <blockTable colWidths="138.0,55.0,55.0,85.0,48.0,58.0" style="Table2">
-        <tr>
-          <td>
-            <para style="P14">[[features.product_line_id and features.product_line_id.name]]</para>
-          </td>
-          <td>
-            <para style="P15">[[features.product_line_id and features.product_line_id.default_code]]</para>
-          </td>
-          <td>
-            <para style="P15" alignment="RIGHT">[[features.counter or '0']]</para>
-          </td>
-          <td>
-            <para style="P13">[[features.name and features.name.name]]</para>
-          </td>
-          <td>
-            <para style="P16" alignment="RIGHT">[[features.cost or '0.0']]</para>
-          </td>
-          <td>
-              <para style="P14">[[type_payment(features)]]</para>
-          </td>
-        </tr>
-      </blockTable>
+        <para style="P3">[[repeatIn(o.product_ids, 'product')]]</para>
+            <blockTable colWidths="138.0,55.0,55.0,85.0,48.0,58.0" style="Table2">
+            <tr>
+              <td>
+                <para style="P14">[[product.product_id and product.product_id.name]]</para>
+              </td>
+              <td>
+                  <para style="P14">[[product.product_id and product.prodlot_id.name]]</para>
+              </td>
+              <td>
+              </td>
+              <td>
+              </td>
+              <td>
+              </td>
+              <td>
+              </td>
+            </tr>
+          </blockTable>
+          <section>
+            <para style="P3">[[repeatIn(o.feature_ids, 'features')]]</para>
+              <blockTable colWidths="138.0,55.0,55.0,85.0,48.0,58.0" style="Table2">
+                <tr>
+                  <td>
+                    <para style="P14">[[get_data_features(product.product_id.id, features)[0] or removeParentNode('blockTable')]]</para>
+                  </td>
+                  <td>
+                  </td>
+                  <td>
+                      <para style="P14">[[get_data_features(product.product_id.id, features)[1] or '0.0']]</para>
+                  </td>
+                  <td>
+                      <para style="P14">[[get_data_features(product.product_id.id, features)[2] or '']]</para>
+                  </td>
+                  <td>
+                      <para style="P14">[[get_data_features(product.product_id.id, features)[3] or '0.0']]</para>
+                  </td>
+                  <td>
+                      <para style="P14">[[get_type_features(product.product_id.id, features)]]</para>
+                  </td>
+                </tr>
+              </blockTable>
+          </section>
       </section>
       <para style="P12">Accesorios:</para>
       <section>
@@ -367,7 +386,7 @@
           </td>
           <td>
             <para style="P7">
-              <font face="Helvetica" color="blue" size="8.0">[e-mail]</font>
+              <font face="Helvetica" color="blue" size="8.0">[e-mail]</font>
               <font face="Helvetica" size="8.0"> y </font>
               <font face="Helvetica" color="blue" size="8.0">[e-mail]</font>
               <font face="Helvetica" size="8.0"/>