clearcorp team mailing list archive
-
clearcorp team
-
Mailing list archive
-
Message #00735
[Merge] lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sale_order_report into lp:openerp-ccorp-addons/6.1
Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sale_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-sale_order_report/+merge/160761
[FIX] Fix some changes in the format of the sale order report.
--
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sale_order_report/+merge/160761
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 2012-12-03 17:43:11 +0000
+++ sale_order_ccorp_report/i18n/es_CR.po 2013-04-24 20:56:26 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 17:36+0000\n"
-"PO-Revision-Date: 2012-12-03 17:36+0000\n"
+"POT-Creation-Date: 2013-04-24 20:39+0000\n"
+"PO-Revision-Date: 2013-04-24 20:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,162 +16,172 @@
"Plural-Forms: \n"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:107
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:114
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:122
-#: 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
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:133
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:137
msgid "Sub Total"
msgstr "Subtotal"
#. 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:59
msgid "Invoice address"
msgstr "Dirección factura"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:26
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:33
msgid "Date:"
msgstr "Fecha:"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
-msgid "Delay"
-msgstr "Ent."
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:110
+msgid "Note"
+msgstr "Nota"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
#: 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
msgid "Unit Price"
msgstr "Precio unitario"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:18
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:19
msgid "Order N°"
msgstr "N° Orden"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:75
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:81
msgid "Disc.(%)"
msgstr "Desc.(%)"
#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:55
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: sale_order_ccorp_report
#: report:addons/sale_order_ccorp_report/report/sale_order.mako:41
-msgid "Email"
-msgstr "Email"
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:109
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:116
-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:108
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:115
+msgid "Expiration date"
+msgstr "Fecha vencimiento"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:51
+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
msgid "Discount"
msgstr "Descuento"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:44
-msgid "Confirmation date"
-msgstr "Fecha confirmación"
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:35
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:47
msgid "Phone"
msgstr "Tel."
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:45
-msgid "Expiration date"
-msgstr "Fecha vencimiento"
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:39
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:42
+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
+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:144
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:155
msgid "Realized by"
msgstr "Realizado por"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
#: 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
msgid "[Code] Description / (Taxes)"
msgstr "[Cod] Descripción / (Imp.)"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:144
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:155
msgid "Authorized by"
msgstr "Autorizado por"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
#: 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
msgid "Total Price"
msgstr "Precio Total"
#. 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:59
msgid "Shipping address"
msgstr "Dirección envío"
#. 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:117
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:123
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:127
+#: 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 "Taxes"
msgstr "Impuestos"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:138
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:149
msgid "Payment Note"
-msgstr "Nota del pago"
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:93
-msgid "Note"
-msgstr "Nota"
-
-#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:135
+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
+msgid "Delay"
+msgstr "Tiempo de entrega."
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:38
+msgid "Contact name"
+msgstr "Contact name"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:146
msgid "Order Notes"
msgstr "Nota Orden"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:67
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:69
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:73
#: 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
msgid "Qty"
msgstr "Cant."
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:31
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:30
msgid "ID Num"
-msgstr "Cód. Cliente."
+msgstr "Cédula Jurídica"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:15
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:16
msgid "Quotation N°"
msgstr "N° Cotización"
#. module: sale_order_ccorp_report
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:111
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:118
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:124
-#: report:addons/sale_order_ccorp_report/report/sale_order.mako:128
+#: 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
msgid "Total"
msgstr "Total"
=== modified file 'sale_order_ccorp_report/report/sale_order.mako'
--- sale_order_ccorp_report/report/sale_order.mako 2012-12-03 17:43:11 +0000
+++ sale_order_ccorp_report/report/sale_order.mako 2013-04-24 20:56:26 +0000
@@ -11,55 +11,62 @@
<div id="wrapper">
<table width = "100%" class = "document_data">
<tr class = "title">
- <td class = "document_data">
- %if so.state =='draft' :
- <span class="title">${_("Quotation N°")} ${so.name or ''|entity}</span><br/>
- %endif
- %if so.state != 'draft' :
- <span class="title">${_("Order N°")} ${so.name or ''|entity}</span><br/>
- %endif
- </td>
- <td>
- ${so.partner_id.name}
- </td>
- </tr>
- <tr>
- <td>${_("Date:")}
- %if so.date_order:
- ${formatLang(so.date_order, date=True)|entity}
- %endif
- </td>
- <td>${_("ID Num")}: ${so.partner_id.ref or '-'|entity}</td>
- </tr>
- <tr>
- <td>${so.user_id.name or ''|entity}</td>
- <td>${_("Phone")}:${so.partner_id.phone or '-'|entity}</td>
- </tr>
- <tr>
- %if so.client_order_ref:
- <td>${_("Ref.")}: ${so.client_order_ref != "" and so.client_order_ref or ''|entity}</td>
- %endif
- <td>${_("Email")}: ${so.partner_id.email or '-'|entity}</td>
- </tr>
- <tr>
- <td>${_("Confirmation date")}: ${(so.date_confirm and formatLang(so.date_confirm,date=True)) or '-'|entity}</td>
- <td>${_("Expiration date")}: ${(so.expiration_date and formatLang(so.expiration_date,date=True)) or '-'|entity}</td>
- <td> </td><td> </td>
- </tr>
- <tr class = "zone_break"><td> </td><td> </td></tr>
- <!-- Shipping partner address -->
- <!-- Invoice partner address -->
- <tr class = "title"><td>${_("Invoice address")}</td><td>${_("Shipping address")}</td></tr>
- <tr><td>${so.partner_invoice_id.street or ''}</td><td>${so.partner_shipping_id.street or ''}</td></tr>
- <tr><td>${so.partner_invoice_id.street2 or ''}</td><td>${so.partner_shipping_id.street2 or ''}</td></tr>
- <tr>
- <td>${(so.partner_invoice_id.zip and format(so.partner_invoice_id.zip) + ((so.partner_invoice_id.city or so.partner_invoice_id.state_id or so.partner_invoice_id.country_id) and ' ' or '') or '') + (so.partner_invoice_id.city and format(so.partner_invoice_id.city) or '')}</td>
- <td>${(so.partner_shipping_id.zip and format(so.partner_shipping_id.zip) + ((so.partner_shipping_id.city or so.partner_shipping_id.state_id or so.partner_shipping_id.country_id) and ' ' or '') or '') + (so.partner_shipping_id.city and format(so.partner_shipping_id.city) or '')}</td>
- </tr>
- <tr>
- <td>${(so.partner_invoice_id.state_id and format(so.partner_invoice_id.state_id.name) + (so.partner_invoice_id.country_id and ', ' or '') or '') + (so.partner_invoice_id.country_id and format(so.partner_invoice_id.country_id.name) or '')}</td>
- <td>${(so.partner_shipping_id.state_id and format(so.partner_shipping_id.state_id.name) + (so.partner_shipping_id.country_id and ', ' or '') or '') + (so.partner_shipping_id.country_id and format(so.partner_shipping_id.country_id.name) or '')}</td>
- </tr>
+ <td class = "document_data">
+ %if so.state =='draft' :
+ <span class="title">${_("Quotation N°")} ${so.name or ''|entity}</span><br/>
+ %endif
+ %if so.state != 'draft' :
+ <span class="title">${_("Order N°")} ${so.name or ''|entity}</span><br/>
+ %endif
+ </td>
+ <td>
+ ${so.partner_id.name}
+ </td>
+ </tr>
+ <tr>
+ %if so.client_order_ref:
+ <td>${_("Ref.")}: ${so.client_order_ref != "" and so.client_order_ref or ''|entity}</td>
+ %endif
+ <td>${_("ID Num")}: ${so.partner_id.ref or '-'|entity}</td>
+ </tr>
+ <tr>
+ <td>${_("Date:")}
+ %if so.date_order:
+ ${formatLang(so.date_order, date=True)|entity}
+ %endif
+ </td>
+ <td>${_("Contact name")}: ${so.partner_order_id.name or '-'|entity}</td>
+ </tr>
+ <tr>
+ <td>${_("Expiration date")}: ${(so.expiration_date and formatLang(so.expiration_date,date=True)) or '-'|entity}</td>
+ <td>${_("Job")}: ${so.partner_order_id.function or '-'|entity}</td>
+
+ </tr>
+ <tr>
+ <td></td>
+ <td>${_("Phone")}:${so.partner_order_id.phone or '-'|entity}</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>${_("Fax")}:${so.partner_order_id.fax or '-'|entity}</td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>${_("Email")}: ${so.partner_order_id.email or '-'|entity}</td>
+ <td> </td><td> </td>
+ </tr>
+ <tr class = "zone_break"><td> </td><td> </td></tr>
+ <tr class = "title"><td>${_("Invoice address")}</td><td>${_("Shipping address")}</td></tr>
+ <tr><td>${so.partner_invoice_id.street or ''}</td><td>${so.partner_shipping_id.street or ''}</td></tr>
+ <tr><td>${so.partner_invoice_id.street2 or ''}</td><td>${so.partner_shipping_id.street2 or ''}</td></tr>
+ <tr>
+ <td>${(so.partner_invoice_id.zip and format(so.partner_invoice_id.zip) + ((so.partner_invoice_id.city or so.partner_invoice_id.state_id or so.partner_invoice_id.country_id) and ' ' or '') or '') + (so.partner_invoice_id.city and format(so.partner_invoice_id.city) or '')}</td>
+ <td>${(so.partner_shipping_id.zip and format(so.partner_shipping_id.zip) + ((so.partner_shipping_id.city or so.partner_shipping_id.state_id or so.partner_shipping_id.country_id) and ' ' or '') or '') + (so.partner_shipping_id.city and format(so.partner_shipping_id.city) or '')}</td>
+ </tr>
+ <tr>
+ <td>${(so.partner_invoice_id.state_id and format(so.partner_invoice_id.state_id.name) + (so.partner_invoice_id.country_id and ', ' or '') or '') + (so.partner_invoice_id.country_id and format(so.partner_invoice_id.country_id.name) or '')}</td>
+ <td>${(so.partner_shipping_id.state_id and format(so.partner_shipping_id.state_id.name) + (so.partner_shipping_id.country_id and ', ' or '') or '') + (so.partner_shipping_id.country_id and format(so.partner_shipping_id.country_id.name) or '')}</td>
+ </tr>
</table>
<table id="data-table" cellspacing="3">
@@ -85,21 +92,24 @@
%else:
<tr class = "odd">
%endif
- <td valign = "top">${formatLang(line.product_uom_qty)} ${format(line.product_uom.name)}</td>
- <td valign = "top" id="desc_col">${line.name} ${line.tax_id != [] and (' / (' + (', '.join([ lt.description for lt in line.tax_id ])) + ')') or ''|entity}
- %if company.show_sale_order_footer:
- <td valign = "top" style="text-align:right;">${int(line.delay)}d</td>
- %endif
- %if line.notes :
- <br/><span class = "notes"><b>${_("Note")}:</b> ${format(line.notes)}</span>
- %endif
- </td>
- %if discount(so) != 0:
- <td valign = "top">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
- %endif
- <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
- <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
- </tr>
+ <td valign = "top">${formatLang(line.product_uom_qty)} ${format(line.product_uom.name)}</td>
+ <td valign = "top" id="desc_col">${line.name} ${line.tax_id != [] and (' / (' + (', '.join([ lt.description for lt in line.tax_id ])) + ')') or ''|entity}
+ %if company.show_sale_order_footer:
+ <td valign = "top" style="text-align:right;">${int(line.delay)} d</td>
+ %endif
+ </td>
+ %if discount(so) != 0:
+ <td valign = "top">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
+ %endif
+ <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+ <td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+ </tr>
+ %if line.notes :
+ <tr>
+ <td valign = "top"></td>
+ <td valign = "top" id="desc_col">${_("Note")}: ${format(line.notes)}</td>
+ </tr>
+ %endif
<%i +=1%>
%endfor
%if discount(so) != 0:
Follow ups
