clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report into lp:openerp-ccorp-addons/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report/+merge/161023

[FIX] Fix style in the sale_order.mako
[FIX] Change Ref to sale order.
[FIX] Fix translations
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report/+merge/161023
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons/6.1.

=== modified file 'sale_order_ccorp_report/i18n/es_CR.po'
--- sale_order_ccorp_report/i18n/es_CR.po	2013-04-25 20:34:35 +0000
+++ sale_order_ccorp_report/i18n/es_CR.po	2013-04-25 21:24:26 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-24 22:04+0000\n"
-"PO-Revision-Date: 2013-04-24 22:04+0000\n"
+"POT-Creation-Date: 2013-04-25 21:17+0000\n"
+"PO-Revision-Date: 2013-04-25 21:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,33 +16,33 @@
 "Plural-Forms: \n"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:118
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:133
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:137
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:117
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:124
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:132
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:136
 msgid "Sub Total"
 msgstr "Subtotal"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:59
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:58
 msgid "Invoice address"
 msgstr "Dirección factura"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:33
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:32
 msgid "Date:"
 msgstr "Fecha:"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:110
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:109
 msgid "Note"
 msgstr "Nota"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:77
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:81
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:83
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
 msgid "Unit Price"
 msgstr "Precio unitario"
 
@@ -52,123 +52,123 @@
 msgstr "N° Orden"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:81
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:55
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:54
 msgid "Email"
 msgstr "Correo electrónico"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:41
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:40
 msgid "Expiration date"
 msgstr "Fecha vencimiento"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:51
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:50
 msgid "Fax"
 msgstr "Fax"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:119
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:126
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:118
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
 msgid "Discount"
 msgstr "Descuento"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:47
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:148
+msgid "Method of payment"
+msgstr "Forma de pago"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:46
 msgid "Phone"
 msgstr "Tel."
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:42
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:41
 msgid "Job"
 msgstr "Puesto"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:120
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:127
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:119
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:126
 msgid "Sub Total with discount"
 msgstr "Sub Total con descuento"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:28
-msgid "Ref."
-msgstr "Ref."
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:155
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:154
 msgid "Realized by"
 msgstr "Realizado por"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:77
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:81
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:83
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
 msgid "[Code] Description / (Taxes)"
 msgstr "[Cod] Descripción / (Imp.)"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:155
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:154
 msgid "Authorized by"
 msgstr "Autorizado por"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:77
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:81
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:83
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
 msgid "Total Price"
 msgstr "Precio Total"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:59
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:58
 msgid "Shipping address"
 msgstr "Dirección envío"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:121
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:128
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:134
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:138
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:28
+msgid "Sale Order"
+msgstr "Orden de compra"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:120
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:127
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:133
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:137
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:149
-msgid "Method of payment"
-msgstr "Forma de pago"
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:77
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
 msgid "Delay"
 msgstr "Tiempo de entrega."
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:38
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:29
 msgid "Contact name"
 msgstr "Nombre del contacto"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:146
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:145
 msgid "Order Notes"
 msgstr "Nota Orden"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:98
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:97
 msgid "days"
 msgstr "día(s)"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:77
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:81
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:83
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
 msgid "Qty"
 msgstr "Cant."
 
@@ -178,15 +178,15 @@
 msgstr "N° Cotización"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:122
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:129
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:135
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:139
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:121
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:128
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:134
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:138
 msgid "Total"
 msgstr "Total"
 
 #. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:30
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:37
 msgid "Client code"
 msgstr "Código cliente"
 

=== modified file 'sale_order_ccorp_report/report/sale_order.mako'
--- sale_order_ccorp_report/report/sale_order.mako	2013-04-25 20:34:35 +0000
+++ sale_order_ccorp_report/report/sale_order.mako	2013-04-25 21:24:26 +0000
@@ -24,10 +24,9 @@
                 </td>
             </tr>
             <tr>
-                %if so.client_order_ref:
-                    <td>${_("Ref.")}: ${so.client_order_ref != "" and so.client_order_ref or ''|entity}</td>
-                %endif
-                 <td>${_("Contact name")}: ${so.partner_order_id.name or '-'|entity}</td>
+                
+                <td>${_("Sale Order")} : ${so.client_order_ref != "" and so.client_order_ref or '-'|entity}</td>
+                <td>${_("Contact name")}: ${so.partner_order_id.name or '-'|entity}</td>
             </tr>
             <tr>
                 <td>${_("Date:")}