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

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

Rodo ya agregue la columna en los features y tambien modifique el on_change para que cargue el lote, hice varias impresiones y parece correcto cualquier cosas me avisas por favor

[Rodolfo Lopez (el-rodo-1)]

Mejor agregar un campo en la compañia para logo de contratos.
Para no usar el mismo de la company, puede ser el mismo, pero puede ser que no.

review: Needs Fixing

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

Rodo ya quedo checalo por favor en cuanto puedas

=== modified file 'account_analytic_analysis_rent/account_analytic_account_rent.py'
--- account_analytic_analysis_rent/account_analytic_account_rent.py	2013-08-14 23:49:47 +0000
+++ account_analytic_analysis_rent/account_analytic_account_rent.py	2013-09-02 21:26:30 +0000
@@ -123,7 +123,7 @@
             for prod in product_ids:
                 if prod[2]['product_id']:
                     for feature in product_obj.browse(cr, uid, prod[2]['product_id'], context=context).feature_ids:
-                        list_feature.append({'name':feature.name.id, 'product_line_id':prod[2]['product_id'],'counter':feature.counter})
+                        list_feature.append({'name':feature.name.id, 'product_line_id':prod[2]['product_id'],'counter':feature.counter, 'prodlot_feature_id' : prod[2]['prodlot_id']})
         return {'value':{'feature_ids': [(0, 6, data) for data in list_feature]}}
 
     def _get_journal(self, cr, uid, context=None):

=== modified file 'account_analytic_analysis_rent/account_analytic_account_rent.xml'
--- account_analytic_analysis_rent/account_analytic_account_rent.xml	2013-08-02 22:27:05 +0000
+++ account_analytic_analysis_rent/account_analytic_account_rent.xml	2013-09-02 21:26:30 +0000
@@ -35,6 +35,7 @@
                                 <field name="name"/>
                                 <field name="counter"/>
                                 <field name="cost"/>
+                                <field name="prodlot_feature_id" invisible = '1'/>
                             </tree>
                             <form string='Features'>
                                 <field name="product_line_id"/>

=== modified file 'account_analytic_analysis_rent/product.py'
--- account_analytic_analysis_rent/product.py	2013-08-02 22:27:05 +0000
+++ account_analytic_analysis_rent/product.py	2013-09-02 21:26:30 +0000
@@ -66,6 +66,7 @@
         'counter':fields.integer('Counter'),
         'analytic_id':fields.many2one('account.analytic.account','Product'),
         'cost':fields.float('cost'),
+        'prodlot_feature_id': fields.many2one('stock.production.lot', 'Production Lot', help="Production lot is used to put a serial number on the production", select=True),
     }
     
 product_feature_line()

=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.py'
--- account_analytic_analysis_rent/report/account_analytic_analysis_report.py	2013-08-27 22:23:35 +0000
+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.py	2013-09-02 21:26:30 +0000
@@ -18,42 +18,36 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+import locale
 import time
 from report import report_sxw
 from osv import osv
 import pooler
 from tools.translate import _
+
 class account_analytic_account_report(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(account_analytic_account_report, self).__init__(cr, uid, name, context=context)
         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,
+            'locale_date' : self._locale_date,
         })
+
     def _accesory(self,product_id):
         if product_id.type == 'accesory':
             return product_id.product_id.name
         return []
+
     def _type_payment(self,feature_id):
         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 []
+
+    def _locale_date(self):
+        locale.setlocale( locale.LC_TIME, 'es_MX.UTF-8' )
+        return time.strftime('%B %Y')
 
 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-27 22:23:35 +0000
+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.rml	2013-09-02 21:26:30 +0000
@@ -66,13 +66,13 @@
     <paraStyle name="P3" fontName="Helvetica" fontSize="11.0" leading="14" alignment="JUSTIFY"/>
     <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="10.0" leading="14" alignment="JUSTIFY"/>
     <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="14" alignment="CENTER"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="7.0" leading="10" alignment="JUSTIFY"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="5.5" leading="10" alignment="JUSTIFY"/>
     <paraStyle name="P7" fontName="Helvetica" alignment="JUSTIFY"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="11" alignment="JUSTIFY"/>
     <paraStyle name="P9" fontName="Helvetica" alignment="CENTER"/>
     <paraStyle name="P10" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER"/>
     <paraStyle name="P11" rightIndent="149.0" leftIndent="0.0" fontName="Helvetica"/>
-    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="6.0" leading="11" alignment="LEFT"/>
     <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="11" alignment="JUSTIFY"/>
     <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="11" alignment="JUSTIFY"/>
     <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="11" alignment="JUSTIFY"/>
@@ -81,6 +81,7 @@
     <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="10" alignment="JUSTIFY"/>
     <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="10" alignment="JUSTIFY"/>
     <paraStyle name="P20" fontName="Helvetica" fontSize="11.0" leading="14" alignment="JUSTIFY"/>
+    <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="10" alignment="RIGHT"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -108,7 +109,7 @@
               <para style="P12">Producto</para>
             </td>
             <td>
-              <para style="P12">No. Serie</para>
+              <para style="P12">No. Lote</para>
             </td>
             <td>
               <para style="P12">Contador Inicial</para>
@@ -126,54 +127,33 @@
         </blockTable>
       </section>
       <section>
-        <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>
+          <para style="P1">[[repeatIn(o.feature_ids, 'feature_line')]]</para>
+          <blockTable colWidths="136.0,55.0,55.0,85.0,48.0,58.0" style="Table2">
+          <tr>
+            <td>
+              <para style="P6">[[feature_line.product_line_id.name or '']]</para>
+            </td>
+            <td>
+              <para style="P6">[[feature_line.prodlot_feature_id.name]]</para>
+            </td>
+            <td>
+              <para style="P21">[[feature_line.counter or '0.0']]</para>
+            </td>
+            <td>
+              <para style="P6">[[feature_line.name.name]]</para>
+            </td>
+            <td>
+              <para style="P21">[[feature_line.cost or '0.0']]</para>
+            </td>
+            <td>
+              <para style="P6">[[type_payment(feature_line)]]</para>
+            </td>
+          </tr>
+        </blockTable>
       </section>
       <para style="P12">Accesorios:</para>
       <section>
         <para style="P3">[[repeatIn(o.product_ids, 'product')]]</para>
-        
         <para style="P8">[[accesory(product)]]</para>
       </section>
       <para style="P6">Además del equipo mencionado con anterioridad se incluirán dentro del mismo contrato los siguientes conceptos: Tóner, consumibles y servicio técnico, en caso de equipo con conectividad se incluirá la asistencia correspondiente a dar de alta el equipo en su red. No se incluye el papel, cartulinas y cualquier otro medio utilizado para obtener una imagen impresa, así mismo no incluye el mantenimiento del equipo en su red. Se excluyen también de este contrato la reparación de los daños provocados al equipo por mal uso, piezas rotas por desconocimiento de su operación, intervención de terceras personas en el mismo o deficiencias en el suministro de energía eléctrica.</para>
@@ -405,7 +385,7 @@
         </tr>
       </blockTable>
       <section>
-        <para style="P6">Este contrato tendrá una validez de meses y en caso de cancelación anticipada el cliente se compromete a cubrir las mensualidades restantes correspondientes al costo de arrendamiento al fin de éste contrato. En caso de no ser devuelto este contrato debidamente firmado, el uso del equipo implica la aceptación del mismo y los términos establecidos.</para>
+        <para style="P6">Este contrato tendrá una validez de [[o.term_id.name]] y en caso de cancelación anticipada el cliente se compromete a cubrir las mensualidades restantes correspondientes al costo de arrendamiento al fin de éste contrato. En caso de no ser devuelto este contrato debidamente firmado, el uso del equipo implica la aceptación del mismo y los términos establecidos.</para>
       </section>
       <section>
         <para style="P9">
@@ -421,7 +401,7 @@
             </td>
           </tr>
         </blockTable>
-        <para style="P10">Tijuana, B.C., a [[time.strftime('%d')]] de [[time.strftime('%B %Y')]]</para>
+        <para style="P10">Tijuana, B.C., a [[time.strftime('%d')]] de [[locale_date()]]</para>
         <para style="P9">
           <font color="white"> </font>
         </para>